You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by al...@apache.org on 2019/08/05 13:35:34 UTC
[camel] 01/09: CAMEL-13342: Created CamelTest annotation and move
existing tests to **test/junit4**
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch CAMEL-13342-JUNIT5-EXPLORATORY
in repository https://gitbox.apache.org/repos/asf/camel.git
commit afced8d2ef32a4d9c009bad9d6685fdde6b2e7d9
Author: aldettinger <al...@gmail.com>
AuthorDate: Wed Jun 5 14:11:35 2019 +0200
CAMEL-13342: Created CamelTest annotation and move existing tests to **test/junit4**
---
components/camel-test/pom.xml | 5 +++++
.../org/apache/camel/test/junit5/CamelTest.java} | 20 ++++++++------------
.../patterns/AdviceWithNotStartedTest.java | 2 +-
.../{ => junit4}/patterns/AsyncSendMockTest.java | 2 +-
.../test/{ => junit4}/patterns/DebugJUnit4Test.java | 2 +-
.../patterns/DebugNoLazyTypeConverterTest.java | 2 +-
.../camel/test/{ => junit4}/patterns/DebugTest.java | 2 +-
.../FilterCreateCamelContextPerClassTest.java | 2 +-
.../patterns/FilterFluentTemplateTest.java | 2 +-
.../test/{ => junit4}/patterns/FilterJUnit4Test.java | 2 +-
.../camel/test/{ => junit4}/patterns/FilterTest.java | 2 +-
.../patterns/IsMockEndpointsAndSkipJUnit4Test.java | 2 +-
.../patterns/IsMockEndpointsFileTest.java | 2 +-
.../patterns/IsMockEndpointsJUnit4Test.java | 2 +-
.../{ => junit4}/patterns/IsMockEndpointsTest.java | 2 +-
.../patterns/MockEndpointFailNoHeaderTest.java | 2 +-
.../test/{ => junit4}/patterns/MyProduceBean.java | 2 +-
.../camel/test/{ => junit4}/patterns/MySender.java | 2 +-
.../test/{ => junit4}/patterns/ProduceBeanTest.java | 2 +-
.../patterns/RouteBuilderConfigureExceptionTest.java | 2 +-
.../RouteProcessorDumpRouteCoverageTest.java | 2 +-
.../patterns/SimpleMockEndpointsTest.java | 2 +-
.../test/{ => junit4}/patterns/SimpleMockTest.java | 2 +-
.../patterns/SimpleNotifyBuilderTest.java | 2 +-
.../patterns/SimpleWeaveAddMockLastTest.java | 2 +-
...verridePropertiesWithPropertiesComponentTest.java | 2 +-
26 files changed, 37 insertions(+), 36 deletions(-)
diff --git a/components/camel-test/pom.xml b/components/camel-test/pom.xml
index 2e70437..c3485f4 100644
--- a/components/camel-test/pom.xml
+++ b/components/camel-test/pom.xml
@@ -54,6 +54,11 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>5.5.0-M1</version>
+ </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/MyProduceBean.java b/components/camel-test/src/main/java/org/apache/camel/test/junit5/CamelTest.java
similarity index 73%
copy from components/camel-test/src/test/java/org/apache/camel/test/patterns/MyProduceBean.java
copy to components/camel-test/src/main/java/org/apache/camel/test/junit5/CamelTest.java
index d8864c9..05ed250 100644
--- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/MyProduceBean.java
+++ b/components/camel-test/src/main/java/org/apache/camel/test/junit5/CamelTest.java
@@ -14,19 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.test.patterns;
+package org.apache.camel.test.junit5;
-import org.apache.camel.Produce;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
-/**
- *
- */
-public class MyProduceBean {
-
- @Produce("mock:result")
- MySender sender;
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface CamelTest {
- public void doSomething(String body) {
- sender.send(body);
- }
}
diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/AdviceWithNotStartedTest.java b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/AdviceWithNotStartedTest.java
similarity index 98%
rename from components/camel-test/src/test/java/org/apache/camel/test/patterns/AdviceWithNotStartedTest.java
rename to components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/AdviceWithNotStartedTest.java
index bcbc0e4..2d792c4 100644
--- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/AdviceWithNotStartedTest.java
+++ b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/AdviceWithNotStartedTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.test.patterns;
+package org.apache.camel.test.junit4.patterns;
import java.util.concurrent.RejectedExecutionException;
diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/AsyncSendMockTest.java b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/AsyncSendMockTest.java
similarity index 97%
rename from components/camel-test/src/test/java/org/apache/camel/test/patterns/AsyncSendMockTest.java
rename to components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/AsyncSendMockTest.java
index 48d818d..4e37d70 100644
--- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/AsyncSendMockTest.java
+++ b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/AsyncSendMockTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.test.patterns;
+package org.apache.camel.test.junit4.patterns;
import org.apache.camel.support.DefaultExchange;
import org.apache.camel.test.junit4.CamelTestSupport;
diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugJUnit4Test.java b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/DebugJUnit4Test.java
similarity index 98%
rename from components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugJUnit4Test.java
rename to components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/DebugJUnit4Test.java
index 6aa7524..7b28a24 100644
--- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugJUnit4Test.java
+++ b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/DebugJUnit4Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.test.patterns;
+package org.apache.camel.test.junit4.patterns;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugNoLazyTypeConverterTest.java b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/DebugNoLazyTypeConverterTest.java
similarity index 98%
rename from components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugNoLazyTypeConverterTest.java
rename to components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/DebugNoLazyTypeConverterTest.java
index 31e8938..763123d 100644
--- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugNoLazyTypeConverterTest.java
+++ b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/DebugNoLazyTypeConverterTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.test.patterns;
+package org.apache.camel.test.junit4.patterns;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugTest.java b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/DebugTest.java
similarity index 98%
rename from components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugTest.java
rename to components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/DebugTest.java
index c7b7466..9e31817 100644
--- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugTest.java
+++ b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/DebugTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.test.patterns;
+package org.apache.camel.test.junit4.patterns;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterCreateCamelContextPerClassTest.java b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/FilterCreateCamelContextPerClassTest.java
similarity index 97%
rename from components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterCreateCamelContextPerClassTest.java
rename to components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/FilterCreateCamelContextPerClassTest.java
index 0392f0f..d9ce4a2 100644
--- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterCreateCamelContextPerClassTest.java
+++ b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/FilterCreateCamelContextPerClassTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.test.patterns;
+package org.apache.camel.test.junit4.patterns;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterFluentTemplateTest.java b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/FilterFluentTemplateTest.java
similarity index 98%
rename from components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterFluentTemplateTest.java
rename to components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/FilterFluentTemplateTest.java
index 913ecbe..72df15d 100644
--- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterFluentTemplateTest.java
+++ b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/FilterFluentTemplateTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.test.patterns;
+package org.apache.camel.test.junit4.patterns;
import org.apache.camel.EndpointInject;
import org.apache.camel.FluentProducerTemplate;
diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterJUnit4Test.java b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/FilterJUnit4Test.java
similarity index 97%
rename from components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterJUnit4Test.java
rename to components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/FilterJUnit4Test.java
index 9213e5b..54386b9 100644
--- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterJUnit4Test.java
+++ b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/FilterJUnit4Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.test.patterns;
+package org.apache.camel.test.junit4.patterns;
import org.apache.camel.EndpointInject;
import org.apache.camel.Produce;
diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/FilterTest.java
similarity index 98%
rename from components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java
rename to components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/FilterTest.java
index 8ad2636..aa13656 100644
--- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java
+++ b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/FilterTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.test.patterns;
+package org.apache.camel.test.junit4.patterns;
import org.apache.camel.EndpointInject;
import org.apache.camel.Produce;
diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsAndSkipJUnit4Test.java b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/IsMockEndpointsAndSkipJUnit4Test.java
similarity index 98%
rename from components/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsAndSkipJUnit4Test.java
rename to components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/IsMockEndpointsAndSkipJUnit4Test.java
index da82ca0..8e2a91a 100644
--- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsAndSkipJUnit4Test.java
+++ b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/IsMockEndpointsAndSkipJUnit4Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.test.patterns;
+package org.apache.camel.test.junit4.patterns;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.seda.SedaEndpoint;
diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsFileTest.java b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/IsMockEndpointsFileTest.java
similarity index 98%
rename from components/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsFileTest.java
rename to components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/IsMockEndpointsFileTest.java
index 9df144b..82b08c9 100644
--- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsFileTest.java
+++ b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/IsMockEndpointsFileTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.test.patterns;
+package org.apache.camel.test.junit4.patterns;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsJUnit4Test.java b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/IsMockEndpointsJUnit4Test.java
similarity index 98%
rename from components/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsJUnit4Test.java
rename to components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/IsMockEndpointsJUnit4Test.java
index d8cf4c0..d8cfbaa 100644
--- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsJUnit4Test.java
+++ b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/IsMockEndpointsJUnit4Test.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.test.patterns;
+package org.apache.camel.test.junit4.patterns;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsTest.java b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/IsMockEndpointsTest.java
similarity index 98%
rename from components/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsTest.java
rename to components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/IsMockEndpointsTest.java
index e3bcb9e..ed3288b 100644
--- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsTest.java
+++ b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/IsMockEndpointsTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.test.patterns;
+package org.apache.camel.test.junit4.patterns;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/MockEndpointFailNoHeaderTest.java b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/MockEndpointFailNoHeaderTest.java
similarity index 97%
rename from components/camel-test/src/test/java/org/apache/camel/test/patterns/MockEndpointFailNoHeaderTest.java
rename to components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/MockEndpointFailNoHeaderTest.java
index c878091..9b341eb 100644
--- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/MockEndpointFailNoHeaderTest.java
+++ b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/MockEndpointFailNoHeaderTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.test.patterns;
+package org.apache.camel.test.junit4.patterns;
import org.apache.camel.EndpointInject;
import org.apache.camel.Produce;
diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/MyProduceBean.java b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/MyProduceBean.java
similarity index 95%
rename from components/camel-test/src/test/java/org/apache/camel/test/patterns/MyProduceBean.java
rename to components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/MyProduceBean.java
index d8864c9..696b6ea 100644
--- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/MyProduceBean.java
+++ b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/MyProduceBean.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.test.patterns;
+package org.apache.camel.test.junit4.patterns;
import org.apache.camel.Produce;
diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/MySender.java b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/MySender.java
similarity index 94%
rename from components/camel-test/src/test/java/org/apache/camel/test/patterns/MySender.java
rename to components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/MySender.java
index 0319c98..c68a1c6 100644
--- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/MySender.java
+++ b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/MySender.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.test.patterns;
+package org.apache.camel.test.junit4.patterns;
/**
*
diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/ProduceBeanTest.java b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/ProduceBeanTest.java
similarity index 97%
rename from components/camel-test/src/test/java/org/apache/camel/test/patterns/ProduceBeanTest.java
rename to components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/ProduceBeanTest.java
index 2050e6c..bb49119 100644
--- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/ProduceBeanTest.java
+++ b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/ProduceBeanTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.test.patterns;
+package org.apache.camel.test.junit4.patterns;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/RouteBuilderConfigureExceptionTest.java b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/RouteBuilderConfigureExceptionTest.java
similarity index 97%
rename from components/camel-test/src/test/java/org/apache/camel/test/patterns/RouteBuilderConfigureExceptionTest.java
rename to components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/RouteBuilderConfigureExceptionTest.java
index 033d64c..7d2c456 100644
--- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/RouteBuilderConfigureExceptionTest.java
+++ b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/RouteBuilderConfigureExceptionTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.test.patterns;
+package org.apache.camel.test.junit4.patterns;
import org.apache.camel.Predicate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/RouteProcessorDumpRouteCoverageTest.java b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/RouteProcessorDumpRouteCoverageTest.java
similarity index 97%
rename from components/camel-test/src/test/java/org/apache/camel/test/patterns/RouteProcessorDumpRouteCoverageTest.java
rename to components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/RouteProcessorDumpRouteCoverageTest.java
index 675c14e..6bfbd6a 100644
--- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/RouteProcessorDumpRouteCoverageTest.java
+++ b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/RouteProcessorDumpRouteCoverageTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.test.patterns;
+package org.apache.camel.test.junit4.patterns;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/SimpleMockEndpointsTest.java b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/SimpleMockEndpointsTest.java
similarity index 97%
rename from components/camel-test/src/test/java/org/apache/camel/test/patterns/SimpleMockEndpointsTest.java
rename to components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/SimpleMockEndpointsTest.java
index 786d972..ad66ca0 100644
--- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/SimpleMockEndpointsTest.java
+++ b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/SimpleMockEndpointsTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.test.patterns;
+package org.apache.camel.test.junit4.patterns;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/SimpleMockTest.java b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/SimpleMockTest.java
similarity index 97%
rename from components/camel-test/src/test/java/org/apache/camel/test/patterns/SimpleMockTest.java
rename to components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/SimpleMockTest.java
index c9b89aa..1bbd710 100644
--- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/SimpleMockTest.java
+++ b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/SimpleMockTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.test.patterns;
+package org.apache.camel.test.junit4.patterns;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/SimpleNotifyBuilderTest.java b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/SimpleNotifyBuilderTest.java
similarity index 97%
rename from components/camel-test/src/test/java/org/apache/camel/test/patterns/SimpleNotifyBuilderTest.java
rename to components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/SimpleNotifyBuilderTest.java
index e8640ee..577587b 100644
--- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/SimpleNotifyBuilderTest.java
+++ b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/SimpleNotifyBuilderTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.test.patterns;
+package org.apache.camel.test.junit4.patterns;
import java.util.concurrent.TimeUnit;
diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/SimpleWeaveAddMockLastTest.java b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/SimpleWeaveAddMockLastTest.java
similarity index 97%
rename from components/camel-test/src/test/java/org/apache/camel/test/patterns/SimpleWeaveAddMockLastTest.java
rename to components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/SimpleWeaveAddMockLastTest.java
index 3a34b94..878b31d 100644
--- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/SimpleWeaveAddMockLastTest.java
+++ b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/SimpleWeaveAddMockLastTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.test.patterns;
+package org.apache.camel.test.junit4.patterns;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.AdviceWithRouteBuilder;
diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/UseOverridePropertiesWithPropertiesComponentTest.java b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/UseOverridePropertiesWithPropertiesComponentTest.java
similarity index 98%
rename from components/camel-test/src/test/java/org/apache/camel/test/patterns/UseOverridePropertiesWithPropertiesComponentTest.java
rename to components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/UseOverridePropertiesWithPropertiesComponentTest.java
index fbcba31..ac72996 100644
--- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/UseOverridePropertiesWithPropertiesComponentTest.java
+++ b/components/camel-test/src/test/java/org/apache/camel/test/junit4/patterns/UseOverridePropertiesWithPropertiesComponentTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.test.patterns;
+package org.apache.camel.test.junit4.patterns;
import java.util.Properties;