Fix faulty test

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1141935 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/test/org/apache/catalina/core/TestStandardWrapper.java b/test/org/apache/catalina/core/TestStandardWrapper.java
index 397a774..e43be0e 100644 (file)
--- a/test/org/apache/catalina/core/TestStandardWrapper.java
+++ b/test/org/apache/catalina/core/TestStandardWrapper.java
@@ -332,8 +332,13 @@ public class TestStandardWrapper extends TomcatBaseTest {
 
 
     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 TomcatBaseTest {
         }
 
         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 TomcatBaseTest {
         }
 
         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 TomcatBaseTest {
 
         private static final long serialVersionUID = 1L;
 
-        private static final CountDownLatch latch =
-            new CountDownLatch(BUG51445_THREAD_COUNT);
-
         private int data = 0;
 
         @Override