Return-Path: X-Original-To: apmail-streams-commits-archive@minotaur.apache.org Delivered-To: apmail-streams-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9E85310089 for ; Sat, 6 Dec 2014 18:48:20 +0000 (UTC) Received: (qmail 97092 invoked by uid 500); 6 Dec 2014 18:48:20 -0000 Delivered-To: apmail-streams-commits-archive@streams.apache.org Received: (qmail 97072 invoked by uid 500); 6 Dec 2014 18:48:20 -0000 Mailing-List: contact commits-help@streams.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@streams.incubator.apache.org Delivered-To: mailing list commits@streams.incubator.apache.org Received: (qmail 97063 invoked by uid 99); 6 Dec 2014 18:48:20 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 06 Dec 2014 18:48:20 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Sat, 06 Dec 2014 18:47:56 +0000 Received: (qmail 96374 invoked by uid 99); 6 Dec 2014 18:47:53 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 06 Dec 2014 18:47:53 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 708B49BE1AD; Sat, 6 Dec 2014 18:47:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sblackmon@apache.org To: commits@streams.incubator.apache.org Date: Sat, 06 Dec 2014 18:47:56 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/5] incubator-streams git commit: factored out creation of a decent scanner to new test utility class X-Virus-Checked: Checked by ClamAV on apache.org factored out creation of a decent scanner to new test utility class Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/3f207878 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/3f207878 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/3f207878 Branch: refs/heads/master Commit: 3f2078784308ba48d8b4a61f7f926d8c55fa3071 Parents: f7c7508 Author: sblackmon Authored: Fri Dec 5 17:55:35 2014 -0600 Committer: sblackmon Committed: Fri Dec 5 17:55:35 2014 -0600 ---------------------------------------------------------------------- pom.xml | 5 ++--- .../streams-provider-datasift/pom.xml | 8 +++++++- .../DatasiftActivitySerializerTest.java | 6 ++---- .../serializer/DatasiftEventClassifierTest.java | 9 +++------ ...DatasiftInstagramActivitySerializerTest.java | 4 ++-- ...tasiftInteractionActivitySerializerTest.java | 4 ++-- .../DatasiftTwitterActivitySerializerTest.java | 4 ++-- streams-util/pom.xml | 15 ++++++++++++++ .../streams/util/files/StreamsScannerUtil.java | 21 ++++++++++++++++++++ 9 files changed, 56 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/3f207878/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9f0b291..de24ebf 100644 --- a/pom.xml +++ b/pom.xml @@ -127,7 +127,7 @@ ${java.version} ${java.version} - UTF-8 + ${project.build.sourceEncoding} @@ -177,7 +177,7 @@ maven-resources-plugin 2.7 - UTF-8 + ${project.build.sourceEncoding} @@ -278,7 +278,6 @@ config ${typesafe.config.version} - junit junit http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/3f207878/streams-contrib/streams-provider-datasift/pom.xml ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-datasift/pom.xml b/streams-contrib/streams-provider-datasift/pom.xml index fe7257d..77c3e8a 100644 --- a/streams-contrib/streams-provider-datasift/pom.xml +++ b/streams-contrib/streams-provider-datasift/pom.xml @@ -90,7 +90,13 @@ 1.9.5 test - + + org.apache.streams + streams-util + test-jar + test + ${project.version} + http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/3f207878/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftActivitySerializerTest.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftActivitySerializerTest.java b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftActivitySerializerTest.java index dcc7ba9..12bf918 100644 --- a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftActivitySerializerTest.java +++ b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftActivitySerializerTest.java @@ -10,6 +10,7 @@ import org.apache.streams.datasift.util.StreamsDatasiftMapper; import org.apache.streams.jackson.StreamsJacksonMapper; import org.apache.streams.pojo.json.Activity; import org.apache.streams.pojo.json.Actor; +import org.apache.streams.util.files.StreamsScannerUtil; import org.junit.Before; import org.junit.Test; @@ -26,8 +27,6 @@ public class DatasiftActivitySerializerTest { protected static ObjectMapper MAPPER = StreamsJacksonMapper.getInstance(Lists.newArrayList(StreamsDatasiftMapper.DATASIFT_FORMAT)); - protected static Pattern newLinePattern = Pattern.compile("(\\r\\n?|\\n)", Pattern.MULTILINE); - @Before public void initSerializer() { SERIALIZER = new DatasiftActivitySerializer(); @@ -36,8 +35,7 @@ public class DatasiftActivitySerializerTest { @Test public void testConversion() throws Exception { - InputStream testFileStream = DatasiftTwitterActivitySerializerTest.class.getResourceAsStream("/rand_sample_datasift_json.txt"); - Scanner scanner = new Scanner(testFileStream, "UTF-8").useDelimiter(newLinePattern); + Scanner scanner = StreamsScannerUtil.getInstance("/rand_sample_datasift_json.txt"); String line = null; while(scanner.hasNextLine()) { http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/3f207878/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 index 6a880b8..a29d0f4 100644 --- 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 @@ -25,6 +25,7 @@ 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.util.files.StreamsScannerUtil; import org.junit.Test; import java.io.InputStream; @@ -38,13 +39,10 @@ public class DatasiftEventClassifierTest { private static final ObjectMapper MAPPER = StreamsJacksonMapper.getInstance(Lists.newArrayList(StreamsDatasiftMapper.DATASIFT_FORMAT)); - protected static Pattern newLinePattern = Pattern.compile("(\\r\\n?|\\n)", Pattern.MULTILINE); - @Test public void testTwitterDetection() throws Exception { - InputStream testFileStream = DatasiftTwitterActivitySerializerTest.class.getResourceAsStream("/twitter_datasift_json.txt"); - Scanner scanner = new Scanner(testFileStream, "UTF-8").useDelimiter(newLinePattern); + Scanner scanner = StreamsScannerUtil.getInstance("/twitter_datasift_json.txt"); String line = null; while(scanner.hasNextLine()) { @@ -58,8 +56,7 @@ public class DatasiftEventClassifierTest { @Test public void testInstagramDetection() throws Exception { - InputStream testFileStream = DatasiftTwitterActivitySerializerTest.class.getResourceAsStream("/instagram_datasift_json.txt"); - Scanner scanner = new Scanner(testFileStream, "UTF-8").useDelimiter(newLinePattern); + Scanner scanner = StreamsScannerUtil.getInstance("/instagram_datasift_json.txt"); String line = null; while(scanner.hasNextLine()) { http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/3f207878/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftInstagramActivitySerializerTest.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftInstagramActivitySerializerTest.java b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftInstagramActivitySerializerTest.java index c409642..e3d1207 100644 --- a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftInstagramActivitySerializerTest.java +++ b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftInstagramActivitySerializerTest.java @@ -9,6 +9,7 @@ import org.apache.streams.datasift.util.StreamsDatasiftMapper; import org.apache.streams.jackson.StreamsJacksonMapper; import org.apache.streams.pojo.json.Activity; import org.apache.streams.pojo.json.Actor; +import org.apache.streams.util.files.StreamsScannerUtil; import org.junit.Before; import org.junit.Test; @@ -30,8 +31,7 @@ public class DatasiftInstagramActivitySerializerTest extends DatasiftActivitySer @Override public void testConversion() throws Exception { - InputStream testFileStream = DatasiftTwitterActivitySerializerTest.class.getResourceAsStream("/instagram_datasift_json.txt"); - Scanner scanner = new Scanner(testFileStream, "UTF-8").useDelimiter(newLinePattern); + Scanner scanner = StreamsScannerUtil.getInstance("/instagram_datasift_json.txt"); String line = null; while(scanner.hasNextLine()) { http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/3f207878/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftInteractionActivitySerializerTest.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftInteractionActivitySerializerTest.java b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftInteractionActivitySerializerTest.java index c9886eb..ce30303 100644 --- a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftInteractionActivitySerializerTest.java +++ b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftInteractionActivitySerializerTest.java @@ -9,6 +9,7 @@ import org.apache.streams.datasift.util.StreamsDatasiftMapper; import org.apache.streams.jackson.StreamsJacksonMapper; import org.apache.streams.pojo.json.Activity; import org.apache.streams.pojo.json.Actor; +import org.apache.streams.util.files.StreamsScannerUtil; import org.junit.Before; import org.junit.Test; @@ -30,8 +31,7 @@ public class DatasiftInteractionActivitySerializerTest extends DatasiftActivityS @Override public void testConversion() throws Exception { - InputStream testFileStream = DatasiftInteractionActivitySerializerTest.class.getResourceAsStream("/rand_sample_datasift_json.txt"); - Scanner scanner = new Scanner(testFileStream, "UTF-8").useDelimiter(newLinePattern); + Scanner scanner = StreamsScannerUtil.getInstance("/rand_sample_datasift_json.txt"); String line = null; while(scanner.hasNextLine()) { http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/3f207878/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftTwitterActivitySerializerTest.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftTwitterActivitySerializerTest.java b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftTwitterActivitySerializerTest.java index f458e21..1b82cba 100644 --- a/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftTwitterActivitySerializerTest.java +++ b/streams-contrib/streams-provider-datasift/src/test/java17/org/apache/streams/datasift/serializer/DatasiftTwitterActivitySerializerTest.java @@ -9,6 +9,7 @@ import org.apache.streams.datasift.util.StreamsDatasiftMapper; import org.apache.streams.jackson.StreamsJacksonMapper; import org.apache.streams.pojo.json.Activity; import org.apache.streams.pojo.json.Actor; +import org.apache.streams.util.files.StreamsScannerUtil; import org.junit.Before; import org.junit.Test; @@ -32,8 +33,7 @@ public class DatasiftTwitterActivitySerializerTest extends DatasiftActivitySeria @Override public void testConversion() throws Exception { - InputStream testFileStream = DatasiftTwitterActivitySerializerTest.class.getResourceAsStream("/twitter_datasift_json.txt"); - Scanner scanner = new Scanner(testFileStream, "UTF-8").useDelimiter(newLinePattern); + Scanner scanner = StreamsScannerUtil.getInstance("/twitter_datasift_json.txt"); String line = null; while(scanner.hasNextLine()) { http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/3f207878/streams-util/pom.xml ---------------------------------------------------------------------- diff --git a/streams-util/pom.xml b/streams-util/pom.xml index 7a50201..88fdab1 100644 --- a/streams-util/pom.xml +++ b/streams-util/pom.xml @@ -49,4 +49,19 @@ 2.1.2 + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/3f207878/streams-util/src/test/java/org/apache/streams/util/files/StreamsScannerUtil.java ---------------------------------------------------------------------- diff --git a/streams-util/src/test/java/org/apache/streams/util/files/StreamsScannerUtil.java b/streams-util/src/test/java/org/apache/streams/util/files/StreamsScannerUtil.java new file mode 100644 index 0000000..d15edd3 --- /dev/null +++ b/streams-util/src/test/java/org/apache/streams/util/files/StreamsScannerUtil.java @@ -0,0 +1,21 @@ +package org.apache.streams.util.files; + +import java.io.File; +import java.io.InputStream; +import java.util.Scanner; +import java.util.regex.Pattern; + +/** + * Test Utility for acquiring a Scanner that won't choke on unicode or odd line-breaks. + */ +public class StreamsScannerUtil { + + protected static Pattern newLinePattern = Pattern.compile("(\\r\\n?|\\n)", Pattern.MULTILINE); + + public static Scanner getInstance(String resourcePath) { + + InputStream testFileStream = StreamsScannerUtil.class.getResourceAsStream(resourcePath); + return new Scanner(testFileStream, "UTF-8").useDelimiter(newLinePattern); + + }; +}