Repository: incubator-streams Updated Branches: refs/heads/STREAMS-429 [created] ec0d0e7c5
switch mojo tests to ITs, so they donât fail jenkins Streams Trunk build Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/ec0d0e7c Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/ec0d0e7c Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/ec0d0e7c Branch: refs/heads/STREAMS-429 Commit: ec0d0e7c51fb9455014fb5c7ed106b1fa50f6ae2 Parents: 2c12724 Author: Steve Blackmon @steveblackmon <sblack...@apache.org> Authored: Mon Oct 17 12:40:29 2016 -0500 Committer: Steve Blackmon @steveblackmon <sblack...@apache.org> Committed: Mon Oct 17 12:40:29 2016 -0500 ---------------------------------------------------------------------- .../src/site/markdown/index.md | 2 +- ...StreamsCassandraResourceGeneratorMojoIT.java | 78 ++++++++++++++++++++ ...reamsCassandraResourceGeneratorMojoTest.java | 78 -------------------- .../src/site/markdown/index.md | 2 +- ...amsElasticsearchResourceGeneratorMojoIT.java | 50 +++++++++++++ ...sElasticsearchResourceGeneratorMojoTest.java | 50 ------------- .../src/site/markdown/index.md | 2 +- .../StreamsHbaseResourceGeneratorMojoIT.java | 64 ++++++++++++++++ .../StreamsHbaseResourceGeneratorMojoTest.java | 65 ---------------- .../src/site/markdown/index.md | 2 +- .../StreamsHiveResourceGeneratorMojoIT.java | 64 ++++++++++++++++ .../StreamsHiveResourceGeneratorMojoTest.java | 64 ---------------- .../src/site/markdown/index.md | 2 +- .../test/StreamsPigResourceGeneratorMojoIT.java | 64 ++++++++++++++++ .../StreamsPigResourceGeneratorMojoTest.java | 64 ---------------- .../src/site/markdown/index.md | 2 +- .../test/StreamsPojoSourceGeneratorMojoIT.java | 67 +++++++++++++++++ .../StreamsPojoSourceGeneratorMojoTest.java | 68 ----------------- .../src/site/markdown/index.md | 2 +- 19 files changed, 394 insertions(+), 396 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ec0d0e7c/streams-plugins/streams-plugin-cassandra/src/site/markdown/index.md ---------------------------------------------------------------------- diff --git a/streams-plugins/streams-plugin-cassandra/src/site/markdown/index.md b/streams-plugins/streams-plugin-cassandra/src/site/markdown/index.md index 0e8ecf3..5300747 100644 --- a/streams-plugins/streams-plugin-cassandra/src/site/markdown/index.md +++ b/streams-plugins/streams-plugin-cassandra/src/site/markdown/index.md @@ -9,7 +9,7 @@ streams-plugin-cassandra generates resources from json schemas to assist with in Run within a module containing a src/main/jsonschema directory - mvn org.apache.streams.plugins:streams-plugin-cassandra:0.3-incubating-SNAPSHOT:cassandra + mvn org.apache.streams.plugins:streams-plugin-cassandra:0.4-incubating:cassandra [streams-plugin-cassandra/pom.xml](streams-plugin-cassandra/pom.xml "streams-plugin-cassandra/pom.xml") http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ec0d0e7c/streams-plugins/streams-plugin-cassandra/src/test/java/org/apache/streams/plugins/cassandra/test/StreamsCassandraResourceGeneratorMojoIT.java ---------------------------------------------------------------------- diff --git a/streams-plugins/streams-plugin-cassandra/src/test/java/org/apache/streams/plugins/cassandra/test/StreamsCassandraResourceGeneratorMojoIT.java b/streams-plugins/streams-plugin-cassandra/src/test/java/org/apache/streams/plugins/cassandra/test/StreamsCassandraResourceGeneratorMojoIT.java new file mode 100644 index 0000000..ce3e635 --- /dev/null +++ b/streams-plugins/streams-plugin-cassandra/src/test/java/org/apache/streams/plugins/cassandra/test/StreamsCassandraResourceGeneratorMojoIT.java @@ -0,0 +1,78 @@ +package org.apache.streams.plugins.cassandra.test; + +import com.google.common.collect.Lists; +import com.google.common.io.Files; +import junit.framework.TestCase; +import org.apache.commons.lang3.StringUtils; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.util.ResourceExtractor; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import static org.apache.streams.plugins.cassandra.test.StreamsCassandraResourceGeneratorTest.cqlFilter; + +/** + * Tests that streams-plugin-hive running via maven generates hql resources + */ +public class StreamsCassandraResourceGeneratorMojoIT extends TestCase { + + private final static Logger LOGGER = LoggerFactory.getLogger(StreamsCassandraResourceGeneratorMojoIT.class); + + protected void setUp() throws Exception + { + // required for mojo lookups to work + super.setUp(); + } + + @Test + public void testStreamsCassandraResourceGeneratorMojo() throws Exception { + + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/streams-plugin-cassandra" ); + + Verifier verifier; + + verifier = new Verifier( testDir.getAbsolutePath() ); + + List cliOptions = new ArrayList(); + cliOptions.add( "-N" ); + verifier.executeGoals( Lists.<String>newArrayList( + "clean", + "dependency:unpack-dependencies", + "generate-resources")); + + verifier.verifyErrorFreeLog(); + + verifier.resetStreams(); + + Path testOutputPath = Paths.get(testDir.getAbsolutePath()).resolve("target/generated-resources/test-mojo"); + + File testOutput = testOutputPath.toFile(); + + assert( testOutput != null ); + assert( testOutput.exists() == true ); + assert( testOutput.isDirectory() == true ); + + Iterable<File> outputIterator = Files.fileTreeTraverser().breadthFirstTraversal(testOutput) + .filter(cqlFilter); + Collection<File> outputCollection = Lists.newArrayList(outputIterator); + assert( outputCollection.size() == 1 ); + + Path path = testOutputPath.resolve("types.cql"); + + assert( path.toFile().exists() ); + + String typesCqlBytes = new String( + java.nio.file.Files.readAllBytes(path)); + + assert( StringUtils.countMatches(typesCqlBytes, "CREATE TYPE") == 133 ); + + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ec0d0e7c/streams-plugins/streams-plugin-cassandra/src/test/java/org/apache/streams/plugins/cassandra/test/StreamsCassandraResourceGeneratorMojoTest.java ---------------------------------------------------------------------- diff --git a/streams-plugins/streams-plugin-cassandra/src/test/java/org/apache/streams/plugins/cassandra/test/StreamsCassandraResourceGeneratorMojoTest.java b/streams-plugins/streams-plugin-cassandra/src/test/java/org/apache/streams/plugins/cassandra/test/StreamsCassandraResourceGeneratorMojoTest.java deleted file mode 100644 index ee0ce99..0000000 --- a/streams-plugins/streams-plugin-cassandra/src/test/java/org/apache/streams/plugins/cassandra/test/StreamsCassandraResourceGeneratorMojoTest.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.apache.streams.plugins.cassandra.test; - -import com.google.common.collect.Lists; -import com.google.common.io.Files; -import junit.framework.TestCase; -import org.apache.commons.lang3.StringUtils; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.util.ResourceExtractor; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.File; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import static org.apache.streams.plugins.cassandra.test.StreamsCassandraResourceGeneratorTest.cqlFilter; - -/** - * Tests that streams-plugin-hive running via maven generates hql resources - */ -public class StreamsCassandraResourceGeneratorMojoTest extends TestCase { - - private final static Logger LOGGER = LoggerFactory.getLogger(StreamsCassandraResourceGeneratorMojoTest.class); - - protected void setUp() throws Exception - { - // required for mojo lookups to work - super.setUp(); - } - - @Test - public void testStreamsCassandraResourceGeneratorMojo() throws Exception { - - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/streams-plugin-cassandra" ); - - Verifier verifier; - - verifier = new Verifier( testDir.getAbsolutePath() ); - - List cliOptions = new ArrayList(); - cliOptions.add( "-N" ); - verifier.executeGoals( Lists.<String>newArrayList( - "clean", - "dependency:unpack-dependencies", - "generate-resources")); - - verifier.verifyErrorFreeLog(); - - verifier.resetStreams(); - - Path testOutputPath = Paths.get(testDir.getAbsolutePath()).resolve("target/generated-resources/test-mojo"); - - File testOutput = testOutputPath.toFile(); - - assert( testOutput != null ); - assert( testOutput.exists() == true ); - assert( testOutput.isDirectory() == true ); - - Iterable<File> outputIterator = Files.fileTreeTraverser().breadthFirstTraversal(testOutput) - .filter(cqlFilter); - Collection<File> outputCollection = Lists.newArrayList(outputIterator); - assert( outputCollection.size() == 1 ); - - Path path = testOutputPath.resolve("types.cql"); - - assert( path.toFile().exists() ); - - String typesCqlBytes = new String( - java.nio.file.Files.readAllBytes(path)); - - assert( StringUtils.countMatches(typesCqlBytes, "CREATE TYPE") == 133 ); - - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ec0d0e7c/streams-plugins/streams-plugin-elasticsearch/src/site/markdown/index.md ---------------------------------------------------------------------- diff --git a/streams-plugins/streams-plugin-elasticsearch/src/site/markdown/index.md b/streams-plugins/streams-plugin-elasticsearch/src/site/markdown/index.md index f65433b..4b5af8e 100644 --- a/streams-plugins/streams-plugin-elasticsearch/src/site/markdown/index.md +++ b/streams-plugins/streams-plugin-elasticsearch/src/site/markdown/index.md @@ -11,7 +11,7 @@ Output will be placed in target/generated-resources/elasticsearch by default Run within a module containing a src/main/jsonschema directory - mvn org.apache.streams.plugins:streams-plugin-elasticsearch:0.3-incubating-SNAPSHOT:elasticsearch + mvn org.apache.streams.plugins:streams-plugin-elasticsearch:0.4-incubating:elasticsearch [streams-plugin-elasticsearch/pom.xml](streams-plugin-elasticsearch/pom.xml "streams-plugin-elasticsearch/pom.xml") http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ec0d0e7c/streams-plugins/streams-plugin-elasticsearch/src/test/java/org/apache/streams/plugins/elasticsearch/test/StreamsElasticsearchResourceGeneratorMojoIT.java ---------------------------------------------------------------------- diff --git a/streams-plugins/streams-plugin-elasticsearch/src/test/java/org/apache/streams/plugins/elasticsearch/test/StreamsElasticsearchResourceGeneratorMojoIT.java b/streams-plugins/streams-plugin-elasticsearch/src/test/java/org/apache/streams/plugins/elasticsearch/test/StreamsElasticsearchResourceGeneratorMojoIT.java new file mode 100644 index 0000000..3657cdd --- /dev/null +++ b/streams-plugins/streams-plugin-elasticsearch/src/test/java/org/apache/streams/plugins/elasticsearch/test/StreamsElasticsearchResourceGeneratorMojoIT.java @@ -0,0 +1,50 @@ +package org.apache.streams.plugins.elasticsearch.test; + +import com.google.common.collect.Lists; +import junit.framework.TestCase; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.util.ResourceExtractor; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +/** + * Tests that streams-plugin-hive running via maven generates hql resources + */ +public class StreamsElasticsearchResourceGeneratorMojoIT extends TestCase { + + private final static Logger LOGGER = LoggerFactory.getLogger(StreamsElasticsearchResourceGeneratorMojoIT.class); + + protected void setUp() throws Exception + { + // required for mojo lookups to work + super.setUp(); + } + + + @Test + public void testStreamsElasticsearchResourceGeneratorMojo() throws Exception { + + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/streams-plugin-elasticsearch" ); + + Verifier verifier; + + verifier = new Verifier( testDir.getAbsolutePath() ); + + List cliOptions = new ArrayList(); + cliOptions.add( "-N" ); + verifier.executeGoals( Lists.<String>newArrayList( + "clean", + "dependency:unpack-dependencies", + "generate-resources")); + + verifier.verifyErrorFreeLog(); + + verifier.resetStreams(); + + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ec0d0e7c/streams-plugins/streams-plugin-elasticsearch/src/test/java/org/apache/streams/plugins/elasticsearch/test/StreamsElasticsearchResourceGeneratorMojoTest.java ---------------------------------------------------------------------- diff --git a/streams-plugins/streams-plugin-elasticsearch/src/test/java/org/apache/streams/plugins/elasticsearch/test/StreamsElasticsearchResourceGeneratorMojoTest.java b/streams-plugins/streams-plugin-elasticsearch/src/test/java/org/apache/streams/plugins/elasticsearch/test/StreamsElasticsearchResourceGeneratorMojoTest.java deleted file mode 100644 index 72f4675..0000000 --- a/streams-plugins/streams-plugin-elasticsearch/src/test/java/org/apache/streams/plugins/elasticsearch/test/StreamsElasticsearchResourceGeneratorMojoTest.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.apache.streams.plugins.elasticsearch.test; - -import com.google.common.collect.Lists; -import junit.framework.TestCase; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.util.ResourceExtractor; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -/** - * Tests that streams-plugin-hive running via maven generates hql resources - */ -public class StreamsElasticsearchResourceGeneratorMojoTest extends TestCase { - - private final static Logger LOGGER = LoggerFactory.getLogger(StreamsElasticsearchResourceGeneratorMojoTest.class); - - protected void setUp() throws Exception - { - // required for mojo lookups to work - super.setUp(); - } - - - @Test - public void testStreamsElasticsearchResourceGeneratorMojo() throws Exception { - - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/streams-plugin-elasticsearch" ); - - Verifier verifier; - - verifier = new Verifier( testDir.getAbsolutePath() ); - - List cliOptions = new ArrayList(); - cliOptions.add( "-N" ); - verifier.executeGoals( Lists.<String>newArrayList( - "clean", - "dependency:unpack-dependencies", - "generate-resources")); - - verifier.verifyErrorFreeLog(); - - verifier.resetStreams(); - - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ec0d0e7c/streams-plugins/streams-plugin-hbase/src/site/markdown/index.md ---------------------------------------------------------------------- diff --git a/streams-plugins/streams-plugin-hbase/src/site/markdown/index.md b/streams-plugins/streams-plugin-hbase/src/site/markdown/index.md index 0a0c308..5ac8ef3 100644 --- a/streams-plugins/streams-plugin-hbase/src/site/markdown/index.md +++ b/streams-plugins/streams-plugin-hbase/src/site/markdown/index.md @@ -13,7 +13,7 @@ Output will be placed in target/generated-resources/hbase by default Run within a module containing a src/main/jsonschema directory - mvn org.apache.streams.plugins:streams-plugin-hbase:0.3-incubating-SNAPSHOT:hbase + mvn org.apache.streams.plugins:streams-plugin-hbase:0.4-incubating:hbase ##### SDK http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ec0d0e7c/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorMojoIT.java ---------------------------------------------------------------------- diff --git a/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorMojoIT.java b/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorMojoIT.java new file mode 100644 index 0000000..6798b11 --- /dev/null +++ b/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorMojoIT.java @@ -0,0 +1,64 @@ +package org.apache.streams.plugins.test; + +import com.google.common.collect.Lists; +import com.google.common.io.Files; +import junit.framework.TestCase; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.util.ResourceExtractor; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import static org.apache.streams.plugins.test.StreamsHbaseResourceGeneratorTest.txtFilter; + +/** + * Tests that streams-plugin-hive running via maven generates hql resources + */ +public class StreamsHbaseResourceGeneratorMojoIT extends TestCase { + + private final static Logger LOGGER = LoggerFactory.getLogger(StreamsHbaseResourceGeneratorMojoIT.class); + + protected void setUp() throws Exception + { + // required for mojo lookups to work + super.setUp(); + } + + + @Test + public void testStreamsHbaseResourceGeneratorMojo() throws Exception { + + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/streams-plugin-hbase" ); + + Verifier verifier; + + verifier = new Verifier( testDir.getAbsolutePath() ); + + List cliOptions = new ArrayList(); + cliOptions.add( "-N" ); + verifier.executeGoals( Lists.<String>newArrayList( + "clean", + "dependency:unpack-dependencies", + "generate-resources")); + + verifier.verifyErrorFreeLog(); + + verifier.resetStreams(); + + File testOutput = new File(testDir.getAbsolutePath() + "/target/generated-resources/hbase-mojo"); + + assert( testOutput != null ); + assert( testOutput.exists() == true ); + assert( testOutput.isDirectory() == true ); + + Iterable<File> outputIterator = Files.fileTreeTraverser().breadthFirstTraversal(testOutput) + .filter(txtFilter); + Collection<File> outputCollection = Lists.newArrayList(outputIterator); + assert( outputCollection.size() == 133 ); + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ec0d0e7c/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorMojoTest.java ---------------------------------------------------------------------- diff --git a/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorMojoTest.java b/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorMojoTest.java deleted file mode 100644 index fc8c77a..0000000 --- a/streams-plugins/streams-plugin-hbase/src/test/java/org/apache/streams/plugins/test/StreamsHbaseResourceGeneratorMojoTest.java +++ /dev/null @@ -1,65 +0,0 @@ -package org.apache.streams.plugins.test; - -import com.google.common.collect.Lists; -import com.google.common.io.Files; -import junit.framework.TestCase; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.util.ResourceExtractor; -import org.junit.Ignore; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.File; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import static org.apache.streams.plugins.test.StreamsHbaseResourceGeneratorTest.txtFilter; - -/** - * Tests that streams-plugin-hive running via maven generates hql resources - */ -public class StreamsHbaseResourceGeneratorMojoTest extends TestCase { - - private final static Logger LOGGER = LoggerFactory.getLogger(StreamsHbaseResourceGeneratorMojoTest.class); - - protected void setUp() throws Exception - { - // required for mojo lookups to work - super.setUp(); - } - - - @Test - public void testStreamsHbaseResourceGeneratorMojo() throws Exception { - - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/streams-plugin-hbase" ); - - Verifier verifier; - - verifier = new Verifier( testDir.getAbsolutePath() ); - - List cliOptions = new ArrayList(); - cliOptions.add( "-N" ); - verifier.executeGoals( Lists.<String>newArrayList( - "clean", - "dependency:unpack-dependencies", - "generate-resources")); - - verifier.verifyErrorFreeLog(); - - verifier.resetStreams(); - - File testOutput = new File(testDir.getAbsolutePath() + "/target/generated-resources/hbase-mojo"); - - assert( testOutput != null ); - assert( testOutput.exists() == true ); - assert( testOutput.isDirectory() == true ); - - Iterable<File> outputIterator = Files.fileTreeTraverser().breadthFirstTraversal(testOutput) - .filter(txtFilter); - Collection<File> outputCollection = Lists.newArrayList(outputIterator); - assert( outputCollection.size() == 133 ); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ec0d0e7c/streams-plugins/streams-plugin-hive/src/site/markdown/index.md ---------------------------------------------------------------------- diff --git a/streams-plugins/streams-plugin-hive/src/site/markdown/index.md b/streams-plugins/streams-plugin-hive/src/site/markdown/index.md index 12ce831..5a873c3 100644 --- a/streams-plugins/streams-plugin-hive/src/site/markdown/index.md +++ b/streams-plugins/streams-plugin-hive/src/site/markdown/index.md @@ -11,7 +11,7 @@ Output will be placed in target/generated-resources/hive by default Run within a module containing a src/main/jsonschema directory - mvn org.apache.streams.plugins:streams-plugin-hive:0.3-incubating-SNAPSHOT:generate-resources + mvn org.apache.streams.plugins:streams-plugin-hive:0.4-incubating:generate-resources [streams-plugin-hive/pom.xml](streams-plugin-hive/pom.xml "streams-plugin-hive/pom.xml") http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ec0d0e7c/streams-plugins/streams-plugin-hive/src/test/java/org/apache/streams/plugins/test/StreamsHiveResourceGeneratorMojoIT.java ---------------------------------------------------------------------- diff --git a/streams-plugins/streams-plugin-hive/src/test/java/org/apache/streams/plugins/test/StreamsHiveResourceGeneratorMojoIT.java b/streams-plugins/streams-plugin-hive/src/test/java/org/apache/streams/plugins/test/StreamsHiveResourceGeneratorMojoIT.java new file mode 100644 index 0000000..0399d7e --- /dev/null +++ b/streams-plugins/streams-plugin-hive/src/test/java/org/apache/streams/plugins/test/StreamsHiveResourceGeneratorMojoIT.java @@ -0,0 +1,64 @@ +package org.apache.streams.plugins.test; + +import com.google.common.collect.Lists; +import com.google.common.io.Files; +import junit.framework.TestCase; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.util.ResourceExtractor; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import static org.apache.streams.plugins.test.StreamsHiveResourceGeneratorTest.hqlFilter; + +/** + * Tests that streams-plugin-hive running via maven generates hql resources + */ +public class StreamsHiveResourceGeneratorMojoIT extends TestCase { + + private final static Logger LOGGER = LoggerFactory.getLogger(StreamsHiveResourceGeneratorMojoIT.class); + + protected void setUp() throws Exception + { + // required for mojo lookups to work + super.setUp(); + } + + + @Test + public void testStreamsHiveResourceGeneratorMojo() throws Exception { + + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/streams-plugin-hive" ); + + Verifier verifier; + + verifier = new Verifier( testDir.getAbsolutePath() ); + + List cliOptions = new ArrayList(); + cliOptions.add( "-N" ); + verifier.executeGoals( Lists.<String>newArrayList( + "clean", + "dependency:unpack-dependencies", + "generate-resources")); + + verifier.verifyErrorFreeLog(); + + verifier.resetStreams(); + + File testOutput = new File(testDir.getAbsolutePath() + "/target/generated-resources/hive-mojo"); + + assert( testOutput != null ); + assert( testOutput.exists() == true ); + assert( testOutput.isDirectory() == true ); + + Iterable<File> outputIterator = Files.fileTreeTraverser().breadthFirstTraversal(testOutput) + .filter(hqlFilter); + Collection<File> outputCollection = Lists.newArrayList(outputIterator); + assert( outputCollection.size() == 133 ); + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ec0d0e7c/streams-plugins/streams-plugin-hive/src/test/java/org/apache/streams/plugins/test/StreamsHiveResourceGeneratorMojoTest.java ---------------------------------------------------------------------- diff --git a/streams-plugins/streams-plugin-hive/src/test/java/org/apache/streams/plugins/test/StreamsHiveResourceGeneratorMojoTest.java b/streams-plugins/streams-plugin-hive/src/test/java/org/apache/streams/plugins/test/StreamsHiveResourceGeneratorMojoTest.java deleted file mode 100644 index e2fbecc..0000000 --- a/streams-plugins/streams-plugin-hive/src/test/java/org/apache/streams/plugins/test/StreamsHiveResourceGeneratorMojoTest.java +++ /dev/null @@ -1,64 +0,0 @@ -package org.apache.streams.plugins.test; - -import com.google.common.collect.Lists; -import com.google.common.io.Files; -import junit.framework.TestCase; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.util.ResourceExtractor; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.File; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import static org.apache.streams.plugins.test.StreamsHiveResourceGeneratorTest.hqlFilter; - -/** - * Tests that streams-plugin-hive running via maven generates hql resources - */ -public class StreamsHiveResourceGeneratorMojoTest extends TestCase { - - private final static Logger LOGGER = LoggerFactory.getLogger(StreamsHiveResourceGeneratorMojoTest.class); - - protected void setUp() throws Exception - { - // required for mojo lookups to work - super.setUp(); - } - - - @Test - public void testStreamsHiveResourceGeneratorMojo() throws Exception { - - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/streams-plugin-hive" ); - - Verifier verifier; - - verifier = new Verifier( testDir.getAbsolutePath() ); - - List cliOptions = new ArrayList(); - cliOptions.add( "-N" ); - verifier.executeGoals( Lists.<String>newArrayList( - "clean", - "dependency:unpack-dependencies", - "generate-resources")); - - verifier.verifyErrorFreeLog(); - - verifier.resetStreams(); - - File testOutput = new File(testDir.getAbsolutePath() + "/target/generated-resources/hive-mojo"); - - assert( testOutput != null ); - assert( testOutput.exists() == true ); - assert( testOutput.isDirectory() == true ); - - Iterable<File> outputIterator = Files.fileTreeTraverser().breadthFirstTraversal(testOutput) - .filter(hqlFilter); - Collection<File> outputCollection = Lists.newArrayList(outputIterator); - assert( outputCollection.size() == 133 ); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ec0d0e7c/streams-plugins/streams-plugin-pig/src/site/markdown/index.md ---------------------------------------------------------------------- diff --git a/streams-plugins/streams-plugin-pig/src/site/markdown/index.md b/streams-plugins/streams-plugin-pig/src/site/markdown/index.md index 5ab4375..7157023 100644 --- a/streams-plugins/streams-plugin-pig/src/site/markdown/index.md +++ b/streams-plugins/streams-plugin-pig/src/site/markdown/index.md @@ -11,7 +11,7 @@ Output will be placed in target/generated-resources/pig by default Run within a module containing a src/main/jsonschema directory - mvn org.apache.streams.plugins:streams-plugin-pig:0.3-incubating-SNAPSHOT:pig + mvn org.apache.streams.plugins:streams-plugin-pig:0.4-incubating:pig [streams-plugin-pig/pom.xml](streams-plugin-pig/pom.xml "streams-plugin-pig/pom.xml") http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ec0d0e7c/streams-plugins/streams-plugin-pig/src/test/java/org/apache/streams/plugins/pig/test/StreamsPigResourceGeneratorMojoIT.java ---------------------------------------------------------------------- diff --git a/streams-plugins/streams-plugin-pig/src/test/java/org/apache/streams/plugins/pig/test/StreamsPigResourceGeneratorMojoIT.java b/streams-plugins/streams-plugin-pig/src/test/java/org/apache/streams/plugins/pig/test/StreamsPigResourceGeneratorMojoIT.java new file mode 100644 index 0000000..9d5d827 --- /dev/null +++ b/streams-plugins/streams-plugin-pig/src/test/java/org/apache/streams/plugins/pig/test/StreamsPigResourceGeneratorMojoIT.java @@ -0,0 +1,64 @@ +package org.apache.streams.plugins.pig.test; + +import com.google.common.collect.Lists; +import com.google.common.io.Files; +import junit.framework.TestCase; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.util.ResourceExtractor; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import static org.apache.streams.plugins.pig.test.StreamsPigResourceGeneratorTest.pigFilter; + +/** + * Tests that streams-plugin-hive running via maven generates hql resources + */ +public class StreamsPigResourceGeneratorMojoIT extends TestCase { + + private final static Logger LOGGER = LoggerFactory.getLogger(StreamsPigResourceGeneratorMojoIT.class); + + protected void setUp() throws Exception + { + // required for mojo lookups to work + super.setUp(); + } + + + @Test + public void testStreamsPigResourceGeneratorMojo() throws Exception { + + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/streams-plugin-pig" ); + + Verifier verifier; + + verifier = new Verifier( testDir.getAbsolutePath() ); + + List cliOptions = new ArrayList(); + cliOptions.add( "-N" ); + verifier.executeGoals( Lists.<String>newArrayList( + "clean", + "dependency:unpack-dependencies", + "generate-resources")); + + verifier.verifyErrorFreeLog(); + + verifier.resetStreams(); + + File testOutput = new File(testDir.getAbsolutePath() + "/target/generated-resources/pig-mojo"); + + assert( testOutput != null ); + assert( testOutput.exists() == true ); + assert( testOutput.isDirectory() == true ); + + Iterable<File> outputIterator = Files.fileTreeTraverser().breadthFirstTraversal(testOutput) + .filter(pigFilter); + Collection<File> outputCollection = Lists.newArrayList(outputIterator); + assert( outputCollection.size() == 133 ); + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ec0d0e7c/streams-plugins/streams-plugin-pig/src/test/java/org/apache/streams/plugins/pig/test/StreamsPigResourceGeneratorMojoTest.java ---------------------------------------------------------------------- diff --git a/streams-plugins/streams-plugin-pig/src/test/java/org/apache/streams/plugins/pig/test/StreamsPigResourceGeneratorMojoTest.java b/streams-plugins/streams-plugin-pig/src/test/java/org/apache/streams/plugins/pig/test/StreamsPigResourceGeneratorMojoTest.java deleted file mode 100644 index 76c4eb2..0000000 --- a/streams-plugins/streams-plugin-pig/src/test/java/org/apache/streams/plugins/pig/test/StreamsPigResourceGeneratorMojoTest.java +++ /dev/null @@ -1,64 +0,0 @@ -package org.apache.streams.plugins.pig.test; - -import com.google.common.collect.Lists; -import com.google.common.io.Files; -import junit.framework.TestCase; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.util.ResourceExtractor; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.File; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import static org.apache.streams.plugins.pig.test.StreamsPigResourceGeneratorTest.pigFilter; - -/** - * Tests that streams-plugin-hive running via maven generates hql resources - */ -public class StreamsPigResourceGeneratorMojoTest extends TestCase { - - private final static Logger LOGGER = LoggerFactory.getLogger(StreamsPigResourceGeneratorMojoTest.class); - - protected void setUp() throws Exception - { - // required for mojo lookups to work - super.setUp(); - } - - - @Test - public void testStreamsPigResourceGeneratorMojo() throws Exception { - - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/streams-plugin-pig" ); - - Verifier verifier; - - verifier = new Verifier( testDir.getAbsolutePath() ); - - List cliOptions = new ArrayList(); - cliOptions.add( "-N" ); - verifier.executeGoals( Lists.<String>newArrayList( - "clean", - "dependency:unpack-dependencies", - "generate-resources")); - - verifier.verifyErrorFreeLog(); - - verifier.resetStreams(); - - File testOutput = new File(testDir.getAbsolutePath() + "/target/generated-resources/pig-mojo"); - - assert( testOutput != null ); - assert( testOutput.exists() == true ); - assert( testOutput.isDirectory() == true ); - - Iterable<File> outputIterator = Files.fileTreeTraverser().breadthFirstTraversal(testOutput) - .filter(pigFilter); - Collection<File> outputCollection = Lists.newArrayList(outputIterator); - assert( outputCollection.size() == 133 ); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ec0d0e7c/streams-plugins/streams-plugin-pojo/src/site/markdown/index.md ---------------------------------------------------------------------- diff --git a/streams-plugins/streams-plugin-pojo/src/site/markdown/index.md b/streams-plugins/streams-plugin-pojo/src/site/markdown/index.md index 996fa86..514a693 100644 --- a/streams-plugins/streams-plugin-pojo/src/site/markdown/index.md +++ b/streams-plugins/streams-plugin-pojo/src/site/markdown/index.md @@ -11,7 +11,7 @@ Output will be placed in target/generated-sources/pojo by default Run within a module containing a src/main/jsonschema directory - mvn org.apache.streams.plugins:streams-plugin-pojo:0.3-incubating-SNAPSHOT:pojo + mvn org.apache.streams.plugins:streams-plugin-pojo:0.4-incubating:pojo [streams-plugin-pojo/pom.xml](streams-plugin-pojo/pom.xml "streams-plugin-pojo/pom.xml") http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ec0d0e7c/streams-plugins/streams-plugin-pojo/src/test/java/org/apache/streams/plugins/test/StreamsPojoSourceGeneratorMojoIT.java ---------------------------------------------------------------------- diff --git a/streams-plugins/streams-plugin-pojo/src/test/java/org/apache/streams/plugins/test/StreamsPojoSourceGeneratorMojoIT.java b/streams-plugins/streams-plugin-pojo/src/test/java/org/apache/streams/plugins/test/StreamsPojoSourceGeneratorMojoIT.java new file mode 100644 index 0000000..258bae5 --- /dev/null +++ b/streams-plugins/streams-plugin-pojo/src/test/java/org/apache/streams/plugins/test/StreamsPojoSourceGeneratorMojoIT.java @@ -0,0 +1,67 @@ +package org.apache.streams.plugins.test; + +import com.google.common.collect.Lists; +import com.google.common.io.Files; +import junit.framework.TestCase; +import org.apache.maven.it.Verifier; +import org.apache.maven.it.util.ResourceExtractor; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import static org.apache.streams.plugins.test.StreamsPojoSourceGeneratorTest.javaFilter; + +/** + * Tests that streams-plugin-pojo running via maven can convert activity schemas into pojos + * which then compile. + */ +public class StreamsPojoSourceGeneratorMojoIT extends TestCase { + + private final static Logger LOGGER = LoggerFactory.getLogger(StreamsPojoSourceGeneratorMojoIT.class); + + protected void setUp() throws Exception + { + // required for mojo lookups to work + super.setUp(); + } + + + @Test + public void testStreamsPojoSourceGeneratorMojo() throws Exception { + + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/streams-plugin-pojo" ); + + Verifier verifier; + + verifier = new Verifier( testDir.getAbsolutePath() ); + + List cliOptions = new ArrayList(); + cliOptions.add( "-N" ); + verifier.executeGoals( Lists.<String>newArrayList( + "clean", + "dependency:unpack-dependencies", + "generate-sources", + "compile")); + + verifier.verifyErrorFreeLog(); + + verifier.resetStreams(); + + File testOutput = new File(testDir.getAbsolutePath() + "/target/generated-sources/pojo-mojo"); + + assert( testOutput != null ); + assert( testOutput.exists() == true ); + assert( testOutput.isDirectory() == true ); + + Iterable<File> outputIterator = Files.fileTreeTraverser().breadthFirstTraversal(testOutput) + .filter(javaFilter); + Collection<File> outputCollection = Lists.newArrayList(outputIterator); + assert( outputCollection.size() > 133 ); + + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ec0d0e7c/streams-plugins/streams-plugin-pojo/src/test/java/org/apache/streams/plugins/test/StreamsPojoSourceGeneratorMojoTest.java ---------------------------------------------------------------------- diff --git a/streams-plugins/streams-plugin-pojo/src/test/java/org/apache/streams/plugins/test/StreamsPojoSourceGeneratorMojoTest.java b/streams-plugins/streams-plugin-pojo/src/test/java/org/apache/streams/plugins/test/StreamsPojoSourceGeneratorMojoTest.java deleted file mode 100644 index 41d762d..0000000 --- a/streams-plugins/streams-plugin-pojo/src/test/java/org/apache/streams/plugins/test/StreamsPojoSourceGeneratorMojoTest.java +++ /dev/null @@ -1,68 +0,0 @@ -package org.apache.streams.plugins.test; - -import com.google.common.collect.Lists; -import com.google.common.io.Files; -import junit.framework.TestCase; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.util.ResourceExtractor; -import org.junit.Ignore; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.File; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import static org.apache.streams.plugins.test.StreamsPojoSourceGeneratorTest.javaFilter; - -/** - * Tests that streams-plugin-pojo running via maven can convert activity schemas into pojos - * which then compile. - */ -public class StreamsPojoSourceGeneratorMojoTest extends TestCase { - - private final static Logger LOGGER = LoggerFactory.getLogger(StreamsPojoSourceGeneratorMojoTest.class); - - protected void setUp() throws Exception - { - // required for mojo lookups to work - super.setUp(); - } - - - @Test - public void testStreamsPojoSourceGeneratorMojo() throws Exception { - - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/streams-plugin-pojo" ); - - Verifier verifier; - - verifier = new Verifier( testDir.getAbsolutePath() ); - - List cliOptions = new ArrayList(); - cliOptions.add( "-N" ); - verifier.executeGoals( Lists.<String>newArrayList( - "clean", - "dependency:unpack-dependencies", - "generate-sources", - "compile")); - - verifier.verifyErrorFreeLog(); - - verifier.resetStreams(); - - File testOutput = new File(testDir.getAbsolutePath() + "/target/generated-sources/pojo-mojo"); - - assert( testOutput != null ); - assert( testOutput.exists() == true ); - assert( testOutput.isDirectory() == true ); - - Iterable<File> outputIterator = Files.fileTreeTraverser().breadthFirstTraversal(testOutput) - .filter(javaFilter); - Collection<File> outputCollection = Lists.newArrayList(outputIterator); - assert( outputCollection.size() > 133 ); - - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/ec0d0e7c/streams-plugins/streams-plugin-scala/src/site/markdown/index.md ---------------------------------------------------------------------- diff --git a/streams-plugins/streams-plugin-scala/src/site/markdown/index.md b/streams-plugins/streams-plugin-scala/src/site/markdown/index.md index 34f94f5..76b142f 100644 --- a/streams-plugins/streams-plugin-scala/src/site/markdown/index.md +++ b/streams-plugins/streams-plugin-scala/src/site/markdown/index.md @@ -9,7 +9,7 @@ streams-plugin-scala generates source files from json schemas suitable for writi Run within a module containing a src/main/jsonschema directory - mvn org.apache.streams.plugins:streams-plugin-scala:0.3-incubating-SNAPSHOT:pig + mvn org.apache.streams.plugins:streams-plugin-scala:0.4-incubating:pig [streams-plugin-scala/pom.xml](streams-plugin-scala/pom.xml "streams-plugin-scala/pom.xml")