This is an automated email from the ASF dual-hosted git repository. aldettinger pushed a commit to branch CAMEL-13965 in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4b3951212e4b7052779d11cc1a7605bbd549434a Author: aldettinger <aldettin...@gmail.com> AuthorDate: Thu Sep 12 10:23:13 2019 +0200 CAMEL-13965: Renamed some classes as CamelSpringRunner is no more used --- ...rrideTest.java => CamelSpringDisableJmxInheritedOverrideTest.java} | 4 ++-- ...eJmxInheritedTest.java => CamelSpringDisableJmxInheritedTest.java} | 4 ++-- ...SpringRunnerDisableJmxTest.java => CamelSpringDisableJmxTest.java} | 4 ++-- ...RunnerExcludeRoutesTest.java => CamelSpringExcludeRoutesTest.java} | 4 ++-- .../{CamelSpringRunnerPlainTest.java => CamelSpringPlainTest.java} | 2 +- ...itedTest.java => CamelSpringProvidesBreakpointInherritedTest.java} | 4 ++-- ...idesBreakpointTest.java => CamelSpringProvidesBreakpointTest.java} | 4 ++-- .../test/spring/CamelSpringRouteProcessorDumpRouteCoverageTest.java | 2 +- ...Test.java => CamelSpringShutdownTimeoutInheritedOverrideTest.java} | 4 ++-- ...herritedTest.java => CamelSpringShutdownTimeoutInheritedTest.java} | 4 ++-- ...erShutdownTimeoutTest.java => CamelSpringShutdownTimeoutTest.java} | 4 ++-- ...PropertySourceTest.java => CamelSpringTestPropertySourceTest.java} | 2 +- ...RunnerUseAdviceWithTest.java => CamelSpringUseAdviceWithTest.java} | 2 +- ...ngRunnerPlainTest-context.xml => CamelSpringPlainTest-context.xml} | 0 ...Test-context.xml => CamelSpringTestPropertySourceTest-context.xml} | 0 15 files changed, 22 insertions(+), 22 deletions(-) diff --git a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerDisableJmxInheritedOverrideTest.java b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringDisableJmxInheritedOverrideTest.java similarity index 91% rename from components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerDisableJmxInheritedOverrideTest.java rename to components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringDisableJmxInheritedOverrideTest.java index 426e871..9f904c5 100644 --- a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerDisableJmxInheritedOverrideTest.java +++ b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringDisableJmxInheritedOverrideTest.java @@ -23,8 +23,8 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @DisableJmx -public class CamelSpringRunnerDisableJmxInheritedOverrideTest - extends CamelSpringRunnerDisableJmxTest { +public class CamelSpringDisableJmxInheritedOverrideTest + extends CamelSpringDisableJmxTest { @Override @Test diff --git a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerDisableJmxInheritedTest.java b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringDisableJmxInheritedTest.java similarity index 89% rename from components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerDisableJmxInheritedTest.java rename to components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringDisableJmxInheritedTest.java index 472e1f5..43add89 100644 --- a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerDisableJmxInheritedTest.java +++ b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringDisableJmxInheritedTest.java @@ -16,6 +16,6 @@ */ package org.apache.camel.test.spring; -public class CamelSpringRunnerDisableJmxInheritedTest - extends CamelSpringRunnerDisableJmxTest { +public class CamelSpringDisableJmxInheritedTest + extends CamelSpringDisableJmxTest { } diff --git a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerDisableJmxTest.java b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringDisableJmxTest.java similarity index 93% rename from components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerDisableJmxTest.java rename to components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringDisableJmxTest.java index 4c8cf0e..50848b4 100644 --- a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerDisableJmxTest.java +++ b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringDisableJmxTest.java @@ -23,8 +23,8 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @DisableJmx(false) -public class CamelSpringRunnerDisableJmxTest - extends CamelSpringRunnerPlainTest { +public class CamelSpringDisableJmxTest + extends CamelSpringPlainTest { @Test @Override diff --git a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerExcludeRoutesTest.java b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringExcludeRoutesTest.java similarity index 92% rename from components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerExcludeRoutesTest.java rename to components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringExcludeRoutesTest.java index c1ca6a6..661ca03 100644 --- a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerExcludeRoutesTest.java +++ b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringExcludeRoutesTest.java @@ -22,8 +22,8 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNull; @ExcludeRoutes(TestRouteBuilder.class) -public class CamelSpringRunnerExcludeRoutesTest - extends CamelSpringRunnerPlainTest { +public class CamelSpringExcludeRoutesTest + extends CamelSpringPlainTest { @Override @Test diff --git a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerPlainTest.java b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringPlainTest.java similarity index 98% rename from components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerPlainTest.java rename to components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringPlainTest.java index 74bd54c..e9c20ae 100644 --- a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerPlainTest.java +++ b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringPlainTest.java @@ -48,7 +48,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; // from this test and therefore use the same Spring context. Also because we want to reset the // Camel context and mock endpoints between test methods automatically. @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) -public class CamelSpringRunnerPlainTest { +public class CamelSpringPlainTest { @Autowired protected CamelContext camelContext; diff --git a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerShutdownTimeoutInheritedTest.java b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringProvidesBreakpointInherritedTest.java similarity index 88% rename from components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerShutdownTimeoutInheritedTest.java rename to components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringProvidesBreakpointInherritedTest.java index d3ae14f..72f2516 100644 --- a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerShutdownTimeoutInheritedTest.java +++ b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringProvidesBreakpointInherritedTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.test.spring; -public class CamelSpringRunnerShutdownTimeoutInheritedTest - extends CamelSpringRunnerShutdownTimeoutTest { +public class CamelSpringProvidesBreakpointInherritedTest + extends CamelSpringProvidesBreakpointTest { } diff --git a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerProvidesBreakpointTest.java b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringProvidesBreakpointTest.java similarity index 96% rename from components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerProvidesBreakpointTest.java rename to components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringProvidesBreakpointTest.java index 4f97a4e..95a0341 100644 --- a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerProvidesBreakpointTest.java +++ b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringProvidesBreakpointTest.java @@ -28,8 +28,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -public class CamelSpringRunnerProvidesBreakpointTest - extends CamelSpringRunnerPlainTest { +public class CamelSpringProvidesBreakpointTest + extends CamelSpringPlainTest { @ProvidesBreakpoint public static Breakpoint createBreakpoint() { diff --git a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRouteProcessorDumpRouteCoverageTest.java b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRouteProcessorDumpRouteCoverageTest.java index 35183dd..568ce5e 100644 --- a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRouteProcessorDumpRouteCoverageTest.java +++ b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRouteProcessorDumpRouteCoverageTest.java @@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @EnableRouteCoverage -public class CamelSpringRouteProcessorDumpRouteCoverageTest extends CamelSpringRunnerPlainTest { +public class CamelSpringRouteProcessorDumpRouteCoverageTest extends CamelSpringPlainTest { @BeforeAll public static void prepareFiles() throws Exception { diff --git a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerShutdownTimeoutInheritedOverrideTest.java b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringShutdownTimeoutInheritedOverrideTest.java similarity index 91% rename from components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerShutdownTimeoutInheritedOverrideTest.java rename to components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringShutdownTimeoutInheritedOverrideTest.java index 5379597..f9c028a 100644 --- a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerShutdownTimeoutInheritedOverrideTest.java +++ b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringShutdownTimeoutInheritedOverrideTest.java @@ -24,8 +24,8 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @ShutdownTimeout -public class CamelSpringRunnerShutdownTimeoutInheritedOverrideTest - extends CamelSpringRunnerShutdownTimeoutTest { +public class CamelSpringShutdownTimeoutInheritedOverrideTest + extends CamelSpringShutdownTimeoutTest { @Test @Override diff --git a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerProvidesBreakpointInherritedTest.java b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringShutdownTimeoutInheritedTest.java similarity index 87% rename from components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerProvidesBreakpointInherritedTest.java rename to components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringShutdownTimeoutInheritedTest.java index 00b8058..9e2aacc 100644 --- a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerProvidesBreakpointInherritedTest.java +++ b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringShutdownTimeoutInheritedTest.java @@ -16,7 +16,7 @@ */ package org.apache.camel.test.spring; -public class CamelSpringRunnerProvidesBreakpointInherritedTest - extends CamelSpringRunnerProvidesBreakpointTest { +public class CamelSpringShutdownTimeoutInheritedTest + extends CamelSpringShutdownTimeoutTest { } diff --git a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerShutdownTimeoutTest.java b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringShutdownTimeoutTest.java similarity index 93% rename from components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerShutdownTimeoutTest.java rename to components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringShutdownTimeoutTest.java index c6912d4..ebf4cc2 100644 --- a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerShutdownTimeoutTest.java +++ b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringShutdownTimeoutTest.java @@ -24,8 +24,8 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @ShutdownTimeout(value = 11, timeUnit = TimeUnit.MILLISECONDS) -public class CamelSpringRunnerShutdownTimeoutTest - extends CamelSpringRunnerPlainTest { +public class CamelSpringShutdownTimeoutTest + extends CamelSpringPlainTest { @Test @Override diff --git a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerTestPropertySourceTest.java b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringTestPropertySourceTest.java similarity index 96% rename from components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerTestPropertySourceTest.java rename to components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringTestPropertySourceTest.java index c622be5..0f61cce 100644 --- a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerTestPropertySourceTest.java +++ b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringTestPropertySourceTest.java @@ -28,7 +28,7 @@ import org.springframework.test.context.TestPropertySource; @CamelSpringTest @ContextConfiguration @TestPropertySource(properties = "fixedBody=Camel") -public class CamelSpringRunnerTestPropertySourceTest { +public class CamelSpringTestPropertySourceTest { @Produce("direct:in") private ProducerTemplate start; diff --git a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerUseAdviceWithTest.java b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringUseAdviceWithTest.java similarity index 95% rename from components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerUseAdviceWithTest.java rename to components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringUseAdviceWithTest.java index 2c7d016..d53c0d6 100644 --- a/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerUseAdviceWithTest.java +++ b/components/camel-test-spring-junit5/src/test/java/org/apache/camel/test/spring/CamelSpringUseAdviceWithTest.java @@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @UseAdviceWith -public class CamelSpringRunnerUseAdviceWithTest extends CamelSpringRunnerPlainTest { +public class CamelSpringUseAdviceWithTest extends CamelSpringPlainTest { @BeforeEach public void testContextStarted() throws Exception { diff --git a/components/camel-test-spring-junit5/src/test/resources/org/apache/camel/test/spring/CamelSpringRunnerPlainTest-context.xml b/components/camel-test-spring-junit5/src/test/resources/org/apache/camel/test/spring/CamelSpringPlainTest-context.xml similarity index 100% rename from components/camel-test-spring-junit5/src/test/resources/org/apache/camel/test/spring/CamelSpringRunnerPlainTest-context.xml rename to components/camel-test-spring-junit5/src/test/resources/org/apache/camel/test/spring/CamelSpringPlainTest-context.xml diff --git a/components/camel-test-spring-junit5/src/test/resources/org/apache/camel/test/spring/CamelSpringRunnerTestPropertySourceTest-context.xml b/components/camel-test-spring-junit5/src/test/resources/org/apache/camel/test/spring/CamelSpringTestPropertySourceTest-context.xml similarity index 100% rename from components/camel-test-spring-junit5/src/test/resources/org/apache/camel/test/spring/CamelSpringRunnerTestPropertySourceTest-context.xml rename to components/camel-test-spring-junit5/src/test/resources/org/apache/camel/test/spring/CamelSpringTestPropertySourceTest-context.xml