This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new e94efd0 Fixed tests
e94efd0 is described below
commit e94efd0960f3a0d0408efe363d3fcd4c1466cfc2
Author: Claus Ibsen <[email protected]>
AuthorDate: Sat Mar 14 18:05:17 2020 +0100
Fixed tests
---
.../src/test/java/org/apache/camel/component/jpa/JpaTest.java | 5 +++--
.../camel/component/jpa/JpaWithNamedQueryAndParametersTest.java | 6 ++++--
.../org/apache/camel/component/jpa/JpaWithNamedQueryTest.java | 5 +++--
.../processor/jpa/JpaProducerWithQueryParametersHeaderTest.java | 9 ++-------
.../org/apache/camel/processor/jpa/JpaProducerWithQueryTest.java | 9 ++-------
5 files changed, 14 insertions(+), 20 deletions(-)
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java
index b70c65e..b3ccc31 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaTest.java
@@ -119,8 +119,8 @@ public class JpaTest extends Assert {
@Before
public void setUp() throws Exception {
+ camelContext.start();
template = camelContext.createProducerTemplate();
- ServiceHelper.startService(template, camelContext);
Endpoint value = camelContext.getEndpoint(getEndpointUri());
assertNotNull("Could not find endpoint!", value);
@@ -151,6 +151,7 @@ public class JpaTest extends Assert {
@After
public void tearDown() throws Exception {
- ServiceHelper.stopService(consumer, template, camelContext);
+ ServiceHelper.stopService(consumer, template);
+ camelContext.stop();
}
}
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryAndParametersTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryAndParametersTest.java
index a1b3a59..f7bbf5b 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryAndParametersTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryAndParametersTest.java
@@ -129,9 +129,10 @@ public class JpaWithNamedQueryAndParametersTest extends
Assert {
// bind the params
registry.bind("params", params);
camelContext.setRegistry(registry);
+
+ camelContext.start();
template = camelContext.createProducerTemplate();
- ServiceHelper.startService(template, camelContext);
Endpoint value = camelContext.getEndpoint(getEndpointUri());
assertNotNull("Could not find endpoint!", value);
@@ -148,6 +149,7 @@ public class JpaWithNamedQueryAndParametersTest extends
Assert {
@After
public void tearDown() throws Exception {
- ServiceHelper.stopService(consumer, template, camelContext);
+ ServiceHelper.stopService(consumer, template);
+ camelContext.stop();
}
}
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java
index 5c3745b..64ea1f2 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java
@@ -160,8 +160,8 @@ public class JpaWithNamedQueryTest extends Assert {
@Before
public void setUp() throws Exception {
+ camelContext.start();
template = camelContext.createProducerTemplate();
- ServiceHelper.startService(template, camelContext);
Endpoint value = camelContext.getEndpoint(getEndpointUri());
assertNotNull("Could not find endpoint!", value);
@@ -178,6 +178,7 @@ public class JpaWithNamedQueryTest extends Assert {
@After
public void tearDown() throws Exception {
- ServiceHelper.stopService(consumer, template, camelContext);
+ ServiceHelper.stopService(consumer, template);
+ camelContext.stop();
}
}
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerWithQueryParametersHeaderTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerWithQueryParametersHeaderTest.java
index eb2d7b4..55e95a9 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerWithQueryParametersHeaderTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerWithQueryParametersHeaderTest.java
@@ -25,18 +25,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jpa.JpaConstants;
import org.apache.camel.examples.Customer;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.support.service.ServiceHelper;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class JpaProducerWithQueryParametersHeaderTest extends Assert {
- protected static final Logger LOG =
LoggerFactory.getLogger(JpaProducerWithQueryParametersHeaderTest.class);
-
protected DefaultCamelContext camelContext;
protected ProducerTemplate template;
@@ -80,12 +75,12 @@ public class JpaProducerWithQueryParametersHeaderTest
extends Assert {
}
});
+ camelContext.start();
template = camelContext.createProducerTemplate();
- ServiceHelper.startService(template, camelContext);
}
@After
public void tearDown() throws Exception {
- ServiceHelper.stopService(template, camelContext);
+ camelContext.stop();
}
}
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerWithQueryTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerWithQueryTest.java
index d83ae19..6e9f5c9 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerWithQueryTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerWithQueryTest.java
@@ -26,18 +26,13 @@ import org.apache.camel.examples.Customer;
import org.apache.camel.examples.MultiSteps;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.SimpleRegistry;
-import org.apache.camel.support.service.ServiceHelper;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class JpaProducerWithQueryTest extends Assert {
- protected static final Logger LOG =
LoggerFactory.getLogger(JpaProducerWithQueryTest.class);
-
protected DefaultCamelContext camelContext;
protected ProducerTemplate template;
@@ -151,12 +146,12 @@ public class JpaProducerWithQueryTest extends Assert {
}
});
+ camelContext.start();
template = camelContext.createProducerTemplate();
- ServiceHelper.startService(template, camelContext);
}
@After
public void tearDown() throws Exception {
- ServiceHelper.stopService(template, camelContext);
+ camelContext.stop();
}
}
