You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2013/09/05 16:01:54 UTC
[1/8] git commit: Add test that I forgot
Updated Branches:
refs/heads/camel-2.12.x 3e1198446 -> ecbb9498d
refs/heads/master e0be135e1 -> 420ab5d2d
Add test that I forgot
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/86ea35eb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/86ea35eb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/86ea35eb
Branch: refs/heads/master
Commit: 86ea35eb8df65908b213649e1add9ef9e15ad5fa
Parents: 59a5367
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu Sep 5 10:12:35 2013 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu Sep 5 11:30:11 2013 -0230
----------------------------------------------------------------------
.../YammerRelationshipInJsonRouteTest.java | 57 ++++++++++++++++++++
1 file changed, 57 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/86ea35eb/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerRelationshipInJsonRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerRelationshipInJsonRouteTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerRelationshipInJsonRouteTest.java
new file mode 100644
index 0000000..c486239
--- /dev/null
+++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerRelationshipInJsonRouteTest.java
@@ -0,0 +1,57 @@
+/**
+ * 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.yammer;
+
+
+import java.util.List;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.component.yammer.model.Relationships;
+import org.junit.Test;
+
+public class YammerRelationshipInJsonRouteTest extends YammerComponentTestSupport {
+
+ @SuppressWarnings("unchecked")
+ @Test
+ public void testConsumeAllUsers() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMinimumMessageCount(1);
+ assertMockEndpointsSatisfied();
+
+ Exchange exchange = mock.getExchanges().get(0);
+ String relationships = exchange.getIn().getBody(String.class);
+
+ assertEquals(getMessages(), relationships);
+ }
+
+ @Override
+ protected String jsonFile() {
+ return "/relationships.json";
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() {
+ // using dummy keys here since we are mocking out calls to yammer.com with static json; in a real app, please use your own keys!
+ from("yammer:relationships?consumerKey=aConsumerKey&consumerSecret=aConsumerSecretKey&accessToken=aAccessToken&useJson=true").to("log:foo").to("mock:result");
+ }
+ };
+ }
+}
[3/8] git commit: CAMEL-6709 - camel-yammer - Endpoint yammer:current
throwns JsonMappingException exception
Posted by ja...@apache.org.
CAMEL-6709 - camel-yammer - Endpoint yammer:current throwns JsonMappingException exception
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/420ab5d2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/420ab5d2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/420ab5d2
Branch: refs/heads/master
Commit: 420ab5d2d81847b8c53bb6c5eae79f3c0739eeb7
Parents: 8aca60a
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu Sep 5 11:29:31 2013 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu Sep 5 11:30:12 2013 -0230
----------------------------------------------------------------------
.../component/yammer/YammerUserPollingConsumer.java | 15 +++++++++++++--
.../yammer/YammerMessageAndUserRouteTest.java | 9 ++++-----
.../yammer/YammerUserPollEnrichRouteTest.java | 9 +++------
.../camel/component/yammer/YammerUserRouteTest.java | 11 ++++-------
components/camel-yammer/src/test/resources/user.json | 4 +---
5 files changed, 25 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/420ab5d2/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerUserPollingConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerUserPollingConsumer.java b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerUserPollingConsumer.java
index 54826f5..ce2baea 100644
--- a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerUserPollingConsumer.java
+++ b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerUserPollingConsumer.java
@@ -75,9 +75,20 @@ public class YammerUserPollingConsumer extends ScheduledPollConsumer {
if (!endpoint.getConfig().isUseJson()) {
ObjectMapper jsonMapper = new ObjectMapper();
- List<User> users = jsonMapper.readValue(jsonBody, jsonMapper.getTypeFactory().constructCollectionType(List.class, User.class));
+ String function = endpoint.getConfig().getFunction();
+ switch (YammerFunctionType.fromUri(function)) {
+ case USERS:
+ List<User> users = jsonMapper.readValue(jsonBody, jsonMapper.getTypeFactory().constructCollectionType(List.class, User.class));
+ exchange.getIn().setBody(users);
+ break;
+ case CURRENT:
+ User user = jsonMapper.readValue(jsonBody, jsonMapper.getTypeFactory().constructType(User.class));
+ exchange.getIn().setBody(user);
+ break;
+ default:
+ throw new Exception(String.format("%s is not a valid Yammer user function type.", function));
+ }
- exchange.getIn().setBody(users);
} else {
exchange.getIn().setBody(jsonBody);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/420ab5d2/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageAndUserRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageAndUserRouteTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageAndUserRouteTest.java
index a8e3f0f..7808fdb 100644
--- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageAndUserRouteTest.java
+++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageAndUserRouteTest.java
@@ -43,7 +43,7 @@ public class YammerMessageAndUserRouteTest extends CamelTestSupport {
String messages = context.getTypeConverter().convertTo(String.class, getClass().getResourceAsStream("/messages.json"));
messagesEndpoint.getConfig().setRequestor(new TestApiRequestor(messages));
- String users = context.getTypeConverter().convertTo(String.class, getClass().getResourceAsStream("/users.json"));
+ String users = context.getTypeConverter().convertTo(String.class, getClass().getResourceAsStream("/user.json"));
usersEndpoint.getConfig().setRequestor(new TestApiRequestor(users));
}
@@ -68,11 +68,10 @@ public class YammerMessageAndUserRouteTest extends CamelTestSupport {
userMock.assertIsSatisfied();
exchange = userMock.getExchanges().get(0);
- List<User> users = exchange.getIn().getBody(List.class);
+ User user = exchange.getIn().getBody(User.class);
- assertEquals(1, users.size());
- assertEquals("Joe Camel", users.get(0).getFullName());
- assertEquals("jcamel@redhat.com", users.get(0).getContact().getEmailAddresses().get(0).getAddress());
+ assertEquals("Joe Camel", user.getFullName());
+ assertEquals("jcamel@redhat.com", user.getContact().getEmailAddresses().get(0).getAddress());
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/420ab5d2/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java
index fe8c73e..f9f60d4 100644
--- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java
+++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java
@@ -17,8 +17,6 @@
package org.apache.camel.component.yammer;
-import java.util.List;
-
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -38,11 +36,10 @@ public class YammerUserPollEnrichRouteTest extends YammerComponentTestSupport {
assertMockEndpointsSatisfied();
Exchange exchange = mock.getExchanges().get(0);
- List<User> users = exchange.getIn().getBody(List.class);
+ User user = exchange.getIn().getBody(User.class);
- assertEquals(1, users.size());
- assertEquals("Joe Camel", users.get(0).getFullName());
- assertEquals("jcamel@redhat.com", users.get(0).getContact().getEmailAddresses().get(0).getAddress());
+ assertEquals("Joe Camel", user.getFullName());
+ assertEquals("jcamel@redhat.com", user.getContact().getEmailAddresses().get(0).getAddress());
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/420ab5d2/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserRouteTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserRouteTest.java
index bed0410..50b2f62 100644
--- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserRouteTest.java
+++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserRouteTest.java
@@ -17,8 +17,6 @@
package org.apache.camel.component.yammer;
-import java.util.List;
-
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -35,11 +33,10 @@ public class YammerUserRouteTest extends YammerComponentTestSupport {
assertMockEndpointsSatisfied();
Exchange exchange = mock.getExchanges().get(0);
- List<User> users = exchange.getIn().getBody(List.class);
+ User user = exchange.getIn().getBody(User.class);
- assertEquals(1, users.size());
- assertEquals("Joe Camel", users.get(0).getFullName());
- assertEquals("jcamel@redhat.com", users.get(0).getContact().getEmailAddresses().get(0).getAddress());
+ assertEquals("Joe Camel", user.getFullName());
+ assertEquals("jcamel@redhat.com", user.getContact().getEmailAddresses().get(0).getAddress());
}
@Override
@@ -52,7 +49,7 @@ public class YammerUserRouteTest extends YammerComponentTestSupport {
return new RouteBuilder() {
public void configure() {
// using dummy keys here since we are mocking out calls to yammer.com with static json; in a real app, please use your own keys!
- from("yammer:users?consumerKey=aConsumerKey&consumerSecret=aConsumerSecretKey&accessToken=aAccessToken").to("mock:result");
+ from("yammer:current?consumerKey=aConsumerKey&consumerSecret=aConsumerSecretKey&accessToken=aAccessToken").to("mock:result");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/420ab5d2/components/camel-yammer/src/test/resources/user.json
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/test/resources/user.json b/components/camel-yammer/src/test/resources/user.json
index e1c79d3..f619bae 100644
--- a/components/camel-yammer/src/test/resources/user.json
+++ b/components/camel-yammer/src/test/resources/user.json
@@ -1,4 +1,3 @@
-[
{
"previous_companies":[
@@ -66,5 +65,4 @@
]
}
- }
- ]
\ No newline at end of file
+ }
\ No newline at end of file
[5/8] git commit: Test for using raw JSON in camel-yammer
Posted by ja...@apache.org.
Test for using raw JSON in camel-yammer
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e66c6f1a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e66c6f1a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e66c6f1a
Branch: refs/heads/camel-2.12.x
Commit: e66c6f1ae1aec8c6d42bc7406a90a2c806506aca
Parents: 3e11984
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu Sep 5 10:09:08 2013 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu Sep 5 11:31:04 2013 -0230
----------------------------------------------------------------------
.../component/yammer/YammerComponentTestSupport.java | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e66c6f1a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerComponentTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerComponentTestSupport.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerComponentTestSupport.java
index 522f919..f55d5fa 100644
--- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerComponentTestSupport.java
+++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerComponentTestSupport.java
@@ -27,7 +27,8 @@ import org.junit.Before;
public abstract class YammerComponentTestSupport extends CamelTestSupport {
protected YammerComponent yammerComponent;
-
+ private String messages;
+
public YammerComponentTestSupport() {
super();
}
@@ -38,14 +39,14 @@ public abstract class YammerComponentTestSupport extends CamelTestSupport {
super.setUp();
InputStream is = getClass().getResourceAsStream(jsonFile());
- String messages = context.getTypeConverter().convertTo(String.class, is);
+ setMessages(context.getTypeConverter().convertTo(String.class, is));
yammerComponent = context.getComponent("yammer", YammerComponent.class);
Collection<Endpoint> endpoints = context.getEndpoints();
for (Endpoint endpoint : endpoints) {
if (endpoint instanceof YammerEndpoint) {
- ((YammerEndpoint)endpoint).getConfig().setRequestor(new TestApiRequestor(messages));
+ ((YammerEndpoint)endpoint).getConfig().setRequestor(new TestApiRequestor(getMessages()));
}
}
}
@@ -54,4 +55,12 @@ public abstract class YammerComponentTestSupport extends CamelTestSupport {
return "/messages.json";
}
+ protected String getMessages() {
+ return messages;
+ }
+
+ protected void setMessages(String messages) {
+ this.messages = messages;
+ }
+
}
\ No newline at end of file
[7/8] git commit: Test returning multiple yammer users
Posted by ja...@apache.org.
Test returning multiple yammer users
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a56cd59f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a56cd59f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a56cd59f
Branch: refs/heads/camel-2.12.x
Commit: a56cd59f953c495777961d8e599b3600fe5a3dad
Parents: bab78c6
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu Sep 5 10:25:04 2013 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu Sep 5 11:31:29 2013 -0230
----------------------------------------------------------------------
.../yammer/YammerMultipleUsersRouteTest.java | 63 ++++++++++++++++++
.../YammerRelationshipInJsonRouteTest.java | 2 +-
.../yammer/YammerUserPollEnrichRouteTest.java | 2 +-
.../component/yammer/YammerUserRouteTest.java | 2 +-
.../camel-yammer/src/test/resources/user.json | 70 ++++++++++++++++++++
.../camel-yammer/src/test/resources/users.json | 70 +++++++++++++++++++-
6 files changed, 205 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a56cd59f/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMultipleUsersRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMultipleUsersRouteTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMultipleUsersRouteTest.java
new file mode 100644
index 0000000..ca45d22
--- /dev/null
+++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMultipleUsersRouteTest.java
@@ -0,0 +1,63 @@
+/**
+ * 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.yammer;
+
+
+import java.util.List;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.component.yammer.model.User;
+import org.junit.Test;
+
+public class YammerMultipleUsersRouteTest extends YammerComponentTestSupport {
+
+ @SuppressWarnings("unchecked")
+ @Test
+ public void testConsumeAllUsers() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMinimumMessageCount(1);
+
+ template.sendBody("direct:start", "overwrite me");
+
+ assertMockEndpointsSatisfied();
+
+ Exchange exchange = mock.getExchanges().get(0);
+ List<User> users = exchange.getIn().getBody(List.class);
+
+ assertEquals(2, users.size());
+ assertEquals("Joe Camel", users.get(0).getFullName());
+ assertEquals("jcamel@redhat.com", users.get(0).getContact().getEmailAddresses().get(0).getAddress());
+ assertEquals("Joe Camel Jr", users.get(1).getFullName());
+ assertEquals("jcameljr@redhat.com", users.get(1).getContact().getEmailAddresses().get(0).getAddress());
+ }
+
+ @Override
+ protected String jsonFile() {
+ return "/users.json";
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() {
+ from("direct:start").pollEnrich("yammer:users?consumerKey=aConsumerKey&consumerSecret=aConsumerSecretKey&accessToken=aAccessToken").to("mock:result");
+ }
+ };
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/a56cd59f/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerRelationshipInJsonRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerRelationshipInJsonRouteTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerRelationshipInJsonRouteTest.java
index c486239..ca89ff8 100644
--- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerRelationshipInJsonRouteTest.java
+++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerRelationshipInJsonRouteTest.java
@@ -50,7 +50,7 @@ public class YammerRelationshipInJsonRouteTest extends YammerComponentTestSuppor
return new RouteBuilder() {
public void configure() {
// using dummy keys here since we are mocking out calls to yammer.com with static json; in a real app, please use your own keys!
- from("yammer:relationships?consumerKey=aConsumerKey&consumerSecret=aConsumerSecretKey&accessToken=aAccessToken&useJson=true").to("log:foo").to("mock:result");
+ from("yammer:relationships?consumerKey=aConsumerKey&consumerSecret=aConsumerSecretKey&accessToken=aAccessToken&useJson=true").to("mock:result");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a56cd59f/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java
index 9a54104..fe8c73e 100644
--- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java
+++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java
@@ -47,7 +47,7 @@ public class YammerUserPollEnrichRouteTest extends YammerComponentTestSupport {
@Override
protected String jsonFile() {
- return "/users.json";
+ return "/user.json";
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/a56cd59f/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserRouteTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserRouteTest.java
index c8ccc58..bed0410 100644
--- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserRouteTest.java
+++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserRouteTest.java
@@ -44,7 +44,7 @@ public class YammerUserRouteTest extends YammerComponentTestSupport {
@Override
protected String jsonFile() {
- return "/users.json";
+ return "/user.json";
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/a56cd59f/components/camel-yammer/src/test/resources/user.json
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/test/resources/user.json b/components/camel-yammer/src/test/resources/user.json
new file mode 100644
index 0000000..e1c79d3
--- /dev/null
+++ b/components/camel-yammer/src/test/resources/user.json
@@ -0,0 +1,70 @@
+[
+ {
+ "previous_companies":[
+
+ ],
+ "kids_names":null,
+ "activated_at":"2009/06/04 19:56:21 +0000",
+ "interests":null,
+ "admin":"false",
+ "full_name":"Joe Camel",
+ "name":"jcamel",
+ "last_name":"Camel",
+ "mugshot_url_template":"",
+ "type":"user",
+ "mugshot_url":"",
+ "birth_date":"",
+ "timezone":"Pacific Time (US \u0026 Canada)",
+ "location":"",
+ "state":"active",
+ "web_url":"https://www.yammer.com/redhat.com/users/jcamel",
+ "stats":{
+ "followers":13,
+ "following":74,
+ "updates":2
+ },
+ "show_ask_for_photo":false,
+ "external_urls":[
+
+ ],
+ "schools":[
+
+ ],
+ "summary":null,
+ "job_title":"",
+ "id":123456,
+ "expertise":null,
+ "network_domains":[
+ "redhat.com"
+ ],
+ "network_name":"redhat.com",
+ "hire_date":null,
+ "url":"https://www.yammer.com/api/v1/users/123456",
+ "guid":null,
+ "significant_other":null,
+ "verified_admin":"false",
+ "settings":{
+ "xdr_proxy":"https://xdrproxy.yammer.com"
+ },
+ "can_broadcast":"false",
+ "first_name":"Joe",
+ "department":null,
+ "network_id":7654,
+ "contact":{
+ "email_addresses":[
+ {
+ "address":"jcamel@redhat.com",
+ "type":"primary"
+ }
+ ],
+ "has_fake_email":false,
+ "im":{
+ "username":"",
+ "provider":"aim"
+ },
+ "phone_numbers":[
+
+ ]
+ }
+ }
+ ]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/a56cd59f/components/camel-yammer/src/test/resources/users.json
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/test/resources/users.json b/components/camel-yammer/src/test/resources/users.json
index e1c79d3..1e8ae80 100644
--- a/components/camel-yammer/src/test/resources/users.json
+++ b/components/camel-yammer/src/test/resources/users.json
@@ -66,5 +66,73 @@
]
}
- }
+ },
+ {
+ "previous_companies":[
+
+ ],
+ "kids_names":null,
+ "activated_at":"2009/06/04 19:56:21 +0000",
+ "interests":null,
+ "admin":"false",
+ "full_name":"Joe Camel Jr",
+ "name":"jcameljr",
+ "last_name":"Camel",
+ "mugshot_url_template":"",
+ "type":"user",
+ "mugshot_url":"",
+ "birth_date":"",
+ "timezone":"Pacific Time (US \u0026 Canada)",
+ "location":"",
+ "state":"active",
+ "web_url":"https://www.yammer.com/redhat.com/users/jcameljr",
+ "stats":{
+ "followers":13,
+ "following":74,
+ "updates":2
+ },
+ "show_ask_for_photo":false,
+ "external_urls":[
+
+ ],
+ "schools":[
+
+ ],
+ "summary":null,
+ "job_title":"",
+ "id":123456,
+ "expertise":null,
+ "network_domains":[
+ "redhat.com"
+ ],
+ "network_name":"redhat.com",
+ "hire_date":null,
+ "url":"https://www.yammer.com/api/v1/users/123457",
+ "guid":null,
+ "significant_other":null,
+ "verified_admin":"false",
+ "settings":{
+ "xdr_proxy":"https://xdrproxy.yammer.com"
+ },
+ "can_broadcast":"false",
+ "first_name":"Joe",
+ "department":null,
+ "network_id":7654,
+ "contact":{
+ "email_addresses":[
+ {
+ "address":"jcameljr@redhat.com",
+ "type":"primary"
+ }
+ ],
+ "has_fake_email":false,
+ "im":{
+ "username":"",
+ "provider":"aim"
+ },
+ "phone_numbers":[
+
+ ]
+ }
+ }
]
\ No newline at end of file
[8/8] git commit: CAMEL-6709 - camel-yammer - Endpoint yammer:current
throwns JsonMappingException exception
Posted by ja...@apache.org.
CAMEL-6709 - camel-yammer - Endpoint yammer:current throwns JsonMappingException exception
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ecbb9498
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ecbb9498
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ecbb9498
Branch: refs/heads/camel-2.12.x
Commit: ecbb9498d7ee3f66379882068bd36b49713ece95
Parents: a56cd59
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu Sep 5 11:29:31 2013 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu Sep 5 11:31:38 2013 -0230
----------------------------------------------------------------------
.../component/yammer/YammerUserPollingConsumer.java | 15 +++++++++++++--
.../yammer/YammerMessageAndUserRouteTest.java | 9 ++++-----
.../yammer/YammerUserPollEnrichRouteTest.java | 9 +++------
.../camel/component/yammer/YammerUserRouteTest.java | 11 ++++-------
components/camel-yammer/src/test/resources/user.json | 4 +---
5 files changed, 25 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ecbb9498/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerUserPollingConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerUserPollingConsumer.java b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerUserPollingConsumer.java
index 54826f5..ce2baea 100644
--- a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerUserPollingConsumer.java
+++ b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerUserPollingConsumer.java
@@ -75,9 +75,20 @@ public class YammerUserPollingConsumer extends ScheduledPollConsumer {
if (!endpoint.getConfig().isUseJson()) {
ObjectMapper jsonMapper = new ObjectMapper();
- List<User> users = jsonMapper.readValue(jsonBody, jsonMapper.getTypeFactory().constructCollectionType(List.class, User.class));
+ String function = endpoint.getConfig().getFunction();
+ switch (YammerFunctionType.fromUri(function)) {
+ case USERS:
+ List<User> users = jsonMapper.readValue(jsonBody, jsonMapper.getTypeFactory().constructCollectionType(List.class, User.class));
+ exchange.getIn().setBody(users);
+ break;
+ case CURRENT:
+ User user = jsonMapper.readValue(jsonBody, jsonMapper.getTypeFactory().constructType(User.class));
+ exchange.getIn().setBody(user);
+ break;
+ default:
+ throw new Exception(String.format("%s is not a valid Yammer user function type.", function));
+ }
- exchange.getIn().setBody(users);
} else {
exchange.getIn().setBody(jsonBody);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ecbb9498/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageAndUserRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageAndUserRouteTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageAndUserRouteTest.java
index a8e3f0f..7808fdb 100644
--- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageAndUserRouteTest.java
+++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMessageAndUserRouteTest.java
@@ -43,7 +43,7 @@ public class YammerMessageAndUserRouteTest extends CamelTestSupport {
String messages = context.getTypeConverter().convertTo(String.class, getClass().getResourceAsStream("/messages.json"));
messagesEndpoint.getConfig().setRequestor(new TestApiRequestor(messages));
- String users = context.getTypeConverter().convertTo(String.class, getClass().getResourceAsStream("/users.json"));
+ String users = context.getTypeConverter().convertTo(String.class, getClass().getResourceAsStream("/user.json"));
usersEndpoint.getConfig().setRequestor(new TestApiRequestor(users));
}
@@ -68,11 +68,10 @@ public class YammerMessageAndUserRouteTest extends CamelTestSupport {
userMock.assertIsSatisfied();
exchange = userMock.getExchanges().get(0);
- List<User> users = exchange.getIn().getBody(List.class);
+ User user = exchange.getIn().getBody(User.class);
- assertEquals(1, users.size());
- assertEquals("Joe Camel", users.get(0).getFullName());
- assertEquals("jcamel@redhat.com", users.get(0).getContact().getEmailAddresses().get(0).getAddress());
+ assertEquals("Joe Camel", user.getFullName());
+ assertEquals("jcamel@redhat.com", user.getContact().getEmailAddresses().get(0).getAddress());
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/ecbb9498/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java
index fe8c73e..f9f60d4 100644
--- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java
+++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java
@@ -17,8 +17,6 @@
package org.apache.camel.component.yammer;
-import java.util.List;
-
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -38,11 +36,10 @@ public class YammerUserPollEnrichRouteTest extends YammerComponentTestSupport {
assertMockEndpointsSatisfied();
Exchange exchange = mock.getExchanges().get(0);
- List<User> users = exchange.getIn().getBody(List.class);
+ User user = exchange.getIn().getBody(User.class);
- assertEquals(1, users.size());
- assertEquals("Joe Camel", users.get(0).getFullName());
- assertEquals("jcamel@redhat.com", users.get(0).getContact().getEmailAddresses().get(0).getAddress());
+ assertEquals("Joe Camel", user.getFullName());
+ assertEquals("jcamel@redhat.com", user.getContact().getEmailAddresses().get(0).getAddress());
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/ecbb9498/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserRouteTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserRouteTest.java
index bed0410..50b2f62 100644
--- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserRouteTest.java
+++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserRouteTest.java
@@ -17,8 +17,6 @@
package org.apache.camel.component.yammer;
-import java.util.List;
-
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -35,11 +33,10 @@ public class YammerUserRouteTest extends YammerComponentTestSupport {
assertMockEndpointsSatisfied();
Exchange exchange = mock.getExchanges().get(0);
- List<User> users = exchange.getIn().getBody(List.class);
+ User user = exchange.getIn().getBody(User.class);
- assertEquals(1, users.size());
- assertEquals("Joe Camel", users.get(0).getFullName());
- assertEquals("jcamel@redhat.com", users.get(0).getContact().getEmailAddresses().get(0).getAddress());
+ assertEquals("Joe Camel", user.getFullName());
+ assertEquals("jcamel@redhat.com", user.getContact().getEmailAddresses().get(0).getAddress());
}
@Override
@@ -52,7 +49,7 @@ public class YammerUserRouteTest extends YammerComponentTestSupport {
return new RouteBuilder() {
public void configure() {
// using dummy keys here since we are mocking out calls to yammer.com with static json; in a real app, please use your own keys!
- from("yammer:users?consumerKey=aConsumerKey&consumerSecret=aConsumerSecretKey&accessToken=aAccessToken").to("mock:result");
+ from("yammer:current?consumerKey=aConsumerKey&consumerSecret=aConsumerSecretKey&accessToken=aAccessToken").to("mock:result");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ecbb9498/components/camel-yammer/src/test/resources/user.json
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/test/resources/user.json b/components/camel-yammer/src/test/resources/user.json
index e1c79d3..f619bae 100644
--- a/components/camel-yammer/src/test/resources/user.json
+++ b/components/camel-yammer/src/test/resources/user.json
@@ -1,4 +1,3 @@
-[
{
"previous_companies":[
@@ -66,5 +65,4 @@
]
}
- }
- ]
\ No newline at end of file
+ }
\ No newline at end of file
[4/8] git commit: Test returning multiple yammer users
Posted by ja...@apache.org.
Test returning multiple yammer users
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8aca60a1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8aca60a1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8aca60a1
Branch: refs/heads/master
Commit: 8aca60a1ad2c249064d3f7c1984c522aaec05981
Parents: 86ea35e
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu Sep 5 10:25:04 2013 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu Sep 5 11:30:12 2013 -0230
----------------------------------------------------------------------
.../yammer/YammerMultipleUsersRouteTest.java | 63 ++++++++++++++++++
.../YammerRelationshipInJsonRouteTest.java | 2 +-
.../yammer/YammerUserPollEnrichRouteTest.java | 2 +-
.../component/yammer/YammerUserRouteTest.java | 2 +-
.../camel-yammer/src/test/resources/user.json | 70 ++++++++++++++++++++
.../camel-yammer/src/test/resources/users.json | 70 +++++++++++++++++++-
6 files changed, 205 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8aca60a1/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMultipleUsersRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMultipleUsersRouteTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMultipleUsersRouteTest.java
new file mode 100644
index 0000000..ca45d22
--- /dev/null
+++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerMultipleUsersRouteTest.java
@@ -0,0 +1,63 @@
+/**
+ * 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.yammer;
+
+
+import java.util.List;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.component.yammer.model.User;
+import org.junit.Test;
+
+public class YammerMultipleUsersRouteTest extends YammerComponentTestSupport {
+
+ @SuppressWarnings("unchecked")
+ @Test
+ public void testConsumeAllUsers() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMinimumMessageCount(1);
+
+ template.sendBody("direct:start", "overwrite me");
+
+ assertMockEndpointsSatisfied();
+
+ Exchange exchange = mock.getExchanges().get(0);
+ List<User> users = exchange.getIn().getBody(List.class);
+
+ assertEquals(2, users.size());
+ assertEquals("Joe Camel", users.get(0).getFullName());
+ assertEquals("jcamel@redhat.com", users.get(0).getContact().getEmailAddresses().get(0).getAddress());
+ assertEquals("Joe Camel Jr", users.get(1).getFullName());
+ assertEquals("jcameljr@redhat.com", users.get(1).getContact().getEmailAddresses().get(0).getAddress());
+ }
+
+ @Override
+ protected String jsonFile() {
+ return "/users.json";
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() {
+ from("direct:start").pollEnrich("yammer:users?consumerKey=aConsumerKey&consumerSecret=aConsumerSecretKey&accessToken=aAccessToken").to("mock:result");
+ }
+ };
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/8aca60a1/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerRelationshipInJsonRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerRelationshipInJsonRouteTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerRelationshipInJsonRouteTest.java
index c486239..ca89ff8 100644
--- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerRelationshipInJsonRouteTest.java
+++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerRelationshipInJsonRouteTest.java
@@ -50,7 +50,7 @@ public class YammerRelationshipInJsonRouteTest extends YammerComponentTestSuppor
return new RouteBuilder() {
public void configure() {
// using dummy keys here since we are mocking out calls to yammer.com with static json; in a real app, please use your own keys!
- from("yammer:relationships?consumerKey=aConsumerKey&consumerSecret=aConsumerSecretKey&accessToken=aAccessToken&useJson=true").to("log:foo").to("mock:result");
+ from("yammer:relationships?consumerKey=aConsumerKey&consumerSecret=aConsumerSecretKey&accessToken=aAccessToken&useJson=true").to("mock:result");
}
};
}
http://git-wip-us.apache.org/repos/asf/camel/blob/8aca60a1/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java
index 9a54104..fe8c73e 100644
--- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java
+++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserPollEnrichRouteTest.java
@@ -47,7 +47,7 @@ public class YammerUserPollEnrichRouteTest extends YammerComponentTestSupport {
@Override
protected String jsonFile() {
- return "/users.json";
+ return "/user.json";
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/8aca60a1/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserRouteTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserRouteTest.java
index c8ccc58..bed0410 100644
--- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserRouteTest.java
+++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerUserRouteTest.java
@@ -44,7 +44,7 @@ public class YammerUserRouteTest extends YammerComponentTestSupport {
@Override
protected String jsonFile() {
- return "/users.json";
+ return "/user.json";
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/8aca60a1/components/camel-yammer/src/test/resources/user.json
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/test/resources/user.json b/components/camel-yammer/src/test/resources/user.json
new file mode 100644
index 0000000..e1c79d3
--- /dev/null
+++ b/components/camel-yammer/src/test/resources/user.json
@@ -0,0 +1,70 @@
+[
+ {
+ "previous_companies":[
+
+ ],
+ "kids_names":null,
+ "activated_at":"2009/06/04 19:56:21 +0000",
+ "interests":null,
+ "admin":"false",
+ "full_name":"Joe Camel",
+ "name":"jcamel",
+ "last_name":"Camel",
+ "mugshot_url_template":"",
+ "type":"user",
+ "mugshot_url":"",
+ "birth_date":"",
+ "timezone":"Pacific Time (US \u0026 Canada)",
+ "location":"",
+ "state":"active",
+ "web_url":"https://www.yammer.com/redhat.com/users/jcamel",
+ "stats":{
+ "followers":13,
+ "following":74,
+ "updates":2
+ },
+ "show_ask_for_photo":false,
+ "external_urls":[
+
+ ],
+ "schools":[
+
+ ],
+ "summary":null,
+ "job_title":"",
+ "id":123456,
+ "expertise":null,
+ "network_domains":[
+ "redhat.com"
+ ],
+ "network_name":"redhat.com",
+ "hire_date":null,
+ "url":"https://www.yammer.com/api/v1/users/123456",
+ "guid":null,
+ "significant_other":null,
+ "verified_admin":"false",
+ "settings":{
+ "xdr_proxy":"https://xdrproxy.yammer.com"
+ },
+ "can_broadcast":"false",
+ "first_name":"Joe",
+ "department":null,
+ "network_id":7654,
+ "contact":{
+ "email_addresses":[
+ {
+ "address":"jcamel@redhat.com",
+ "type":"primary"
+ }
+ ],
+ "has_fake_email":false,
+ "im":{
+ "username":"",
+ "provider":"aim"
+ },
+ "phone_numbers":[
+
+ ]
+ }
+ }
+ ]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/8aca60a1/components/camel-yammer/src/test/resources/users.json
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/test/resources/users.json b/components/camel-yammer/src/test/resources/users.json
index e1c79d3..1e8ae80 100644
--- a/components/camel-yammer/src/test/resources/users.json
+++ b/components/camel-yammer/src/test/resources/users.json
@@ -66,5 +66,73 @@
]
}
- }
+ },
+ {
+ "previous_companies":[
+
+ ],
+ "kids_names":null,
+ "activated_at":"2009/06/04 19:56:21 +0000",
+ "interests":null,
+ "admin":"false",
+ "full_name":"Joe Camel Jr",
+ "name":"jcameljr",
+ "last_name":"Camel",
+ "mugshot_url_template":"",
+ "type":"user",
+ "mugshot_url":"",
+ "birth_date":"",
+ "timezone":"Pacific Time (US \u0026 Canada)",
+ "location":"",
+ "state":"active",
+ "web_url":"https://www.yammer.com/redhat.com/users/jcameljr",
+ "stats":{
+ "followers":13,
+ "following":74,
+ "updates":2
+ },
+ "show_ask_for_photo":false,
+ "external_urls":[
+
+ ],
+ "schools":[
+
+ ],
+ "summary":null,
+ "job_title":"",
+ "id":123456,
+ "expertise":null,
+ "network_domains":[
+ "redhat.com"
+ ],
+ "network_name":"redhat.com",
+ "hire_date":null,
+ "url":"https://www.yammer.com/api/v1/users/123457",
+ "guid":null,
+ "significant_other":null,
+ "verified_admin":"false",
+ "settings":{
+ "xdr_proxy":"https://xdrproxy.yammer.com"
+ },
+ "can_broadcast":"false",
+ "first_name":"Joe",
+ "department":null,
+ "network_id":7654,
+ "contact":{
+ "email_addresses":[
+ {
+ "address":"jcameljr@redhat.com",
+ "type":"primary"
+ }
+ ],
+ "has_fake_email":false,
+ "im":{
+ "username":"",
+ "provider":"aim"
+ },
+ "phone_numbers":[
+
+ ]
+ }
+ }
]
\ No newline at end of file
[6/8] git commit: Add test that I forgot
Posted by ja...@apache.org.
Add test that I forgot
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bab78c63
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bab78c63
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bab78c63
Branch: refs/heads/camel-2.12.x
Commit: bab78c639a45e0acc1321009d1cc9f00af466895
Parents: e66c6f1
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu Sep 5 10:12:35 2013 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu Sep 5 11:31:21 2013 -0230
----------------------------------------------------------------------
.../YammerRelationshipInJsonRouteTest.java | 57 ++++++++++++++++++++
1 file changed, 57 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bab78c63/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerRelationshipInJsonRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerRelationshipInJsonRouteTest.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerRelationshipInJsonRouteTest.java
new file mode 100644
index 0000000..c486239
--- /dev/null
+++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerRelationshipInJsonRouteTest.java
@@ -0,0 +1,57 @@
+/**
+ * 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.yammer;
+
+
+import java.util.List;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.component.yammer.model.Relationships;
+import org.junit.Test;
+
+public class YammerRelationshipInJsonRouteTest extends YammerComponentTestSupport {
+
+ @SuppressWarnings("unchecked")
+ @Test
+ public void testConsumeAllUsers() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMinimumMessageCount(1);
+ assertMockEndpointsSatisfied();
+
+ Exchange exchange = mock.getExchanges().get(0);
+ String relationships = exchange.getIn().getBody(String.class);
+
+ assertEquals(getMessages(), relationships);
+ }
+
+ @Override
+ protected String jsonFile() {
+ return "/relationships.json";
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() {
+ // using dummy keys here since we are mocking out calls to yammer.com with static json; in a real app, please use your own keys!
+ from("yammer:relationships?consumerKey=aConsumerKey&consumerSecret=aConsumerSecretKey&accessToken=aAccessToken&useJson=true").to("log:foo").to("mock:result");
+ }
+ };
+ }
+}
[2/8] git commit: Test for using raw JSON in camel-yammer
Posted by ja...@apache.org.
Test for using raw JSON in camel-yammer
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/59a53674
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/59a53674
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/59a53674
Branch: refs/heads/master
Commit: 59a536748b5c2b4bfc1a35789dfbba08f272abd7
Parents: e0be135
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu Sep 5 10:09:08 2013 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu Sep 5 11:30:11 2013 -0230
----------------------------------------------------------------------
.../component/yammer/YammerComponentTestSupport.java | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/59a53674/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerComponentTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerComponentTestSupport.java b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerComponentTestSupport.java
index 522f919..f55d5fa 100644
--- a/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerComponentTestSupport.java
+++ b/components/camel-yammer/src/test/java/org/apache/camel/component/yammer/YammerComponentTestSupport.java
@@ -27,7 +27,8 @@ import org.junit.Before;
public abstract class YammerComponentTestSupport extends CamelTestSupport {
protected YammerComponent yammerComponent;
-
+ private String messages;
+
public YammerComponentTestSupport() {
super();
}
@@ -38,14 +39,14 @@ public abstract class YammerComponentTestSupport extends CamelTestSupport {
super.setUp();
InputStream is = getClass().getResourceAsStream(jsonFile());
- String messages = context.getTypeConverter().convertTo(String.class, is);
+ setMessages(context.getTypeConverter().convertTo(String.class, is));
yammerComponent = context.getComponent("yammer", YammerComponent.class);
Collection<Endpoint> endpoints = context.getEndpoints();
for (Endpoint endpoint : endpoints) {
if (endpoint instanceof YammerEndpoint) {
- ((YammerEndpoint)endpoint).getConfig().setRequestor(new TestApiRequestor(messages));
+ ((YammerEndpoint)endpoint).getConfig().setRequestor(new TestApiRequestor(getMessages()));
}
}
}
@@ -54,4 +55,12 @@ public abstract class YammerComponentTestSupport extends CamelTestSupport {
return "/messages.json";
}
+ protected String getMessages() {
+ return messages;
+ }
+
+ protected void setMessages(String messages) {
+ this.messages = messages;
+ }
+
}
\ No newline at end of file