This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ad299f25c72232b755aa0a26dd249ec91d8daadc
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Wed Jun 17 15:09:52 2020 +0200
[CAMEL-11807] Remove deprecated constructs from camelspring-javaconfig
---
.../java/org/apache/camel/spring/javaconfig/BeanJavaConfigTest.java | 3 ++-
.../src/test/java/org/apache/camel/spring/javaconfig/MainTest.java | 3 +--
.../spring/javaconfig/autowire/AutodetectNoRoutesConfigTest.java | 3 ++-
.../camel/spring/javaconfig/autowire/AutodetectingConfigTest.java | 3 ++-
.../javaconfig/autowire/LoadingRawCamelConfigurationTest.java | 4 +---
.../javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java | 6 +-----
.../spring/javaconfig/test/JavaConfigWithNestedConfigClassTest.java | 3 ++-
.../spring/javaconfig/test/JavaConfigWithPostProcessorTest.java | 3 ++-
8 files changed, 13 insertions(+), 15 deletions(-)
diff --git
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/BeanJavaConfigTest.java
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/BeanJavaConfigTest.java
index 1dab459..accaadf 100644
---
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/BeanJavaConfigTest.java
+++
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/BeanJavaConfigTest.java
@@ -24,6 +24,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader;
import org.apache.camel.test.spring.CamelSpringJUnit4ClassRunner;
+import org.apache.camel.test.spring.CamelSpringRunner;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.context.annotation.Bean;
@@ -32,7 +33,7 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
-@RunWith(CamelSpringJUnit4ClassRunner.class)
+@RunWith(CamelSpringRunner.class)
@ContextConfiguration(classes = {BeanJavaConfigTest.ContextConfig.class},
loader = CamelSpringDelegatingTestContextLoader.class)
public class BeanJavaConfigTest extends AbstractJUnit4SpringContextTests {
diff --git
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/MainTest.java
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/MainTest.java
index 5f14ccf..d5fcf03 100644
---
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/MainTest.java
+++
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/MainTest.java
@@ -19,11 +19,10 @@ package org.apache.camel.spring.javaconfig;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Assert;
import org.junit.Test;
import org.springframework.context.ApplicationContext;
-public class MainTest extends Assert {
+public class MainTest {
@Test
public void testOptions() throws Exception {
diff --git
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/AutodetectNoRoutesConfigTest.java
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/AutodetectNoRoutesConfigTest.java
index 8b8f122..93c3d75 100644
---
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/AutodetectNoRoutesConfigTest.java
+++
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/AutodetectNoRoutesConfigTest.java
@@ -20,6 +20,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.spring.javaconfig.CamelConfiguration;
import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader;
import org.apache.camel.test.spring.CamelSpringJUnit4ClassRunner;
+import org.apache.camel.test.spring.CamelSpringRunner;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +30,7 @@ import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
import static org.junit.Assert.assertEquals;
-@RunWith(CamelSpringJUnit4ClassRunner.class)
+@RunWith(CamelSpringRunner.class)
@ContextConfiguration(classes = {NoRoutesConfig.class}, loader =
CamelSpringDelegatingTestContextLoader.class)
public class AutodetectNoRoutesConfigTest extends
AbstractJUnit4SpringContextTests {
diff --git
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/AutodetectingConfigTest.java
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/AutodetectingConfigTest.java
index 1eab026..0943f3d 100644
---
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/AutodetectingConfigTest.java
+++
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/AutodetectingConfigTest.java
@@ -22,12 +22,13 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader;
import org.apache.camel.test.spring.CamelSpringJUnit4ClassRunner;
+import org.apache.camel.test.spring.CamelSpringRunner;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
-@RunWith(CamelSpringJUnit4ClassRunner.class)
+@RunWith(CamelSpringRunner.class)
@ContextConfiguration(classes = {AutowiringContextConfig.class}, loader =
CamelSpringDelegatingTestContextLoader.class)
public class AutodetectingConfigTest extends AbstractJUnit4SpringContextTests {
diff --git
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/LoadingRawCamelConfigurationTest.java
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/LoadingRawCamelConfigurationTest.java
index 53964b0..9f828ea 100644
---
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/LoadingRawCamelConfigurationTest.java
+++
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/autowire/LoadingRawCamelConfigurationTest.java
@@ -29,9 +29,7 @@ import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
import static org.junit.Assert.assertNotNull;
-@ContextConfiguration(
- classes = {CamelConfiguration.class,
AdditionalRouteConfiguration.class},
- loader = CamelSpringDelegatingTestContextLoader.class)
+@ContextConfiguration(classes = { CamelConfiguration.class,
AdditionalRouteConfiguration.class })
public class LoadingRawCamelConfigurationTest extends
AbstractJUnit4SpringContextTests {
@EndpointInject("mock:rawConfigTest")
diff --git
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java
index 9fe6e40..748ce38 100644
---
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java
+++
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java
@@ -37,11 +37,7 @@ import org.springframework.test.context.ContextConfiguration;
//START SNIPPET: example
// tag::example[]
@RunWith(CamelSpringRunner.class)
-@ContextConfiguration(
- classes =
{CamelSpringDelegatingTestContextLoaderTest.TestConfig.class},
- // Since Camel 2.11.0
- loader = CamelSpringDelegatingTestContextLoader.class
- )
+@ContextConfiguration(classes =
CamelSpringDelegatingTestContextLoaderTest.TestConfig.class)
@MockEndpoints
public class CamelSpringDelegatingTestContextLoaderTest {
@EndpointInject("mock:direct:end")
diff --git
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/JavaConfigWithNestedConfigClassTest.java
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/JavaConfigWithNestedConfigClassTest.java
index e8f9cad..c917892 100644
---
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/JavaConfigWithNestedConfigClassTest.java
+++
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/JavaConfigWithNestedConfigClassTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.javaconfig.test;
import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader;
import org.apache.camel.test.spring.CamelSpringJUnit4ClassRunner;
+import org.apache.camel.test.spring.CamelSpringRunner;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.context.annotation.Bean;
@@ -28,7 +29,7 @@ import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
import static org.junit.Assert.assertEquals;
-@RunWith(CamelSpringJUnit4ClassRunner.class)
+@RunWith(CamelSpringRunner.class)
@ContextConfiguration(classes =
{JavaConfigWithNestedConfigClassTest.ContextConfig.class}, loader =
CamelSpringDelegatingTestContextLoader.class)
@Component
public class JavaConfigWithNestedConfigClassTest extends
AbstractJUnit4SpringContextTests implements Cheese {
diff --git
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/JavaConfigWithPostProcessorTest.java
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/JavaConfigWithPostProcessorTest.java
index bd0d650..7dee3f4 100644
---
a/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/JavaConfigWithPostProcessorTest.java
+++
b/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/JavaConfigWithPostProcessorTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.spring.javaconfig.test;
import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader;
import org.apache.camel.test.spring.CamelSpringJUnit4ClassRunner;
+import org.apache.camel.test.spring.CamelSpringRunner;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.stereotype.Component;
@@ -26,7 +27,7 @@ import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
import static org.junit.Assert.assertEquals;
-@RunWith(CamelSpringJUnit4ClassRunner.class)
+@RunWith(CamelSpringRunner.class)
@ContextConfiguration(classes = {MyConfig.class}, loader =
CamelSpringDelegatingTestContextLoader.class)
@Component
public class JavaConfigWithPostProcessorTest extends
AbstractJUnit4SpringContextTests implements Cheese {
