camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1173203 - in /camel/branches/camel-2.8.x/components/camel-test/src: main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java test/java/org/apache/camel/test/patterns/DebugSpringTest.java
Date Tue, 20 Sep 2011 15:49:25 GMT
Author: dkulp
Date: Tue Sep 20 15:48:43 2011
New Revision: 1173203

URL: http://svn.apache.org/viewvc?rev=1173203&view=rev
Log:
Fix broken test in camel-test

Modified:
    camel/branches/camel-2.8.x/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java
    camel/branches/camel-2.8.x/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugSpringTest.java

Modified: camel/branches/camel-2.8.x/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java?rev=1173203&r1=1173202&r2=1173203&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java
(original)
+++ camel/branches/camel-2.8.x/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelSpringTestSupport.java
Tue Sep 20 15:48:43 2011
@@ -51,9 +51,11 @@ public abstract class CamelSpringTestSup
             // tell camel-spring it should not trigger starting CamelContext, since we do
that later
             // after we are finished setting up the unit test
             System.setProperty("maybeStartCamelContext", "false");
+            SpringCamelContext.setNoStart(true);
             applicationContext = createApplicationContext();
             assertNotNull("Should have created a valid spring context", applicationContext);
             System.clearProperty("maybeStartCamelContext");
+            SpringCamelContext.setNoStart(false);
         } else {
             log.info("Skipping starting CamelContext as system property skipStartingCamelContext
is set to be true.");
         }

Modified: camel/branches/camel-2.8.x/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugSpringTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugSpringTest.java?rev=1173203&r1=1173202&r2=1173203&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugSpringTest.java
(original)
+++ camel/branches/camel-2.8.x/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugSpringTest.java
Tue Sep 20 15:48:43 2011
@@ -27,7 +27,7 @@ import org.springframework.context.suppo
 
 public class DebugSpringTest extends CamelSpringTestSupport {
     private boolean debugged;
-
+    
     @Override
     protected void debugBefore(Exchange exchange, Processor processor,
                                ProcessorDefinition definition, String id, String shortName)
{



Mime
View raw message