jmeter-commits mailing list archives

Author: pmouawad
Date: Mon Sep 29 19:33:52 2014
New Revision: 1628270

URL: http://svn.apache.org/r1628270
Log:
Fix sync issues in test leading to test being stuck

Modified:
    jmeter/trunk/test/src/org/apache/jmeter/assertions/ResponseAssertionTest.java

Modified: jmeter/trunk/test/src/org/apache/jmeter/assertions/ResponseAssertionTest.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/assertions/ResponseAssertionTest.java?rev=1628270&r1=1628269&r2=1628270&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/assertions/ResponseAssertionTest.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/assertions/ResponseAssertionTest.java Mon Sep
29 19:33:52 2014
@@ -20,6 +20,8 @@ package org.apache.jmeter.assertions;
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import junit.framework.TestCase;
 
@@ -198,26 +200,20 @@ public class ResponseAssertionTest  exte
         assertTrue("Expecting failure",result.isFailure());     
         
     }
-    private volatile int threadsRunning;
-
-    private volatile int failed;
+    private AtomicInteger failed;
 
     public void testThreadSafety() throws Exception {
         Thread[] threads = new Thread[100];
+        CountDownLatch latch = new CountDownLatch(threads.length);
         for (int i = 0; i < threads.length; i++) {
-            threads[i] = new TestThread();
+            threads[i] = new TestThread(latch);
         }
-        failed = 0;
+        failed = new AtomicInteger(0);
         for (int i = 0; i < threads.length; i++) {
             threads[i].start();
-            threadsRunning++;
-        }
-        synchronized (this) {
-            while (threadsRunning > 0) {
-                wait();
-            }
         }
-        assertEquals(failed, 0);
+        latch.await();
+        assertEquals(failed.get(), 0);
     }
 
     class TestThread extends Thread {
@@ -227,24 +223,30 @@ public class ResponseAssertionTest  exte
         // unknown.
         static final String TEST_PATTERN = ".*A.*\\.";
 
+        private CountDownLatch latch;
+
+        public TestThread(CountDownLatch latch) {
+            this.latch = latch;
+        }
+
         @Override
         public void run() {
-            ResponseAssertion assertion = new ResponseAssertion();
-            assertion.setTestFieldResponseData();
-            assertion.setToContainsType();
-            assertion.addTestString(TEST_PATTERN);
-            SampleResult response = new SampleResult();
-            response.setResponseData(TEST_STRING, null);
-            for (int i = 0; i < 100; i++) {
-                AssertionResult result;
-                result = assertion.getResult(response);
-                if (result.isFailure() || result.isError()) {
-                    failed++;
+            try {
+                ResponseAssertion assertion = new ResponseAssertion();
+                assertion.setTestFieldResponseData();
+                assertion.setToContainsType();
+                assertion.addTestString(TEST_PATTERN);
+                SampleResult response = new SampleResult();
+                response.setResponseData(TEST_STRING, null);
+                for (int i = 0; i < 100; i++) {
+                    AssertionResult result;
+                    result = assertion.getResult(response);
+                    if (result.isFailure() || result.isError()) {
+                        failed.incrementAndGet();
+                    }
                 }
-            }
-            synchronized (ResponseAssertionTest.this) {
-                threadsRunning--;
-                ResponseAssertionTest.this.notifyAll();
+            } finally {
+                latch.countDown();
             }
         }
     }