You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/01/31 05:24:36 UTC
[camel] 06/08: CAMEL-14354: camel-core optimize
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
commit e9f4f23b12f5a55e2cd81cb410c48ab861269205
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jan 30 12:47:21 2020 +0100
CAMEL-14354: camel-core optimize
---
.../component/cxf/common/header/CxfHeaderHelperTest.java | 16 ++++++++++++----
.../camel/component/cxf/DefaultCxfBindingTest.java | 15 +++++++++++----
.../jbpm/workitem/DeploymentContextCamelCommandTest.java | 4 ++--
.../jbpm/workitem/GlobalContextCamelCommandTest.java | 4 ++--
4 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelperTest.java b/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelperTest.java
index afb2c20..f1512e1 100644
--- a/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelperTest.java
+++ b/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelperTest.java
@@ -22,6 +22,7 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
+import junit.framework.TestCase;
import org.apache.camel.Exchange;
import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.impl.DefaultCamelContext;
@@ -30,12 +31,19 @@ import org.apache.camel.support.DefaultHeaderFilterStrategy;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.message.Message;
-import org.junit.Assert;
import org.junit.Test;
-public class CxfHeaderHelperTest extends Assert {
- private DefaultCamelContext context = new DefaultCamelContext();
-
+public class CxfHeaderHelperTest extends TestCase {
+
+ private DefaultCamelContext context;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ context = new DefaultCamelContext();
+ context.start();
+ }
+
@Test
public void testPropagateCamelToCxf() {
Exchange exchange = new DefaultExchange(context);
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
index 45ac8ea..a099b82 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
@@ -30,6 +30,7 @@ import javax.activation.FileDataSource;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import junit.framework.TestCase;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -53,13 +54,12 @@ import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.message.Attachment;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.junit.Assert;
import org.junit.Test;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-public class DefaultCxfBindingTest extends Assert {
+public class DefaultCxfBindingTest extends TestCase {
private static final String SOAP_MESSAGE_1 = "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\""
+ " xmlns=\"http://www.mycompany.com/test/\" xmlns:ns1=\"http://www.mycompany.com/test/1/\">"
@@ -70,8 +70,15 @@ public class DefaultCxfBindingTest extends Assert {
+ " xmlns=\"http://www.mycompany.com/test/\" xmlns:ns1=\"http://www.mycompany.com/test/1/\">"
+ " <soap:Body> <ns1:identifier xmlns:ns1=\"http://www.mycompany.com/test/\" xmlns=\"http://www.mycompany.com/test/1/\">TEST</ns1:identifier>"
+ " </soap:Body> </soap:Envelope>";
-
- private DefaultCamelContext context = new DefaultCamelContext();
+
+ private DefaultCamelContext context;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ context = new DefaultCamelContext();
+ context.start();
+ }
@Test
public void testSetGetHeaderFilterStrategy() {
diff --git a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommandTest.java b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommandTest.java
index 1b7b410..99e3e59 100644
--- a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommandTest.java
+++ b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommandTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.jbpm.workitem;
-import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
+import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.Message;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.jbpm.JBPMConstants;
@@ -49,7 +49,7 @@ public class DeploymentContextCamelCommandTest {
Message outMessage;
@Mock
- CamelContext camelContext;
+ ExtendedCamelContext camelContext;
@Mock
RuntimeManager runtimeManager;
diff --git a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommandTest.java b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommandTest.java
index bf1e2a0..8100076 100644
--- a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommandTest.java
+++ b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommandTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.jbpm.workitem;
-import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
+import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.Message;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.jbpm.JBPMConstants;
@@ -49,7 +49,7 @@ public class GlobalContextCamelCommandTest {
Message outMessage;
@Mock
- CamelContext camelContext;
+ ExtendedCamelContext camelContext;
@Mock
RuntimeManager runtimeManager;