Return-Path: 
 <dev-return-117605-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
X-Original-To: apmail-tomcat-dev-archive@www.apache.org
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id C37AC4C60
	for <apmail-tomcat-dev-archive@www.apache.org>;
 Fri,  1 Jul 2011 13:41:49 +0000 (UTC)
Received: (qmail 35818 invoked by uid 500); 1 Jul 2011 13:41:49 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 35551 invoked by uid 500); 1 Jul 2011 13:41:48 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 35537 invoked by uid 99); 1 Jul 2011 13:41:47 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Jul 2011 13:41:47 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Jul 2011 13:41:46 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 4BF30238896F
	for <dev@tomcat.apache.org>; Fri,  1 Jul 2011 13:41:26 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1141935 -
 /tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
Date: Fri, 01 Jul 2011 13:41:26 -0000
To: dev@tomcat.apache.org
From: markt@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110701134126.4BF30238896F@eris.apache.org>

Author: markt
Date: Fri Jul  1 13:41:25 2011
New Revision: 1141935

URL: http://svn.apache.org/viewvc?rev=1141935&view=rev
Log:
Fix faulty test

Modified:
    tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java

Modified: tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java?rev=1141935&r1=1141934&r2=1141935&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java (original)
+++ tomcat/trunk/test/org/apache/catalina/core/TestStandardWrapper.java Fri Jul  1 13:41:25 2011
@@ -332,8 +332,13 @@ public class TestStandardWrapper extends
 
 
     public static final int BUG51445_THREAD_COUNT = 5;
+    
+    public static CountDownLatch latch = null;
 
     public void testBug51445AddServlet() throws Exception {
+
+        latch = new CountDownLatch(BUG51445_THREAD_COUNT);
+
         Tomcat tomcat = getTomcatInstance();
 
         // Must have a real docBase - just use temp
@@ -358,19 +363,25 @@ public class TestStandardWrapper extends
         }
 
         Set<String> servlets = new HashSet<String>();
+        // Output the result
+        for (int i = 0; i < BUG51445_THREAD_COUNT; i ++) {
+            System.out.println(threads[i].getResult());
+        }
+        
         // Check the result
         for (int i = 0; i < BUG51445_THREAD_COUNT; i ++) {
             String[] results = threads[i].getResult().split(",");
             assertEquals(2, results.length);
             assertEquals("10", results[0]);
-            System.out.println(results[1]);
             assertFalse(servlets.contains(results[1]));
             servlets.add(results[1]);
         }
-
     }
 
     public void testBug51445AddChild() throws Exception {
+        
+        latch = new CountDownLatch(BUG51445_THREAD_COUNT);
+
         Tomcat tomcat = getTomcatInstance();
 
         // Must have a real docBase - just use temp
@@ -398,16 +409,18 @@ public class TestStandardWrapper extends
         }
 
         Set<String> servlets = new HashSet<String>();
+        // Output the result
+        for (int i = 0; i < BUG51445_THREAD_COUNT; i ++) {
+            System.out.println(threads[i].getResult());
+        }
         // Check the result
         for (int i = 0; i < BUG51445_THREAD_COUNT; i ++) {
             String[] results = threads[i].getResult().split(",");
             assertEquals(2, results.length);
             assertEquals("10", results[0]);
-            System.out.println(results[1]);
             assertFalse(servlets.contains(results[1]));
             servlets.add(results[1]);
         }
-
     }
 
     private static class Bug51445Thread extends Thread {
@@ -443,9 +456,6 @@ public class TestStandardWrapper extends
 
         private static final long serialVersionUID = 1L;
 
-        private static final CountDownLatch latch =
-            new CountDownLatch(BUG51445_THREAD_COUNT);
-
         private int data = 0;
 
         @Override



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org