Author: bvahdat
Date: Mon Jan 28 16:10:57 2013
New Revision: 1439471
URL: http://svn.apache.org/viewvc?rev=1439471&view=rev
Log:
Merged revisions 1439468 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1439468 | bvahdat | 2013-01-28 17:08:20 +0100 (Mo, 28 Jan 2013) | 1 line
CAMEL-5998: Fixed the last pieces of the deprecated
AbstractJUnit38SpringContextTests usage.
........
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-kestrel/src/test/java/org/apache/camel/component/kestrel/KestrelSpringXmlTest.java
camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXTest.java
camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java
camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java
camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1439468
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.10.x/components/camel-kestrel/src/test/java/org/apache/camel/component/kestrel/KestrelSpringXmlTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-kestrel/src/test/java/org/apache/camel/component/kestrel/KestrelSpringXmlTest.java?rev=1439471&r1=1439470&r2=1439471&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-kestrel/src/test/java/org/apache/camel/component/kestrel/KestrelSpringXmlTest.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-kestrel/src/test/java/org/apache/camel/component/kestrel/KestrelSpringXmlTest.java
Mon Jan 28 16:10:57 2013
@@ -23,13 +23,16 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Ignore;
+import org.junit.runner.RunWith;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
-import
org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
+import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@ContextConfiguration
+@RunWith(SpringJUnit4ClassRunner.class)
@Ignore("Manual test as you need to start a Kestrel broker")
-public class KestrelSpringXmlTest extends AbstractJUnit38SpringContextTests {
+public class KestrelSpringXmlTest extends AbstractJUnit4SpringContextTests {
@EndpointInject(uri = "mock:result")
protected MockEndpoint mock;
Modified:
camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXTest.java?rev=1439471&r1=1439470&r2=1439471&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXTest.java
(original)
+++
camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXTest.java
Mon Jan 28 16:10:57 2013
@@ -28,7 +28,7 @@ import static org.junit.Assert.assertEqu
* Unit test will look for the spring .xml file with the same class name
* but postfixed with -config.xml as filename.
* <p/>
- * We use Spring Testing for unit test, eg we extend
AbstractJUnit38SpringContextTests
+ * We use Spring Testing for unit test, eg we extend
AbstractJUnit4SpringContextTests
* that is a Spring class.
*
* @version
Modified:
camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java?rev=1439471&r1=1439470&r2=1439471&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java
(original)
+++
camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java
Mon Jan 28 16:10:57 2013
@@ -34,7 +34,7 @@ import static org.junit.Assert.fail;
* Unit test will look for the spring .xml file with the same class name
* but postfixed with -config.xml as filename.
* <p/>
- * We use Spring Testing for unit test, eg we extend
AbstractJUnit38SpringContextTests
+ * We use Spring Testing for unit test, eg we extend
AbstractJUnit4SpringContextTests
* that is a Spring class.
*
* @version
Modified:
camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java?rev=1439471&r1=1439470&r2=1439471&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java
(original)
+++
camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java
Mon Jan 28 16:10:57 2013
@@ -35,7 +35,7 @@ import static org.junit.Assert.fail;
* Unit test will look for the spring .xml file with the same class name
* but postfixed with -config.xml as filename.
* <p/>
- * We use Spring Testing for unit test, eg we extend
AbstractJUnit38SpringContextTests
+ * We use Spring Testing for unit test, eg we extend
AbstractJUnit4SpringContextTests
* that is a Spring class.
*
* @version
Modified:
camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest.java?rev=1439471&r1=1439470&r2=1439471&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest.java
(original)
+++
camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithRollbackTest.java
Mon Jan 28 16:10:57 2013
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertEqu
* Unit test will look for the spring .xml file with the same class name
* but postfixed with -config.xml as filename.
* <p/>
- * We use Spring Testing for unit test, eg we extend
AbstractJUnit38SpringContextTests
+ * We use Spring Testing for unit test, eg we extend
AbstractJUnit4SpringContextTests
* that is a Spring class.
*
* @version
