svn commit: r1456359 - in /camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring: CamelSpringDelegatingTestContextLoader.java CamelSpringJUnit4ClassRunner.java

[ningjiang]

Author: ningjiang
Date: Thu Mar 14 08:05:13 2013
New Revision: 1456359

URL: http://svn.apache.org/r1456359
Log:
CAMEL-6160 polished the CamelSpringDelegatingTestContextLoader

Modified:
    
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java
    
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunner.java

Modified: 
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java?rev=1456359&r1=1456358&r2=1456359&view=diff
==============================================================================
--- 
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java
 (original)
+++ 
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java
 Thu Mar 14 08:05:13 2013
@@ -42,11 +42,14 @@ import org.springframework.test.context.
 
 import static org.apache.camel.test.spring.CamelSpringTestHelper.getAllMethods;
 
+
+
 /**
- * Custom TestContextLoader which fixes issues in Camel's 
JavaConfigContextLoader. (adds support for Camel's test annotations)
+ * CamelSpringDelegatingTestContextLoader which fixes issues in Camel's 
JavaConfigContextLoader. (adds support for Camel's test annotations)
  * <br>
  * <em>This loader can handle either classes or locations for configuring the 
context.</em>
  * <br>
+ * NOTE: This TestContextLoader doesn't support the annotation of 
ExcludeRoutes now.
  */
 public class CamelSpringDelegatingTestContextLoader extends 
DelegatingSmartContextLoader {
 
@@ -64,11 +67,10 @@ public class CamelSpringDelegatingTestCo
         // Pre CamelContext(s) instantiation setup
         handleDisableJmx(null, testClass);
         
-        try {            
+        try {
             SpringCamelContext.setNoStart(true);
             ConfigurableApplicationContext context = 
(ConfigurableApplicationContext) super.loadContext(mergedConfig);
             SpringCamelContext.setNoStart(false);
-            
             return loadContext(context, testClass);
         } finally {
             cleanup(testClass);
@@ -101,7 +103,6 @@ public class CamelSpringDelegatingTestCo
         return context;
     }
     
-
     /**
      * Cleanup/restore global state to defaults / pre-test values after the 
test setup
      * is complete. 
@@ -254,15 +255,15 @@ public class CamelSpringDelegatingTestCo
     }
     
     /**
-     * Handles auto-intercepting of endpoints with mocks based on {@link 
MockEndpoints} and skipping the
+     * Handles auto-intercepting of endpoints with mocks based on {@link 
MockEndpointsAndSkip} and skipping the
      * original endpoint.
      *
      * @param context the initialized Spring context
      * @param testClass the test class being executed
      */
     protected void handleMockEndpointsAndSkip(ConfigurableApplicationContext 
context, Class<?> testClass) throws Exception {
-        if (testClass.isAnnotationPresent(MockEndpoints.class)) {
-            final String mockEndpoints = 
testClass.getAnnotation(MockEndpoints.class).value();
+        if (testClass.isAnnotationPresent(MockEndpointsAndSkip.class)) {
+            final String mockEndpoints = 
testClass.getAnnotation(MockEndpointsAndSkip.class).value();
             CamelSpringTestHelper.doToSpringCamelContexts(context, new 
DoToSpringCamelContextsStrategy() {
                 
                 public void execute(String contextName, SpringCamelContext 
camelContext)
@@ -274,6 +275,7 @@ public class CamelSpringDelegatingTestCo
         }
     }
     
+    
     /**
      * Handles starting of Camel contexts based on {@link UseAdviceWith} and 
other state in the JVM.
      *

Modified: 
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunner.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunner.java?rev=1456359&r1=1456358&r2=1456359&view=diff
==============================================================================
--- 
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunner.java
 (original)
+++ 
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringJUnit4ClassRunner.java
 Thu Mar 14 08:05:13 2013
@@ -25,7 +25,7 @@ import org.springframework.test.context.
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
- * An implementation bringing the functionality of {@link 
org.apache.camel.test.junit4.CamelSpringTestSupport} to
+ * An implementation bringing the functionality of {@link 
org.apache.camel.test.spring.CamelSpringTestSupport} to
  * Spring Test based test cases.  This approach allows developers to implement 
tests
  * for their Spring based applications/routes using the typical Spring Test 
conventions
  * for test development.