Repository: incubator-streams Updated Branches: refs/heads/STREAMS-208 [created] adbb1b80a
simple Integration Test Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/adbb1b80 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/adbb1b80 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/adbb1b80 Branch: refs/heads/STREAMS-208 Commit: adbb1b80a52e1517d2833ad43ac1acad5d20610f Parents: 9aebd0b Author: sblackmon <[email protected]> Authored: Thu Nov 6 09:45:32 2014 -0800 Committer: sblackmon <[email protected]> Committed: Thu Nov 6 09:45:32 2014 -0800 ---------------------------------------------------------------------- pom.xml | 56 ++++++++++++++++++++ streams-contrib/streams-persist-console/pom.xml | 34 ++++++++++++ .../streams/console/ConsolePersistReader.java | 11 ++-- .../streams/console/ConsolePersistWriter.java | 11 ++-- 4 files changed, 103 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/adbb1b80/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f8b6a14..e86f02d 100644 --- a/pom.xml +++ b/pom.xml @@ -74,6 +74,8 @@ <jaxb2-basics.version>0.8.4</jaxb2-basics.version> <jaxbutil.version>1.2.6</jaxbutil.version> <junit.version>4.11</junit.version> + <surefire.plugin.version>2.17</surefire.plugin.version> + <failsafe.plugin.version>2.17</failsafe.plugin.version> <slf4j.version>1.7.6</slf4j.version> <logback.version>1.1.1</logback.version> <commons-io.version>2.4</commons-io.version> @@ -90,6 +92,7 @@ <facebook4j.version>2.1.0</facebook4j.version> <maven.enforcer.plugin.version>1.3.1</maven.enforcer.plugin.version> <mockito.version>1.9.5</mockito.version> + <powermock.version>1.5.6</powermock.version> </properties> <modules> @@ -177,6 +180,41 @@ <artifactId>build-helper-maven-plugin</artifactId> <version>${build-helper.version}</version> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <version>${failsafe.plugin.version}</version> + <executions> + <execution> + <id>integration-test</id> + <goals> + <goal>integration-test</goal> + <goal>verify</goal> + </goals> + <configuration> + <!-- Sets the VM argument line used when integration tests are run. --> + <argLine>${failsafeArgLine}</argLine> + <!-- Skips integration tests if the value of skip.integration.tests property is true --> + <skipTests>${skip.integration.tests}</skipTests> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${surefire.plugin.version}</version> + <configuration> + <!-- Sets the VM argument line used when unit tests are run. --> + <argLine>${surefireArgLine}</argLine> + <!-- Skips unit tests if the value of skip.unit.tests property is true --> + <skipTests>${skip.unit.tests}</skipTests> + <!-- Excludes integration tests when unit tests are run. --> + <excludes> + <exclude>**/IT*.java</exclude> + </excludes> + </configuration> + </plugin> </plugins> </pluginManagement> </build> @@ -231,6 +269,24 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock</artifactId> + <version>${powermock.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-module-junit4</artifactId> + <version>${powermock.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-api-mockito</artifactId> + <version>${powermock.version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>${slf4j.version}</version> http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/adbb1b80/streams-contrib/streams-persist-console/pom.xml ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-persist-console/pom.xml b/streams-contrib/streams-persist-console/pom.xml index c7f2cd3..02ec403 100644 --- a/streams-contrib/streams-persist-console/pom.xml +++ b/streams-contrib/streams-persist-console/pom.xml @@ -26,5 +26,39 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + + <dependency> + <groupId>org.apache.streams</groupId> + <artifactId>streams-runtime-local</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-module-junit4</artifactId> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-api-mockito</artifactId> + </dependency> </dependencies> + <build> + <sourceDirectory>src/main/java</sourceDirectory> + <testSourceDirectory>src/test/java</testSourceDirectory> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + </resources> + <testResources> + <testResource> + <directory>src/test/resources</directory> + </testResource> + </testResources> + </build> + </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/adbb1b80/streams-contrib/streams-persist-console/src/main/java/org/apache/streams/console/ConsolePersistReader.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-persist-console/src/main/java/org/apache/streams/console/ConsolePersistReader.java b/streams-contrib/streams-persist-console/src/main/java/org/apache/streams/console/ConsolePersistReader.java index 776d5a3..8afba85 100644 --- a/streams-contrib/streams-persist-console/src/main/java/org/apache/streams/console/ConsolePersistReader.java +++ b/streams-contrib/streams-persist-console/src/main/java/org/apache/streams/console/ConsolePersistReader.java @@ -31,6 +31,7 @@ import org.slf4j.LoggerFactory; import java.io.BufferedInputStream; import java.io.InputStream; +import java.io.PrintStream; import java.math.BigInteger; import java.util.Queue; import java.util.Scanner; @@ -44,16 +45,16 @@ public class ConsolePersistReader implements StreamsPersistReader { protected volatile Queue<StreamsDatum> persistQueue; - private ObjectMapper mapper = new ObjectMapper(); + protected InputStream inputStream = System.in; public ConsolePersistReader() { this.persistQueue = new ConcurrentLinkedQueue<StreamsDatum>(); } - public ConsolePersistReader(Queue<StreamsDatum> persistQueue) { - this.persistQueue = persistQueue; + public ConsolePersistReader(InputStream inputStream) { + this(); + this.inputStream = inputStream; } - public void prepare(Object o) { } @@ -77,7 +78,7 @@ public class ConsolePersistReader implements StreamsPersistReader { LOGGER.info("{} readCurrent", STREAMS_ID); - Scanner sc = new Scanner(System.in); + Scanner sc = new Scanner(inputStream); while( sc.hasNextLine() ) { http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/adbb1b80/streams-contrib/streams-persist-console/src/main/java/org/apache/streams/console/ConsolePersistWriter.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-persist-console/src/main/java/org/apache/streams/console/ConsolePersistWriter.java b/streams-contrib/streams-persist-console/src/main/java/org/apache/streams/console/ConsolePersistWriter.java index 96d116f..53bb8d7 100644 --- a/streams-contrib/streams-persist-console/src/main/java/org/apache/streams/console/ConsolePersistWriter.java +++ b/streams-contrib/streams-persist-console/src/main/java/org/apache/streams/console/ConsolePersistWriter.java @@ -27,6 +27,7 @@ import org.apache.streams.jackson.StreamsJacksonMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.PrintStream; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; @@ -34,6 +35,8 @@ public class ConsolePersistWriter implements StreamsPersistWriter { private static final Logger LOGGER = LoggerFactory.getLogger(ConsolePersistWriter.class); + protected PrintStream printStream = System.out; + protected volatile Queue<StreamsDatum> persistQueue; private ObjectMapper mapper = StreamsJacksonMapper.getInstance(); @@ -42,8 +45,9 @@ public class ConsolePersistWriter implements StreamsPersistWriter { this.persistQueue = new ConcurrentLinkedQueue<StreamsDatum>(); } - public ConsolePersistWriter(Queue<StreamsDatum> persistQueue) { - this.persistQueue = persistQueue; + public ConsolePersistWriter(PrintStream printStream) { + this(); + this.printStream = printStream; } public void prepare(Object o) { @@ -61,8 +65,7 @@ public class ConsolePersistWriter implements StreamsPersistWriter { String text = mapper.writeValueAsString(entry); - System.out.println("\n"+text+"\n"); -// LOGGER.info(text); + printStream.println(text); } catch (JsonProcessingException e) { LOGGER.warn("save: {}", e);
