You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2014/11/07 01:58:31 UTC
[1/2] incubator-streams git commit: adding new test to SCM
Repository: incubator-streams
Updated Branches:
refs/heads/STREAMS-212 9bfaaa551 -> 612676d4e
adding new test to SCM
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/aefa064d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/aefa064d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/aefa064d
Branch: refs/heads/STREAMS-212
Commit: aefa064d54a8be673a546031eb3587c1e42d6f65
Parents: 9aebd0b
Author: sblackmon <sb...@apache.org>
Authored: Thu Nov 6 16:57:33 2014 -0800
Committer: sblackmon <sb...@apache.org>
Committed: Thu Nov 6 16:57:33 2014 -0800
----------------------------------------------------------------------
.../serializer/DatasiftEventClassifierTest.java | 76 ++++++++++++++++++++
1 file changed, 76 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/aefa064d/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftEventClassifierTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftEventClassifierTest.java b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftEventClassifierTest.java
new file mode 100644
index 0000000..2004654
--- /dev/null
+++ b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftEventClassifierTest.java
@@ -0,0 +1,76 @@
+/*
+ * 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
+ *
+ * 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.streams.datasift.serializer;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.Lists;
+import org.apache.streams.data.ActivitySerializer;
+import org.apache.streams.datasift.Datasift;
+import org.apache.streams.datasift.instagram.Instagram;
+import org.apache.streams.datasift.twitter.Twitter;
+import org.apache.streams.datasift.util.StreamsDatasiftMapper;
+import org.apache.streams.jackson.StreamsJacksonMapper;
+import org.apache.streams.twitter.pojo.Delete;
+import org.apache.streams.twitter.pojo.Retweet;
+import org.apache.streams.twitter.pojo.Tweet;
+import org.apache.streams.twitter.pojo.User;
+import org.apache.streams.twitter.provider.TwitterEventClassifier;
+import org.apache.streams.twitter.serializer.TwitterJsonDeleteActivitySerializer;
+import org.apache.streams.twitter.serializer.TwitterJsonRetweetActivitySerializer;
+import org.apache.streams.twitter.serializer.TwitterJsonTweetActivitySerializer;
+import org.apache.streams.twitter.serializer.TwitterJsonUserActivitySerializer;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.Scanner;
+
+/**
+ * Created by sblackmon on 12/13/13.
+ */
+public class DatasiftEventClassifierTest {
+
+ private static final ObjectMapper MAPPER = StreamsJacksonMapper.getInstance(Lists.newArrayList(StreamsDatasiftMapper.DATASIFT_FORMAT));
+
+ @Test
+ public void testTwitterDetection() throws Exception {
+ Scanner scanner = new Scanner(DatasiftActivitySerializerTest.class.getResourceAsStream("/twitter_datasift_json.txt"));
+ String line = null;
+ while(scanner.hasNextLine()) {
+ line = scanner.nextLine();
+ Datasift datasift = MAPPER.readValue(line, Datasift.class);
+ assert(DatasiftEventClassifier.detectClass(datasift) == Twitter.class);
+ assert(DatasiftEventClassifier.bestSerializer(datasift) instanceof DatasiftTweetActivitySerializer);
+ }
+ }
+
+ @Test
+ public void testInstagramDetection() throws Exception {
+ Scanner scanner = new Scanner(DatasiftActivitySerializerTest.class.getResourceAsStream("/instagram_datasift_json.txt"));
+ String line = null;
+ while(scanner.hasNextLine()) {
+ line = scanner.nextLine();
+ Datasift datasift = MAPPER.readValue(line, Datasift.class);
+ assert(DatasiftEventClassifier.detectClass(datasift) == Instagram.class);
+ assert(DatasiftEventClassifier.bestSerializer(datasift) instanceof DatasiftInstagramActivitySerializer);
+ }
+ }
+
+
+}
[2/2] incubator-streams git commit: Merge branch 'STREAMS-212' of
https://git-wip-us.apache.org/repos/asf/incubator-streams into STREAMS-212
Posted by sb...@apache.org.
Merge branch 'STREAMS-212' of https://git-wip-us.apache.org/repos/asf/incubator-streams into STREAMS-212
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/612676d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/612676d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/612676d4
Branch: refs/heads/STREAMS-212
Commit: 612676d4e56a0011d5b402585745887849fcb349
Parents: aefa064 9bfaaa5
Author: sblackmon <sb...@apache.org>
Authored: Thu Nov 6 16:57:55 2014 -0800
Committer: sblackmon <sb...@apache.org>
Committed: Thu Nov 6 16:57:55 2014 -0800
----------------------------------------------------------------------
.../DatasiftTypeConverterProcessor.java | 7 +-
.../serializer/DatasiftActivitySerializer.java | 12 +-
.../DatasiftDefaultActivitySerializer.java | 214 -------------------
.../DatasiftInstagramActivitySerializer.java | 8 +-
.../DatasiftTweetActivitySerializer.java | 8 +-
.../datasift/util/StreamsDatasiftMapper.java | 11 +-
.../com/datasift/test/DatasiftSerDeTest.java | 18 +-
.../DatasiftTypeConverterProcessorTest.java | 72 -------
.../DatasiftActivitySerializerTest.java | 6 +-
.../streams-provider-twitter/pom.xml | 6 +
.../processor/TwitterEventProcessor.java | 194 -----------------
.../twitter/processor/TwitterTypeConverter.java | 209 ------------------
.../provider/TwitterEventClassifier.java | 58 +++--
.../serializer/StreamsTwitterMapper.java | 11 +-
.../TwitterJsonActivitySerializer.java | 24 +--
.../TwitterJsonDeleteActivitySerializer.java | 6 +
.../TwitterJsonRetweetActivitySerializer.java | 6 +
.../TwitterJsonTweetActivitySerializer.java | 6 +
.../TwitterJsonUserActivitySerializer.java | 6 +
...erJsonUserstreameventActivitySerializer.java | 6 +
.../streams/twitter/test/SimpleTweetTest.java | 11 +-
.../twitter/test/TweetActivitySerDeTest.java | 6 +-
.../streams/twitter/test/TweetSerDeTest.java | 6 +-
.../test/TwitterEventClassifierTest.java | 34 +++
24 files changed, 185 insertions(+), 760 deletions(-)
----------------------------------------------------------------------