You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/06/06 13:09:19 UTC
[camel] branch master updated (7701da0 -> 57ccb4c)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 7701da0 CAMEL-13619 - Regen
new 51c9001 Camel-CBOR: Added more tests
new 57ccb4c Camel-CBOR: Fixed CS
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../cbor/CBORMarshalAllowJMSTypeTest.java} | 26 ++++++++++++------
.../component/cbor/CBORObjectListSplitTest.java} | 32 ++++++++++++++++++----
2 files changed, 44 insertions(+), 14 deletions(-)
copy components/{camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalAllowJMSTypeTest.java => camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORMarshalAllowJMSTypeTest.java} (62%)
copy components/{camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonObjectListSplitTest.java => camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORObjectListSplitTest.java} (64%)
[camel] 01/02: Camel-CBOR: Added more tests
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 51c900190e69b623ee794a3b4f13be31bf24171e
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Jun 6 14:45:41 2019 +0200
Camel-CBOR: Added more tests
---
.../cbor/CBORMarshalAllowJMSTypeTest.java | 66 +++++++++++++++++
.../component/cbor/CBORObjectListSplitTest.java | 83 ++++++++++++++++++++++
2 files changed, 149 insertions(+)
diff --git a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORMarshalAllowJMSTypeTest.java b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORMarshalAllowJMSTypeTest.java
new file mode 100644
index 0000000..3ef58f9
--- /dev/null
+++ b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORMarshalAllowJMSTypeTest.java
@@ -0,0 +1,66 @@
+/*
+ * 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.
+ */
+package org.apache.camel.component.cbor;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.cbor.CBORFactory;
+
+public class CBORMarshalAllowJMSTypeTest extends CamelTestSupport {
+
+ @Test
+ public void testUnmarshalPojo() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:reversePojo");
+ mock.expectedMessageCount(1);
+ mock.message(0).body().isInstanceOf(Author.class);
+
+ Author author = new Author();
+ author.setName("David");
+ author.setSurname("Foster Wallace");
+
+ CBORFactory factory = new CBORFactory();
+ ObjectMapper objectMapper = new ObjectMapper(factory);
+ byte[] payload = objectMapper.writeValueAsBytes(author);
+ template.sendBodyAndHeader("direct:backPojo", payload, "JMSType", Author.class.getName());
+
+ assertMockEndpointsSatisfied();
+
+ Author pojo = mock.getReceivedExchanges().get(0).getIn().getBody(Author.class);
+ assertNotNull(pojo);
+ assertEquals("David", pojo.getName());
+ assertEquals("Foster Wallace", pojo.getSurname());
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+
+ @Override
+ public void configure() throws Exception {
+ CBORDataFormat format = new CBORDataFormat();
+ format.setAllowJmsType(true);
+
+ from("direct:backPojo").unmarshal(format).to("mock:reversePojo");
+ }
+ };
+ }
+
+}
diff --git a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORObjectListSplitTest.java b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORObjectListSplitTest.java
new file mode 100644
index 0000000..bf4e647
--- /dev/null
+++ b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORObjectListSplitTest.java
@@ -0,0 +1,83 @@
+/*
+ * 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.
+ */
+package org.apache.camel.component.cbor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.cbor.CBORFactory;
+
+public class CBORObjectListSplitTest extends CamelTestSupport {
+ @Test
+ public void testCBOR() throws InterruptedException, JsonProcessingException {
+ getMockEndpoint("mock:result").expectedMessageCount(2);
+ getMockEndpoint("mock:result").expectedMessagesMatches(body().isInstanceOf(DummyObject.class));
+
+ DummyObject d1 = new DummyObject();
+ d1.setDummy("value1");
+ DummyObject d2 = new DummyObject();
+ d2.setDummy("value2");
+
+ List<DummyObject> list = new ArrayList<DummyObject>();
+ list.add(d1);
+ list.add(d2);
+
+ CBORFactory factory = new CBORFactory();
+ ObjectMapper objectMapper = new ObjectMapper(factory);
+ byte[] payload = objectMapper.writeValueAsBytes(list);
+ template.sendBody("direct:start", payload);
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ // you can specify the pojo class type for unmarshal the jason file
+ CBORDataFormat format = new CBORDataFormat();
+ format.useList();
+ format.setUnmarshalType(DummyObject.class);
+ from("direct:start").unmarshal(format).split(body()).to("mock:result");
+ }
+ };
+ }
+
+ public static class DummyObject {
+
+ private String dummy;
+
+ public DummyObject() {
+ }
+
+ public String getDummy() {
+ return dummy;
+ }
+
+ public void setDummy(String dummy) {
+ this.dummy = dummy;
+ }
+ }
+
+}
\ No newline at end of file
[camel] 02/02: Camel-CBOR: Fixed CS
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 57ccb4c98e579d4c9478d4a5fa4b40d3b78c581a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Jun 6 15:08:53 2019 +0200
Camel-CBOR: Fixed CS
---
.../camel/component/cbor/CBORMarshalAllowJMSTypeTest.java | 6 +++---
.../apache/camel/component/cbor/CBORObjectListSplitTest.java | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORMarshalAllowJMSTypeTest.java b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORMarshalAllowJMSTypeTest.java
index 3ef58f9..02a3b10 100644
--- a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORMarshalAllowJMSTypeTest.java
+++ b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORMarshalAllowJMSTypeTest.java
@@ -16,14 +16,14 @@
*/
package org.apache.camel.component.cbor;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.cbor.CBORFactory;
+
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.cbor.CBORFactory;
-
public class CBORMarshalAllowJMSTypeTest extends CamelTestSupport {
@Test
diff --git a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORObjectListSplitTest.java b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORObjectListSplitTest.java
index bf4e647..8ef4e58 100644
--- a/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORObjectListSplitTest.java
+++ b/components/camel-cbor/src/test/java/org/apache/camel/component/cbor/CBORObjectListSplitTest.java
@@ -19,14 +19,14 @@ package org.apache.camel.component.cbor;
import java.util.ArrayList;
import java.util.List;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Test;
-
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.cbor.CBORFactory;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
public class CBORObjectListSplitTest extends CamelTestSupport {
@Test
public void testCBOR() throws InterruptedException, JsonProcessingException {
@@ -80,4 +80,4 @@ public class CBORObjectListSplitTest extends CamelTestSupport {
}
}
-}
\ No newline at end of file
+}