camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1404522 - in /camel/branches/camel-2.10.x: ./ camel-core/src/test/java/org/apache/camel/UnitOfWorkSyncProcessTest.java
Date Thu, 01 Nov 2012 09:48:56 GMT
Author: davsclaus
Date: Thu Nov  1 09:48:56 2012
New Revision: 1404522

URL: http://svn.apache.org/viewvc?rev=1404522&view=rev
Log:
Skip test failing on aix

Modified:
    camel/branches/camel-2.10.x/   (props changed)
    camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/UnitOfWorkSyncProcessTest.java

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1404519

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/UnitOfWorkSyncProcessTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/UnitOfWorkSyncProcessTest.java?rev=1404522&r1=1404521&r2=1404522&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/UnitOfWorkSyncProcessTest.java
(original)
+++ camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/UnitOfWorkSyncProcessTest.java
Thu Nov  1 09:48:56 2012
@@ -33,7 +33,13 @@ public class UnitOfWorkSyncProcessTest e
     private static String afterThread;
     private static String taskThread;
     private static String doneThread;
-    private ExecutorService executorService;
+    private ExecutorService executorService = Executors.newSingleThreadExecutor();
+
+    @Override
+    protected void tearDown() throws Exception {
+        executorService.shutdownNow();
+        super.tearDown();
+    }
 
     public void testUnitOfWorkSync() throws Exception {
         // skip test on AIX
@@ -41,8 +47,6 @@ public class UnitOfWorkSyncProcessTest e
             return;
         }
 
-        executorService = Executors.newSingleThreadExecutor();
-
         getMockEndpoint("mock:result").expectedMessageCount(1);
 
         assertMockEndpointsSatisfied();
@@ -54,8 +58,6 @@ public class UnitOfWorkSyncProcessTest e
         assertNotSame(doneThread, consumerThread);
         // should be same thread
         assertEquals(consumerThread, doneThread);
-
-        executorService.shutdownNow();
     }
 
     @Override



Mime
View raw message