This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch mock
in repository https://gitbox.apache.org/repos/asf/camel.git
commit da697998e51f7e57fef7228e928db05ab33f110d
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Apr 17 09:03:54 2019 +0200
Move mock component out of camel-core. Work in progress.
---
MIGRATION.md | 4 ---
components/camel-dataset/pom.xml | 27 ------------------
.../src/test/resources/log4j2.properties | 32 ----------------------
core/camel-core/pom.xml | 4 +++
.../src/test/data/file-dataset-test.txt | 0
.../camel/component/dataset/BigDataSetTest.java | 4 +--
.../camel/component/dataset/CustomDataSetTest.java | 4 +--
.../component/dataset/DataSetConsumerTest.java | 17 ++++++------
.../component/dataset/DataSetEndpointTest.java | 18 ++++++------
.../component/dataset/DataSetPreloadTest.java | 9 +++---
.../component/dataset/DataSetProducerTest.java | 13 +++++----
.../camel/component/dataset/DataSetSedaTest.java | 4 +--
.../camel/component/dataset/DataSetTest.java | 4 +--
.../component/dataset/DataSetTestAnyOrderTest.java | 4 +--
.../component/dataset/DataSetTestEndpointTest.java | 7 ++---
.../dataset/DataSetTestFileSplitTest.java | 4 +--
.../component/dataset/DataSetTestFileTest.java | 4 +--
.../component/dataset/DataSetTestSedaTest.java | 4 +--
.../component/dataset/FileDataSetConsumerTest.java | 7 +++--
.../dataset/FileDataSetConsumerWithSplitTest.java | 7 +++--
.../component/dataset/FileDataSetProducerTest.java | 7 +++--
.../dataset/FileDataSetProducerWithSplitTest.java | 11 ++++----
.../component/dataset/ListDataSetConsumerTest.java | 4 +--
.../component/dataset/ListDataSetProducerTest.java | 4 +--
.../component/dataset/RoutePerformanceTest.java | 7 ++---
25 files changed, 75 insertions(+), 135 deletions(-)
diff --git a/MIGRATION.md b/MIGRATION.md
index 6377a66..504c2af 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -88,10 +88,6 @@ The `test` component has been renamed to `dataset-test` and
moved out of `camel-
We have also renamed `camel-jetty9` to `camel-jetty`.
-### DataSet component
-
-The `dataset` component has been moved out of `camel-core`, and is no longer a
transient dependency from `camel-core`, and therefore you should add
`camel-dataset` as dependency if you use this component.
-
### Mock component
The `mock` component has been moved out of `camel-core` and as part of this
work, we had to remove a number of methods on its _assertion clause builder_
that were seldom in use. Also we had to remove a few methods on `NotifyBuilder`
that were using the `mock` component.
diff --git a/components/camel-dataset/pom.xml b/components/camel-dataset/pom.xml
index e307bcb..d7d5460 100644
--- a/components/camel-dataset/pom.xml
+++ b/components/camel-dataset/pom.xml
@@ -40,32 +40,5 @@
<artifactId>camel-mock</artifactId>
</dependency>
- <!-- testing -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/components/camel-dataset/src/test/resources/log4j2.properties
b/components/camel-dataset/src/test/resources/log4j2.properties
deleted file mode 100644
index c4e867c..0000000
--- a/components/camel-dataset/src/test/resources/log4j2.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-appender.console.type = Console
-appender.console.name = console
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
-
-appender.file.type = File
-appender.file.name = file
-appender.file.fileName = target/camel-dataset-test.log
-appender.file.append = true
-appender.file.layout.type = PatternLayout
-appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
-
-rootLogger.level = INFO
-
-rootLogger.appenderRef.file.ref = file
-#rootLogger.appenderRef.console.ref = console
diff --git a/core/camel-core/pom.xml b/core/camel-core/pom.xml
index 7ff8da9..a789e94 100644
--- a/core/camel-core/pom.xml
+++ b/core/camel-core/pom.xml
@@ -107,6 +107,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-dataset</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-direct</artifactId>
</dependency>
<dependency>
diff --git a/components/camel-dataset/src/test/data/file-dataset-test.txt
b/core/camel-core/src/test/data/file-dataset-test.txt
similarity index 100%
rename from components/camel-dataset/src/test/data/file-dataset-test.txt
rename to core/camel-core/src/test/data/file-dataset-test.txt
diff --git
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/BigDataSetTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/BigDataSetTest.java
similarity index 94%
rename from
components/camel-dataset/src/test/java/org/apache/camel/component/dataset/BigDataSetTest.java
rename to
core/camel-core/src/test/java/org/apache/camel/component/dataset/BigDataSetTest.java
index 7583fa2..f2a5636 100644
---
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/BigDataSetTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/BigDataSetTest.java
@@ -20,14 +20,14 @@ import java.util.concurrent.TimeUnit;
import javax.naming.Context;
+import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Ignore;
import org.junit.Test;
@Ignore("Manual test")
-public class BigDataSetTest extends CamelTestSupport {
+public class BigDataSetTest extends ContextTestSupport {
protected SimpleDataSet dataSet = new SimpleDataSet(20000);
@Test
diff --git
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java
similarity index 95%
rename from
components/camel-dataset/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java
rename to
core/camel-core/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java
index 4e907f0..1903bd4 100644
---
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.dataset;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Predicate;
@@ -25,10 +26,9 @@ import org.apache.camel.builder.PredicateBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.builder.xml.XPathBuilder;
import org.apache.camel.support.PredicateAssertHelper;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-public class CustomDataSetTest extends CamelTestSupport {
+public class CustomDataSetTest extends ContextTestSupport {
@BindToRegistry("foo")
protected DataSet dataSet = new DataSetSupport() {
diff --git
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetConsumerTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetConsumerTest.java
similarity index 86%
rename from
components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetConsumerTest.java
rename to
core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetConsumerTest.java
index b6ecada..c6b2f07 100644
---
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetConsumerTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetConsumerTest.java
@@ -17,15 +17,14 @@
package org.apache.camel.component.dataset;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.camel.test.junit4.TestSupport;
import org.junit.Assert;
import org.junit.Test;
-public class DataSetConsumerTest extends CamelTestSupport {
+public class DataSetConsumerTest extends ContextTestSupport {
@BindToRegistry("foo")
protected SimpleDataSet dataSet = new SimpleDataSet(5);
@@ -54,7 +53,7 @@ public class DataSetConsumerTest extends CamelTestSupport {
MockEndpoint result = getMockEndpoint(resultUri);
result.expectedMessageCount((int) dataSet.getSize());
-
result.assertMessagesAscending(TestSupport.header(Exchange.DATASET_INDEX));
+ result.assertMessagesAscending(header(Exchange.DATASET_INDEX));
context.start();
@@ -75,11 +74,11 @@ public class DataSetConsumerTest extends CamelTestSupport {
}
});
- assertEquals("expectedMessageCount should be the same as the DataSet
size for a consumer-producer endpoint", dataSet.getSize(),
getMockEndpoint(dataSetUri).getExpectedCount());
+ Assert.assertEquals("expectedMessageCount should be the same as the
DataSet size for a consumer-producer endpoint", dataSet.getSize(),
getMockEndpoint(dataSetUri).getExpectedCount());
MockEndpoint result = getMockEndpoint(resultUri);
result.expectedMessageCount((int) dataSet.getSize());
-
result.expectsAscending(TestSupport.header(Exchange.DATASET_INDEX).convertTo(Number.class));
+
result.expectsAscending(header(Exchange.DATASET_INDEX).convertTo(Number.class));
context.start();
@@ -99,7 +98,7 @@ public class DataSetConsumerTest extends CamelTestSupport {
MockEndpoint result = getMockEndpoint(resultUri);
result.expectedMessageCount((int) dataSet.getSize());
result.allMessages().header(Exchange.DATASET_INDEX).isNotNull();
-
result.expectsAscending(TestSupport.header(Exchange.DATASET_INDEX).convertTo(Number.class));
+
result.expectsAscending(header(Exchange.DATASET_INDEX).convertTo(Number.class));
context.start();
@@ -138,7 +137,7 @@ public class DataSetConsumerTest extends CamelTestSupport {
MockEndpoint result = getMockEndpoint(resultUri);
result.expectedMessageCount((int) dataSet.getSize());
result.allMessages().header(Exchange.DATASET_INDEX).isNotNull();
-
result.expectsAscending(TestSupport.header(Exchange.DATASET_INDEX).convertTo(Number.class));
+
result.expectsAscending(header(Exchange.DATASET_INDEX).convertTo(Number.class));
context.start();
@@ -158,7 +157,7 @@ public class DataSetConsumerTest extends CamelTestSupport {
MockEndpoint result = getMockEndpoint(resultUri);
result.expectedMessageCount((int) dataSet.getSize());
result.allMessages().header(Exchange.DATASET_INDEX).isNotNull();
-
result.expectsAscending(TestSupport.header(Exchange.DATASET_INDEX).convertTo(Number.class));
+
result.expectsAscending(header(Exchange.DATASET_INDEX).convertTo(Number.class));
context.start();
diff --git
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetEndpointTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetEndpointTest.java
similarity index 89%
rename from
components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetEndpointTest.java
rename to
core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetEndpointTest.java
index 9d34415..a5a5434 100644
---
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetEndpointTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetEndpointTest.java
@@ -18,14 +18,14 @@ package org.apache.camel.component.dataset;
import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Assert;
import org.junit.Test;
-public class DataSetEndpointTest extends CamelTestSupport {
+public class DataSetEndpointTest extends ContextTestSupport {
@Override
public boolean isUseRouteBuilder() {
@@ -38,9 +38,9 @@ public class DataSetEndpointTest extends CamelTestSupport {
endpoint.setCamelContext(context);
endpoint.setInitialDelay(0);
- assertEquals(0, endpoint.getPreloadSize());
- assertEquals(0, endpoint.getConsumeDelay());
- assertEquals(3, endpoint.getProduceDelay());
+ Assert.assertEquals(0, endpoint.getPreloadSize());
+ Assert.assertEquals(0, endpoint.getConsumeDelay());
+ Assert.assertEquals(3, endpoint.getProduceDelay());
context.addRoutes(new RouteBuilder() {
@Override
@@ -59,11 +59,11 @@ public class DataSetEndpointTest extends CamelTestSupport {
final DataSetEndpoint endpoint = new DataSetEndpoint("dataset://foo",
context.getComponent("dataset"), new SimpleDataSet(2));
endpoint.setConsumeDelay(2);
- assertEquals(2, endpoint.getConsumeDelay());
+ Assert.assertEquals(2, endpoint.getConsumeDelay());
endpoint.setProduceDelay(5);
- assertEquals(5, endpoint.getProduceDelay());
+ Assert.assertEquals(5, endpoint.getProduceDelay());
endpoint.setInitialDelay(1);
- assertEquals(1, endpoint.getInitialDelay());
+ Assert.assertEquals(1, endpoint.getInitialDelay());
context.addRoutes(new RouteBuilder() {
@Override
@@ -107,7 +107,7 @@ public class DataSetEndpointTest extends CamelTestSupport {
SimpleDataSet ds = new SimpleDataSet();
ds.setSize(2);
ds.setDefaultBody("Hi");
- assertEquals("Hi", ds.getDefaultBody());
+ Assert.assertEquals("Hi", ds.getDefaultBody());
}
@Test
diff --git
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetPreloadTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetPreloadTest.java
similarity index 89%
rename from
components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetPreloadTest.java
rename to
core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetPreloadTest.java
index f2f1136..ee708cc 100644
---
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetPreloadTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetPreloadTest.java
@@ -17,12 +17,13 @@
package org.apache.camel.component.dataset;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Assert;
import org.junit.Test;
-public class DataSetPreloadTest extends CamelTestSupport {
+public class DataSetPreloadTest extends ContextTestSupport {
@BindToRegistry("foo")
private SimpleDataSet dataSet = new SimpleDataSet(20);
@@ -39,11 +40,11 @@ public class DataSetPreloadTest extends CamelTestSupport {
assertMockEndpointsSatisfied();
DataSetEndpoint ds = context.getEndpoint(uri, DataSetEndpoint.class);
- assertEquals(5, ds.getPreloadSize());
+ Assert.assertEquals(5, ds.getPreloadSize());
// test getter/setter
ds.setPreloadSize(7);
- assertEquals(7, ds.getPreloadSize());
+ Assert.assertEquals(7, ds.getPreloadSize());
}
@Override
diff --git
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetProducerTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetProducerTest.java
similarity index 97%
rename from
components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetProducerTest.java
rename to
core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetProducerTest.java
index 6dc7c16..eadc69f 100644
---
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetProducerTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetProducerTest.java
@@ -17,14 +17,15 @@
package org.apache.camel.component.dataset;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.NoSuchHeaderException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Assert;
import org.junit.Test;
-public class DataSetProducerTest extends CamelTestSupport {
+public class DataSetProducerTest extends ContextTestSupport {
@BindToRegistry("foo")
protected SimpleDataSet dataSet = new SimpleDataSet(20);
@@ -173,7 +174,7 @@ public class DataSetProducerTest extends CamelTestSupport {
}
}
- fail("AssertionError should have been generated");
+ Assert.fail("AssertionError should have been generated");
}
@Test
@@ -327,7 +328,7 @@ public class DataSetProducerTest extends CamelTestSupport {
}
}
- fail("AssertionError should have been generated");
+ Assert.fail("AssertionError should have been generated");
}
@Test
@@ -401,7 +402,7 @@ public class DataSetProducerTest extends CamelTestSupport {
}
}
- fail("AssertionError should have been generated");
+ Assert.fail("AssertionError should have been generated");
}
@Test
@@ -446,6 +447,6 @@ public class DataSetProducerTest extends CamelTestSupport {
}
}
- fail("AssertionError should have been generated");
+ Assert.fail("AssertionError should have been generated");
}
}
\ No newline at end of file
diff --git
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java
similarity index 94%
rename from
components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java
rename to
core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java
index 305f2a6..9c229a5 100644
---
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java
@@ -17,15 +17,15 @@
package org.apache.camel.component.dataset;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
/**
* Unit test to demonstrate high concurrency with seda. Offspring by CAMEL-605.
*/
-public class DataSetSedaTest extends CamelTestSupport {
+public class DataSetSedaTest extends ContextTestSupport {
@BindToRegistry("foo")
private SimpleDataSet dataSet = new SimpleDataSet(200);
diff --git
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTest.java
similarity index 94%
rename from
components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetTest.java
rename to
core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTest.java
index 6e68e08..65b09e1 100644
---
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTest.java
@@ -17,11 +17,11 @@
package org.apache.camel.component.dataset;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-public class DataSetTest extends CamelTestSupport {
+public class DataSetTest extends ContextTestSupport {
@BindToRegistry("foo")
protected SimpleDataSet dataSet = new SimpleDataSet(20);
diff --git
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetTestAnyOrderTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestAnyOrderTest.java
similarity index 93%
rename from
components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetTestAnyOrderTest.java
rename to
core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestAnyOrderTest.java
index a67fc79..85af448 100644
---
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetTestAnyOrderTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestAnyOrderTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.camel.component.dataset;
+import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-public class DataSetTestAnyOrderTest extends CamelTestSupport {
+public class DataSetTestAnyOrderTest extends ContextTestSupport {
@Override
public boolean isUseRouteBuilder() {
diff --git
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetTestEndpointTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestEndpointTest.java
similarity index 96%
rename from
components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetTestEndpointTest.java
rename to
core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestEndpointTest.java
index d5c13ac..5c4239c 100644
---
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetTestEndpointTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestEndpointTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.dataset;
import org.apache.camel.CamelContext;
import org.apache.camel.Consumer;
+import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
@@ -25,13 +26,9 @@ import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.support.DefaultEndpoint;
import org.apache.camel.support.DefaultExchange;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-/**
- *
- */
-public class DataSetTestEndpointTest extends CamelTestSupport {
+public class DataSetTestEndpointTest extends ContextTestSupport {
private String expectedBody = "Hello World";
diff --git
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetTestFileSplitTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestFileSplitTest.java
similarity index 94%
rename from
components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetTestFileSplitTest.java
rename to
core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestFileSplitTest.java
index 368274d..50f2124 100644
---
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetTestFileSplitTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestFileSplitTest.java
@@ -16,13 +16,13 @@
*/
package org.apache.camel.component.dataset;
+import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-public class DataSetTestFileSplitTest extends CamelTestSupport {
+public class DataSetTestFileSplitTest extends ContextTestSupport {
@Override
public boolean isUseRouteBuilder() {
diff --git
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetTestFileTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestFileTest.java
similarity index 93%
rename from
components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetTestFileTest.java
rename to
core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestFileTest.java
index 1ee74bf..b07e667 100644
---
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetTestFileTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestFileTest.java
@@ -16,13 +16,13 @@
*/
package org.apache.camel.component.dataset;
+import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-public class DataSetTestFileTest extends CamelTestSupport {
+public class DataSetTestFileTest extends ContextTestSupport {
@Override
public boolean isUseRouteBuilder() {
diff --git
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetTestSedaTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestSedaTest.java
similarity index 92%
rename from
components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetTestSedaTest.java
rename to
core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestSedaTest.java
index 3cbe07c..da1c6d1 100644
---
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/DataSetTestSedaTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTestSedaTest.java
@@ -16,11 +16,11 @@
*/
package org.apache.camel.component.dataset;
+import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-public class DataSetTestSedaTest extends CamelTestSupport {
+public class DataSetTestSedaTest extends ContextTestSupport {
@Override
public boolean isUseRouteBuilder() {
diff --git
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerTest.java
similarity index 91%
rename from
components/camel-dataset/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerTest.java
rename to
core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerTest.java
index 8377c9d..cce4584 100644
---
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerTest.java
@@ -17,13 +17,14 @@
package org.apache.camel.component.dataset;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-public class FileDataSetConsumerTest extends CamelTestSupport {
+public class FileDataSetConsumerTest extends ContextTestSupport {
@BindToRegistry("foo")
protected FileDataSet dataSet;
@@ -54,7 +55,7 @@ public class FileDataSetConsumerTest extends CamelTestSupport
{
@Before
public void setUp() throws Exception {
dataSet = new FileDataSet(testDataFileName);
- assertEquals("Unexpected DataSet size", 1, dataSet.getSize());
+ Assert.assertEquals("Unexpected DataSet size", 1, dataSet.getSize());
super.setUp();
}
diff --git
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerWithSplitTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerWithSplitTest.java
similarity index 90%
rename from
components/camel-dataset/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerWithSplitTest.java
rename to
core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerWithSplitTest.java
index 0fa307f..57841cf 100644
---
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerWithSplitTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerWithSplitTest.java
@@ -17,13 +17,14 @@
package org.apache.camel.component.dataset;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-public class FileDataSetConsumerWithSplitTest extends CamelTestSupport {
+public class FileDataSetConsumerWithSplitTest extends ContextTestSupport {
@BindToRegistry("foo")
protected FileDataSet dataSet;
@@ -55,7 +56,7 @@ public class FileDataSetConsumerWithSplitTest extends
CamelTestSupport {
@Before
public void setUp() throws Exception {
dataSet = new FileDataSet(testDataFileName, "\n");
- assertEquals("Unexpected DataSet size", testDataFileRecordCount,
dataSet.getSize());
+ Assert.assertEquals("Unexpected DataSet size",
testDataFileRecordCount, dataSet.getSize());
super.setUp();
}
diff --git
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerTest.java
similarity index 93%
rename from
components/camel-dataset/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerTest.java
rename to
core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerTest.java
index f349f6d..22d0d63 100644
---
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerTest.java
@@ -23,15 +23,16 @@ import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-public class FileDataSetProducerTest extends CamelTestSupport {
+public class FileDataSetProducerTest extends ContextTestSupport {
@Rule
public TemporaryFolder tempFolder = new TemporaryFolder();
@@ -71,7 +72,7 @@ public class FileDataSetProducerTest extends CamelTestSupport
{
public void setUp() throws Exception {
File fileDataset = createFileDatasetWithSystemEndOfLine();
dataSet = new FileDataSet(fileDataset);
- assertEquals("Unexpected DataSet size", 1, dataSet.getSize());
+ Assert.assertEquals("Unexpected DataSet size", 1, dataSet.getSize());
super.setUp();
}
diff --git
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerWithSplitTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerWithSplitTest.java
similarity index 88%
rename from
components/camel-dataset/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerWithSplitTest.java
rename to
core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerWithSplitTest.java
index b0d455c..4dbb1ac 100644
---
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerWithSplitTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerWithSplitTest.java
@@ -23,16 +23,16 @@ import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.camel.test.junit4.TestSupport;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-public class FileDataSetProducerWithSplitTest extends CamelTestSupport {
+public class FileDataSetProducerWithSplitTest extends ContextTestSupport {
@Rule
public TemporaryFolder tempFolder = new TemporaryFolder();
@@ -40,7 +40,6 @@ public class FileDataSetProducerWithSplitTest extends
CamelTestSupport {
@BindToRegistry("foo")
protected FileDataSet dataSet;
- final String testDataFileName = "src/test/data/file-dataset-test.txt";
final int testDataFileRecordCount = 10;
final String sourceUri = "direct://source";
@@ -74,8 +73,8 @@ public class FileDataSetProducerWithSplitTest extends
CamelTestSupport {
@Before
public void setUp() throws Exception {
File fileDataset = createFileDatasetWithSystemEndOfLine();
- dataSet = new FileDataSet(fileDataset, TestSupport.LS);
- assertEquals("Unexpected DataSet size", testDataFileRecordCount,
dataSet.getSize());
+ dataSet = new FileDataSet(fileDataset, LS);
+ Assert.assertEquals("Unexpected DataSet size",
testDataFileRecordCount, dataSet.getSize());
super.setUp();
}
diff --git
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/ListDataSetConsumerTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/ListDataSetConsumerTest.java
similarity index 95%
rename from
components/camel-dataset/src/test/java/org/apache/camel/component/dataset/ListDataSetConsumerTest.java
rename to
core/camel-core/src/test/java/org/apache/camel/component/dataset/ListDataSetConsumerTest.java
index f3403d9..70146e1 100644
---
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/ListDataSetConsumerTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/ListDataSetConsumerTest.java
@@ -20,13 +20,13 @@ import java.util.LinkedList;
import java.util.List;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Before;
import org.junit.Test;
-public class ListDataSetConsumerTest extends CamelTestSupport {
+public class ListDataSetConsumerTest extends ContextTestSupport {
@BindToRegistry("foo")
protected ListDataSet dataSet;
diff --git
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/ListDataSetProducerTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/ListDataSetProducerTest.java
similarity index 95%
rename from
components/camel-dataset/src/test/java/org/apache/camel/component/dataset/ListDataSetProducerTest.java
rename to
core/camel-core/src/test/java/org/apache/camel/component/dataset/ListDataSetProducerTest.java
index 126df14..982678b 100644
---
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/ListDataSetProducerTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/ListDataSetProducerTest.java
@@ -20,13 +20,13 @@ import java.util.LinkedList;
import java.util.List;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Before;
import org.junit.Test;
-public class ListDataSetProducerTest extends CamelTestSupport {
+public class ListDataSetProducerTest extends ContextTestSupport {
@BindToRegistry("foo")
protected ListDataSet dataSet = new ListDataSet();
diff --git
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/RoutePerformanceTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/RoutePerformanceTest.java
similarity index 91%
rename from
components/camel-dataset/src/test/java/org/apache/camel/component/dataset/RoutePerformanceTest.java
rename to
core/camel-core/src/test/java/org/apache/camel/component/dataset/RoutePerformanceTest.java
index 618fa6e..fd44387 100644
---
a/components/camel-dataset/src/test/java/org/apache/camel/component/dataset/RoutePerformanceTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/RoutePerformanceTest.java
@@ -21,18 +21,17 @@ import java.util.Map;
import java.util.concurrent.TimeUnit;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.util.StopWatch;
import org.junit.Test;
-import static org.apache.camel.component.mock.MockEndpoint.assertIsSatisfied;
/**
* A route for simple performance testing that can be used when we suspect
* something is wrong. Inspired by end user on forum doing this as proof of
concept.
*/
-public class RoutePerformanceTest extends CamelTestSupport {
+public class RoutePerformanceTest extends ContextTestSupport {
private int size = 250;
@@ -50,7 +49,7 @@ public class RoutePerformanceTest extends CamelTestSupport {
endpoint.expectedHeaderReceived("foo", 123);
// wait 30 sec for slow servers
- assertIsSatisfied(context, 30, TimeUnit.SECONDS);
+ MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS);
log.info("RoutePerformanceTest: Sent: {} Took: {} ms", size,
watch.taken());
}
