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 c6384a92d873339a568e033c3a80bb57d55a49a0
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Apr 17 09:35:41 2019 +0200
Move mock component out of camel-core. Work in progress.
---
.../apache/camel/component/dataset/CustomDataSetTest.java | 11 +++++++++--
.../apache/camel/component/dataset/DataSetConsumerTest.java | 11 +++++++++--
.../apache/camel/component/dataset/DataSetPreloadTest.java | 11 +++++++++--
.../apache/camel/component/dataset/DataSetProducerTest.java | 12 ++++++++++--
.../org/apache/camel/component/dataset/DataSetSedaTest.java | 12 ++++++++++--
.../java/org/apache/camel/component/dataset/DataSetTest.java | 11 +++++++++--
.../camel/component/dataset/FileDataSetConsumerTest.java | 12 ++++++++++--
.../component/dataset/FileDataSetConsumerWithSplitTest.java | 12 ++++++++++--
.../camel/component/dataset/FileDataSetProducerTest.java | 11 +++++++++--
.../component/dataset/FileDataSetProducerWithSplitTest.java | 11 +++++++++--
.../camel/component/dataset/ListDataSetConsumerTest.java | 11 +++++++++--
.../camel/component/dataset/ListDataSetProducerTest.java | 11 +++++++++--
.../apache/camel/component/dataset/RoutePerformanceTest.java | 11 +++++++++--
platforms/karaf/features/src/main/resources/features.xml | 1 +
14 files changed, 122 insertions(+), 26 deletions(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java
index 1903bd4..c5ff258 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java
@@ -16,7 +16,8 @@
*/
package org.apache.camel.component.dataset;
-import org.apache.camel.BindToRegistry;
+import javax.naming.Context;
+
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
@@ -30,7 +31,6 @@ import org.junit.Test;
public class CustomDataSetTest extends ContextTestSupport {
- @BindToRegistry("foo")
protected DataSet dataSet = new DataSetSupport() {
Expression expression = new
XPathBuilder("/message/@index").resultType(Long.class);
@@ -47,6 +47,13 @@ public class CustomDataSetTest extends ContextTestSupport {
}
};
+ @Override
+ protected Context createJndiContext() throws Exception {
+ Context context = super.createJndiContext();
+ context.bind("foo", dataSet);
+ return context;
+ }
+
@Test
public void testUsingCustomDataSet() throws Exception {
// data set will itself set its assertions so we should just
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetConsumerTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetConsumerTest.java
index c6b2f07..4e7c5f1 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetConsumerTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetConsumerTest.java
@@ -16,7 +16,8 @@
*/
package org.apache.camel.component.dataset;
-import org.apache.camel.BindToRegistry;
+import javax.naming.Context;
+
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
@@ -25,7 +26,7 @@ import org.junit.Assert;
import org.junit.Test;
public class DataSetConsumerTest extends ContextTestSupport {
- @BindToRegistry("foo")
+
protected SimpleDataSet dataSet = new SimpleDataSet(5);
final String dataSetName = "foo";
@@ -35,6 +36,12 @@ public class DataSetConsumerTest extends ContextTestSupport {
final String dataSetUriWithDataSetIndexSetToStrict = dataSetUri +
"&dataSetIndex=strict";
final String resultUri = "mock://result";
+ @Override
+ protected Context createJndiContext() throws Exception {
+ Context context = super.createJndiContext();
+ context.bind("foo", dataSet);
+ return context;
+ }
/**
* Ensure the expected message count for a consumer-only endpoint defaults
to zero
*/
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetPreloadTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetPreloadTest.java
index ee708cc..1c198f9 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetPreloadTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetPreloadTest.java
@@ -16,7 +16,8 @@
*/
package org.apache.camel.component.dataset;
-import org.apache.camel.BindToRegistry;
+import javax.naming.Context;
+
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -25,11 +26,17 @@ import org.junit.Test;
public class DataSetPreloadTest extends ContextTestSupport {
- @BindToRegistry("foo")
private SimpleDataSet dataSet = new SimpleDataSet(20);
private String uri = "dataset:foo?initialDelay=0&preloadSize=5";
+ @Override
+ protected Context createJndiContext() throws Exception {
+ Context context = super.createJndiContext();
+ context.bind("foo", dataSet);
+ return context;
+ }
+
@Test
public void testDataSetPreloadSize() throws Exception {
MockEndpoint endpoint = getMockEndpoint(uri);
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetProducerTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetProducerTest.java
index eadc69f..0f48c5b 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetProducerTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetProducerTest.java
@@ -16,7 +16,8 @@
*/
package org.apache.camel.component.dataset;
-import org.apache.camel.BindToRegistry;
+import javax.naming.Context;
+
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.NoSuchHeaderException;
@@ -26,7 +27,7 @@ import org.junit.Assert;
import org.junit.Test;
public class DataSetProducerTest extends ContextTestSupport {
- @BindToRegistry("foo")
+
protected SimpleDataSet dataSet = new SimpleDataSet(20);
final String dataSetName = "foo";
@@ -37,6 +38,13 @@ public class DataSetProducerTest extends ContextTestSupport {
final String sourceUri = "direct://source";
final String resultUri = "mock://result";
+ @Override
+ protected Context createJndiContext() throws Exception {
+ Context context = super.createJndiContext();
+ context.bind("foo", dataSet);
+ return context;
+ }
+
@Test
public void
testSendingMessagesExplicitlyToDataSetEndpointWithDataSetIndexHeader() throws
Exception {
long size = dataSet.getSize();
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java
index 9c229a5..749fb71 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java
@@ -16,7 +16,8 @@
*/
package org.apache.camel.component.dataset;
-import org.apache.camel.BindToRegistry;
+import javax.naming.Context;
+
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -26,11 +27,18 @@ import org.junit.Test;
* Unit test to demonstrate high concurrency with seda. Offspring by CAMEL-605.
*/
public class DataSetSedaTest extends ContextTestSupport {
- @BindToRegistry("foo")
+
private SimpleDataSet dataSet = new SimpleDataSet(200);
private String uri = "dataset:foo?initialDelay=0&produceDelay=1";
+ @Override
+ protected Context createJndiContext() throws Exception {
+ Context context = super.createJndiContext();
+ context.bind("foo", dataSet);
+ return context;
+ }
+
@Test
public void testDataSetWithSeda() throws Exception {
MockEndpoint endpoint = getMockEndpoint(uri);
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTest.java
index 65b09e1..7448c73 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTest.java
@@ -16,16 +16,23 @@
*/
package org.apache.camel.component.dataset;
-import org.apache.camel.BindToRegistry;
+import javax.naming.Context;
+
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.junit.Test;
public class DataSetTest extends ContextTestSupport {
- @BindToRegistry("foo")
protected SimpleDataSet dataSet = new SimpleDataSet(20);
+ @Override
+ protected Context createJndiContext() throws Exception {
+ Context context = super.createJndiContext();
+ context.bind("foo", dataSet);
+ return context;
+ }
+
@Test
public void testDataSet() throws Exception {
// data set will itself set its assertions so we should just
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerTest.java
index cce4584..57e6ead 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerTest.java
@@ -16,7 +16,8 @@
*/
package org.apache.camel.component.dataset;
-import org.apache.camel.BindToRegistry;
+import javax.naming.Context;
+
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -25,7 +26,7 @@ import org.junit.Before;
import org.junit.Test;
public class FileDataSetConsumerTest extends ContextTestSupport {
- @BindToRegistry("foo")
+
protected FileDataSet dataSet;
final String testDataFileName = "src/test/data/file-dataset-test.txt";
@@ -34,6 +35,13 @@ public class FileDataSetConsumerTest extends
ContextTestSupport {
final String dataSetName = "foo";
final String dataSetUri = "dataset://" + dataSetName;
+ @Override
+ protected Context createJndiContext() throws Exception {
+ Context context = super.createJndiContext();
+ context.bind("foo", dataSet);
+ return context;
+ }
+
@Test
public void testDefaultListDataSet() throws Exception {
MockEndpoint result = getMockEndpoint(resultUri);
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerWithSplitTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerWithSplitTest.java
index 57841cf..b505bc6 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerWithSplitTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetConsumerWithSplitTest.java
@@ -16,7 +16,8 @@
*/
package org.apache.camel.component.dataset;
-import org.apache.camel.BindToRegistry;
+import javax.naming.Context;
+
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -25,7 +26,7 @@ import org.junit.Before;
import org.junit.Test;
public class FileDataSetConsumerWithSplitTest extends ContextTestSupport {
- @BindToRegistry("foo")
+
protected FileDataSet dataSet;
final String testDataFileName = "src/test/data/file-dataset-test.txt";
@@ -35,6 +36,13 @@ public class FileDataSetConsumerWithSplitTest extends
ContextTestSupport {
final String dataSetName = "foo";
final String dataSetUri = "dataset://" + dataSetName;
+ @Override
+ protected Context createJndiContext() throws Exception {
+ Context context = super.createJndiContext();
+ context.bind("foo", dataSet);
+ return context;
+ }
+
@Test
public void testDefaultListDataSet() throws Exception {
MockEndpoint result = getMockEndpoint(resultUri);
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerTest.java
index 22d0d63..8f8793e 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerTest.java
@@ -22,7 +22,8 @@ import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
-import org.apache.camel.BindToRegistry;
+import javax.naming.Context;
+
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
@@ -37,7 +38,6 @@ public class FileDataSetProducerTest extends
ContextTestSupport {
@Rule
public TemporaryFolder tempFolder = new TemporaryFolder();
- @BindToRegistry("foo")
protected FileDataSet dataSet;
final String testPayload = String.format("Line 1%nLine 2%nLine 3%nLine
4%nLine 5%nLine 6%nLine 7%nLine 8%nLine 9%nLine 10%n");
@@ -46,6 +46,13 @@ public class FileDataSetProducerTest extends
ContextTestSupport {
final String dataSetName = "foo";
final String dataSetUri = "dataset://" + dataSetName;
+ @Override
+ protected Context createJndiContext() throws Exception {
+ Context context = super.createJndiContext();
+ context.bind("foo", dataSet);
+ return context;
+ }
+
@Test
public void testDefaultListDataSet() throws Exception {
template.sendBodyAndHeader(sourceUri, testPayload,
Exchange.DATASET_INDEX, 0);
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerWithSplitTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerWithSplitTest.java
index 4dbb1ac..1b4b963 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerWithSplitTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/FileDataSetProducerWithSplitTest.java
@@ -22,7 +22,8 @@ import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
-import org.apache.camel.BindToRegistry;
+import javax.naming.Context;
+
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
@@ -37,7 +38,6 @@ public class FileDataSetProducerWithSplitTest extends
ContextTestSupport {
@Rule
public TemporaryFolder tempFolder = new TemporaryFolder();
- @BindToRegistry("foo")
protected FileDataSet dataSet;
final int testDataFileRecordCount = 10;
@@ -46,6 +46,13 @@ public class FileDataSetProducerWithSplitTest extends
ContextTestSupport {
final String dataSetName = "foo";
final String dataSetUri = "dataset://" + dataSetName;
+ @Override
+ protected Context createJndiContext() throws Exception {
+ Context context = super.createJndiContext();
+ context.bind("foo", dataSet);
+ return context;
+ }
+
@Test
public void testDefaultListDataSet() throws Exception {
for (int i = 0; i < testDataFileRecordCount; ++i) {
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/ListDataSetConsumerTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/ListDataSetConsumerTest.java
index 70146e1..5f4f45e 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/ListDataSetConsumerTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/ListDataSetConsumerTest.java
@@ -19,7 +19,8 @@ package org.apache.camel.component.dataset;
import java.util.LinkedList;
import java.util.List;
-import org.apache.camel.BindToRegistry;
+import javax.naming.Context;
+
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -28,13 +29,19 @@ import org.junit.Test;
public class ListDataSetConsumerTest extends ContextTestSupport {
- @BindToRegistry("foo")
protected ListDataSet dataSet;
final String resultUri = "mock://result";
final String dataSetName = "foo";
final String dataSetUri = "dataset://" + dataSetName;
+ @Override
+ protected Context createJndiContext() throws Exception {
+ Context context = super.createJndiContext();
+ context.bind("foo", dataSet);
+ return context;
+ }
+
@Test
public void testDefaultListDataSet() throws Exception {
MockEndpoint result = getMockEndpoint(resultUri);
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/ListDataSetProducerTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/ListDataSetProducerTest.java
index 982678b..6f42ecf 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/ListDataSetProducerTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/ListDataSetProducerTest.java
@@ -19,7 +19,8 @@ package org.apache.camel.component.dataset;
import java.util.LinkedList;
import java.util.List;
-import org.apache.camel.BindToRegistry;
+import javax.naming.Context;
+
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
@@ -28,13 +29,19 @@ import org.junit.Test;
public class ListDataSetProducerTest extends ContextTestSupport {
- @BindToRegistry("foo")
protected ListDataSet dataSet = new ListDataSet();
final String sourceUri = "direct://source";
final String dataSetName = "foo";
final String dataSetUri = "dataset://" + dataSetName;
+ @Override
+ protected Context createJndiContext() throws Exception {
+ Context context = super.createJndiContext();
+ context.bind("foo", dataSet);
+ return context;
+ }
+
@Test
public void testDefaultListDataSet() throws Exception {
template.sendBodyAndHeader(dataSetUri, "<hello>world!</hello>",
Exchange.DATASET_INDEX, 0);
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/RoutePerformanceTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/RoutePerformanceTest.java
index fd44387..ac2edf6 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/dataset/RoutePerformanceTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/dataset/RoutePerformanceTest.java
@@ -20,7 +20,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
-import org.apache.camel.BindToRegistry;
+import javax.naming.Context;
+
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -35,11 +36,17 @@ public class RoutePerformanceTest extends
ContextTestSupport {
private int size = 250;
- @BindToRegistry("foo")
private SimpleDataSet dataSet = new SimpleDataSet(size);
private String uri = "mock:results";
+ @Override
+ protected Context createJndiContext() throws Exception {
+ Context context = super.createJndiContext();
+ context.bind("foo", dataSet);
+ return context;
+ }
+
@Test
public void testPerformance() throws Exception {
StopWatch watch = new StopWatch();
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index a41393c..f82f008 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -63,6 +63,7 @@
<bundle>mvn:org.apache.camel/camel-file/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-language/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-log/${project.version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-mock/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-properties/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-ref/${project.version}</bundle>
<bundle>mvn:org.apache.camel/camel-rest/${project.version}</bundle>
