Author: ningjiang
Date: Fri Aug 26 10:02:15 2011
New Revision: 1162053
URL: http://svn.apache.org/viewvc?rev=1162053&view=rev
Log:
Merged revisions 1161082 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1161082 | ningjiang | 2011-08-24 21:06:26 +0800 (Wed, 24 Aug 2011) | 1 line
CAMEL-4375 Fixed the configure issue of FilterCreateCamelContextPerClassTest
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-testng/pom.xml
camel/branches/camel-2.8.x/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
camel/branches/camel-2.8.x/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugSpringTest.java
camel/branches/camel-2.8.x/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/FilterCreateCamelContextPerClassTest.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 26 10:02:15 2011
@@ -1 +1 @@
-/camel/trunk:1150651,1151054,1155230,1156108,1156260,1156524,1157348,1157798,1157831,1157878,1158153,1159171,1159174,1159457,1159460,1159606,1159867,1160547,1161010,1161524
+/camel/trunk:1150651,1151054,1155230,1156108,1156260,1156524,1157348,1157798,1157831,1157878,1158153,1159171,1159174,1159457,1159460,1159606,1159867,1160547,1161010,1161082,1161524
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/components/camel-testng/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-testng/pom.xml?rev=1162053&r1=1162052&r2=1162053&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-testng/pom.xml (original)
+++ camel/branches/camel-2.8.x/components/camel-testng/pom.xml Fri Aug 26
10:02:15 2011
@@ -64,4 +64,23 @@
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <childDelegation>false</childDelegation>
+ <useFile>true</useFile>
+ <failIfNoTests>false</failIfNoTests>
+ <runOrder>alphabetical</runOrder>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified:
camel/branches/camel-2.8.x/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java?rev=1162053&r1=1162052&r2=1162053&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
(original)
+++
camel/branches/camel-2.8.x/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
Fri Aug 26 10:02:15 2011
@@ -45,8 +45,17 @@ public abstract class CamelSpringTestSup
protected abstract AbstractApplicationContext createApplicationContext();
@Override
- public void doSetUp() throws Exception {
- applicationContext = createApplicationContext();
+ public void doSetUp() throws Exception {
+ if
(!"true".equalsIgnoreCase(System.getProperty("skipStartingCamelContext"))) {
+ // 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");
+ applicationContext = createApplicationContext();
+ assertNotNull(applicationContext, "Should have created a valid
spring context");
+ System.clearProperty("maybeStartCamelContext");
+ } else {
+ log.info("Skipping starting CamelContext as system property
skipStartingCamelContext is set to be true.");
+ }
super.doSetUp();
}
Modified:
camel/branches/camel-2.8.x/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugSpringTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugSpringTest.java?rev=1162053&r1=1162052&r2=1162053&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugSpringTest.java
(original)
+++
camel/branches/camel-2.8.x/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugSpringTest.java
Fri Aug 26 10:02:15 2011
@@ -21,9 +21,9 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.testng.CamelSpringTestSupport;
-import org.junit.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.GenericApplicationContext;
+import org.testng.annotations.Test;
public class DebugSpringTest extends CamelSpringTestSupport {
private boolean debugged;
Modified:
camel/branches/camel-2.8.x/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/FilterCreateCamelContextPerClassTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/FilterCreateCamelContextPerClassTest.java?rev=1162053&r1=1162052&r2=1162053&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/FilterCreateCamelContextPerClassTest.java
(original)
+++
camel/branches/camel-2.8.x/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/FilterCreateCamelContextPerClassTest.java
Fri Aug 26 10:02:15 2011
@@ -42,7 +42,7 @@ public class FilterCreateCamelContextPer
// we override this method and return true, to tell Camel test-kit that
// it should only create CamelContext once (per class), so we will
// re-use the CamelContext between each test method in this class
- return false;
+ return true;
}
@Test
