svn commit: r943106 - in /mina/trunk/core/src/test/java/org/apache/mina/filter/logging: LoadTestMdcInjectionFilter.java MdcInjectionFilterTest.java MyTest.java

[ma...@apache.org]

Author: maarten
Date: Tue May 11 12:47:24 2010
New Revision: 943106

URL: http://svn.apache.org/viewvc?rev=943106&view=rev
Log:
temporary fix for DIRMINA-784

Added:
    mina/trunk/core/src/test/java/org/apache/mina/filter/logging/LoadTestMdcInjectionFilter.java
      - copied, changed from r943099, mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MyTest.java
Removed:
    mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MyTest.java
Modified:
    mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java

Copied: mina/trunk/core/src/test/java/org/apache/mina/filter/logging/LoadTestMdcInjectionFilter.java (from r943099, mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MyTest.java)
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/logging/LoadTestMdcInjectionFilter.java?p2=mina/trunk/core/src/test/java/org/apache/mina/filter/logging/LoadTestMdcInjectionFilter.java&p1=mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MyTest.java&r1=943099&r2=943106&rev=943106&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MyTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/logging/LoadTestMdcInjectionFilter.java Tue May 11 12:47:24 2010
@@ -6,13 +6,19 @@ import junit.textui.TestRunner;
 
 import java.util.Date;
 
-public class MyTest {
+public class LoadTestMdcInjectionFilter {
 
+    /**
+     * The MdcInjectionFilterTest is unstable, it fails sporadically (and only on Windows ?)
+     * This is a quick and dirty program to run the MdcInjectionFilterTest many times.
+     * To be removed once we consider DIRMINA-784 to be fixed
+     *
+     */
     public static void main(String[] args) {
         TestRunner runner = new TestRunner();
 
         try {
-            for (int i=0; i<500000; i++) {
+            for (int i=0; i<50000; i++) {
                 Test test = new JUnit4TestAdapter(MdcInjectionFilterTest.class);
                 runner.doRun(test);
                 System.out.println("i = " + i + " " + new Date());

Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java?rev=943106&r1=943105&r2=943106&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java Tue May 11 12:47:24 2010
@@ -105,7 +105,16 @@ public class MdcInjectionFilterTest {
         System.out.println("");
         System.out.println("after = " + after);
 
-        while (contains(after, "Nio")) {
+        // give acceptor some time to shut down
+        Thread.sleep(50);
+        after = getThreadNames();
+
+        int count = 0;
+
+        // NOTE: this is *not* intended to be a permanenet fix for this test-case.
+        // There just is no API to block until the ExecutorService of AbstractIoService is terminated.
+
+        while (contains(after, "Nio") && count++ < 10) {
             Thread.sleep(50);
             after = getThreadNames();
             System.out.println("after = " + after);