svn commit: r1101877 - /camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java

[davsclaus]

Author: davsclaus
Date: Wed May 11 13:59:24 2011
New Revision: 1101877

URL: http://svn.apache.org/viewvc?rev=1101877&view=rev
Log:
Polished

Modified:
    
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java

Modified: 
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java?rev=1101877&r1=1101876&r2=1101877&view=diff
==============================================================================
--- 
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
 (original)
+++ 
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java
 Wed May 11 13:59:24 2011
@@ -126,13 +126,16 @@ public abstract class CamelTestSupport e
 
         boolean first = INIT.compareAndSet(false, true);
         if (isCreateCamelContextPerClass()) {
+            // test is per class, so only setup once (the first time)
             if (first) {
                 doSetUp();
+            } else {
+                // and in between tests we must do IoC and reset mocks
+                postProcessTest();
+                resetMocks();
             }
-            // must always post process to do IoC and reset mocks between tests
-            postProcessTest();
-            resetMocks();
         } else {
+            // test is per test so always setup
             doSetUp();
         }
     }