RYA-377 Fixing broken integration tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/cf433607 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/cf433607 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/cf433607 Branch: refs/heads/master Commit: cf4336073a3365d2407a43ed779aa135bdc48091 Parents: 9e02a54 Author: kchilton2 <kevin.e.chil...@gmail.com> Authored: Wed Dec 6 16:24:11 2017 -0500 Committer: caleb <caleb.me...@parsons.com> Committed: Tue Jan 9 15:13:01 2018 -0500 ---------------------------------------------------------------------- .../rya/streams/client/command/RunQueryCommandIT.java | 3 ++- .../apache/rya/streams/kafka/RyaStreamsTestUtil.java | 4 +--- .../kafka/processors/StatementPatternProcessorIT.java | 8 ++++---- .../aggregation/AggregationProcessorIT.java | 14 +++++++------- .../kafka/processors/filter/FilterProcessorIT.java | 2 +- .../streams/kafka/processors/filter/GeoFilterIT.java | 2 +- .../kafka/processors/filter/TemporalFilterIT.java | 10 +++++----- .../kafka/processors/join/JoinProcessorIT.java | 10 +++++----- .../projection/MultiProjectionProcessorIT.java | 2 +- .../processors/projection/ProjectionProcessorIT.java | 2 +- 10 files changed, 28 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/cf433607/extras/rya.streams/client/src/test/java/org/apache/rya/streams/client/command/RunQueryCommandIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/client/src/test/java/org/apache/rya/streams/client/command/RunQueryCommandIT.java b/extras/rya.streams/client/src/test/java/org/apache/rya/streams/client/command/RunQueryCommandIT.java index 788b41f..f2100e8 100644 --- a/extras/rya.streams/client/src/test/java/org/apache/rya/streams/client/command/RunQueryCommandIT.java +++ b/extras/rya.streams/client/src/test/java/org/apache/rya/streams/client/command/RunQueryCommandIT.java @@ -102,7 +102,8 @@ public class RunQueryCommandIT { "--ryaInstance", "" + ryaInstance, "--kafkaHostname", kafka.getKafkaHostname(), "--kafkaPort", kafka.getKafkaPort(), - "--queryID", UUID.randomUUID().toString() + "--queryID", UUID.randomUUID().toString(), + "--zookeepers", kafka.getZookeeperServers() }; // Run the test. This will throw an exception. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/cf433607/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/RyaStreamsTestUtil.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/RyaStreamsTestUtil.java b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/RyaStreamsTestUtil.java index b7e2be2..ee25f8c 100644 --- a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/RyaStreamsTestUtil.java +++ b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/RyaStreamsTestUtil.java @@ -60,7 +60,6 @@ public class RyaStreamsTestUtil { * @param statementsTopic - The topic statements will be written to. (not null) * @param resultsTopic - The topic results will be read from. (not null) * @param builder - The streams topology that will be executed. (not null) - * @param startupMs - How long to wait for the topology to start before writing the statements. * @param statements - The statements that will be loaded into the topic. (not null) * @param expected - The expected results. (not null) * @param expectedDeserializerClass - The class of the deserializer that will be used when reading @@ -72,7 +71,6 @@ public class RyaStreamsTestUtil { final String statementsTopic, final String resultsTopic, final TopologyBuilder builder, - final int startupMs, final List<VisibilityStatement> statements, final Set<T> expected, final Class<? extends Deserializer<T>> expectedDeserializerClass) throws Exception { @@ -98,7 +96,7 @@ public class RyaStreamsTestUtil { streams.start(); // Wait for the streams application to start. Streams only see data after their consumers are connected. - Thread.sleep(startupMs); + Thread.sleep(6000); // Load the statements into the input topic. try(Producer<String, VisibilityStatement> producer = KafkaTestUtil.makeProducer( http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/cf433607/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/StatementPatternProcessorIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/StatementPatternProcessorIT.java b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/StatementPatternProcessorIT.java index 80b6e42..33dc945 100644 --- a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/StatementPatternProcessorIT.java +++ b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/StatementPatternProcessorIT.java @@ -75,7 +75,7 @@ public class StatementPatternProcessorIT { expected.add( new VisibilityBindingSet(bs, "a") ); // Run the test. - RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, 2000, statements, expected, VisibilityBindingSetDeserializer.class); + RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, statements, expected, VisibilityBindingSetDeserializer.class); } @Test @@ -113,7 +113,7 @@ public class StatementPatternProcessorIT { expected.add( new VisibilityBindingSet(bs, "a|b") ); // Run the test. - RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, 2000, statements, expected, VisibilityBindingSetDeserializer.class); + RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, statements, expected, VisibilityBindingSetDeserializer.class); } @Test @@ -147,7 +147,7 @@ public class StatementPatternProcessorIT { expected.add( new VisibilityBindingSet(bs, "a") ); // Run the test. - RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, 2000, statements, expected, VisibilityBindingSetDeserializer.class); + RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, statements, expected, VisibilityBindingSetDeserializer.class); } @Test @@ -190,6 +190,6 @@ public class StatementPatternProcessorIT { expected.add(new VisibilityBindingSet(bs, "a")); // Run the test. - RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, 2000, statements, expected, VisibilityBindingSetDeserializer.class); + RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, statements, expected, VisibilityBindingSetDeserializer.class); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/cf433607/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/aggregation/AggregationProcessorIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/aggregation/AggregationProcessorIT.java b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/aggregation/AggregationProcessorIT.java index ccf5c0c..072469a 100644 --- a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/aggregation/AggregationProcessorIT.java +++ b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/aggregation/AggregationProcessorIT.java @@ -95,7 +95,7 @@ public class AggregationProcessorIT { final TopologyBuilder builder = new TopologyFactory().build(sparql, statementsTopic, resultsTopic, new RandomUUIDFactory()); // Run the test. - RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, 2000, statements, expected, VisibilityBindingSetDeserializer.class); + RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, statements, expected, VisibilityBindingSetDeserializer.class); } @Test @@ -142,7 +142,7 @@ public class AggregationProcessorIT { final TopologyBuilder builder = new TopologyFactory().build(sparql, statementsTopic, resultsTopic, new RandomUUIDFactory()); // Run the test. - RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, 2000, statements, expected, VisibilityBindingSetDeserializer.class); + RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, statements, expected, VisibilityBindingSetDeserializer.class); } @Test @@ -188,7 +188,7 @@ public class AggregationProcessorIT { final TopologyBuilder builder = new TopologyFactory().build(sparql, statementsTopic, resultsTopic, new RandomUUIDFactory()); // Run the test. - RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, 2000, statements, expected, VisibilityBindingSetDeserializer.class); + RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, statements, expected, VisibilityBindingSetDeserializer.class); } @Test @@ -238,7 +238,7 @@ public class AggregationProcessorIT { final TopologyBuilder builder = new TopologyFactory().build(sparql, statementsTopic, resultsTopic, new RandomUUIDFactory()); // Run the test. - RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, 2000, statements, expected, VisibilityBindingSetDeserializer.class); + RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, statements, expected, VisibilityBindingSetDeserializer.class); } @Test @@ -288,7 +288,7 @@ public class AggregationProcessorIT { final TopologyBuilder builder = new TopologyFactory().build(sparql, statementsTopic, resultsTopic, new RandomUUIDFactory()); // Run the test. - RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, 2000, statements, expected, VisibilityBindingSetDeserializer.class); + RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, statements, expected, VisibilityBindingSetDeserializer.class); } @Test @@ -389,7 +389,7 @@ public class AggregationProcessorIT { final TopologyBuilder builder = new TopologyFactory().build(sparql, statementsTopic, resultsTopic, new RandomUUIDFactory()); // Run the test. - RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, 4000, statements, expected, VisibilityBindingSetDeserializer.class); + RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, statements, expected, VisibilityBindingSetDeserializer.class); } @Test @@ -452,6 +452,6 @@ public class AggregationProcessorIT { final TopologyBuilder builder = new TopologyFactory().build(sparql, statementsTopic, resultsTopic, new RandomUUIDFactory()); // Run the test. - RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, 2000, statements, expected, VisibilityBindingSetDeserializer.class); + RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, statements, expected, VisibilityBindingSetDeserializer.class); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/cf433607/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/filter/FilterProcessorIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/filter/FilterProcessorIT.java b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/filter/FilterProcessorIT.java index fb5305f..aaa67ea 100644 --- a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/filter/FilterProcessorIT.java +++ b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/filter/FilterProcessorIT.java @@ -81,6 +81,6 @@ public class FilterProcessorIT { expected.add( new VisibilityBindingSet(bs, "a") ); // Run the test. - RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, 2000, statements, expected, VisibilityBindingSetDeserializer.class); + RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, statements, expected, VisibilityBindingSetDeserializer.class); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/cf433607/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/filter/GeoFilterIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/filter/GeoFilterIT.java b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/filter/GeoFilterIT.java index 642ecbc..c090afa 100644 --- a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/filter/GeoFilterIT.java +++ b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/filter/GeoFilterIT.java @@ -115,7 +115,7 @@ public class GeoFilterIT { expected.add( new VisibilityBindingSet(bs, "a") ); // Run the test. - RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, 2000, statements, expected, VisibilityBindingSetDeserializer.class); + RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, statements, expected, VisibilityBindingSetDeserializer.class); } private List<VisibilityStatement> getStatements() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/cf433607/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/filter/TemporalFilterIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/filter/TemporalFilterIT.java b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/filter/TemporalFilterIT.java index cac9559..0a2185d 100644 --- a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/filter/TemporalFilterIT.java +++ b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/filter/TemporalFilterIT.java @@ -109,9 +109,9 @@ public class TemporalFilterIT { expected.add( new VisibilityBindingSet(bs, "a") ); // Run the test. - RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, 2000, statements, expected, VisibilityBindingSetDeserializer.class); + RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, statements, expected, VisibilityBindingSetDeserializer.class); } - + @Test public void showBeforeWorks() throws Exception { // Enumerate some topics that will be re-used @@ -143,9 +143,9 @@ public class TemporalFilterIT { expected.add( new VisibilityBindingSet(bs, "a") ); // Run the test. - RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, 2000, statements, expected, VisibilityBindingSetDeserializer.class); + RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, statements, expected, VisibilityBindingSetDeserializer.class); } - + @Test public void showAfterWorks() throws Exception { // Enumerate some topics that will be re-used @@ -177,7 +177,7 @@ public class TemporalFilterIT { expected.add( new VisibilityBindingSet(bs, "a") ); // Run the test. - RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, 2000, statements, expected, VisibilityBindingSetDeserializer.class); + RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, statements, expected, VisibilityBindingSetDeserializer.class); } private List<VisibilityStatement> getStatements() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/cf433607/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/join/JoinProcessorIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/join/JoinProcessorIT.java b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/join/JoinProcessorIT.java index 51bb0ae..bdb9be6 100644 --- a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/join/JoinProcessorIT.java +++ b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/join/JoinProcessorIT.java @@ -111,7 +111,7 @@ public class JoinProcessorIT { expected.add( new VisibilityBindingSet(bs, "c&(b|c)") ); // Run the test. - RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, 2000, statements, expected, VisibilityBindingSetDeserializer.class); + RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, statements, expected, VisibilityBindingSetDeserializer.class); } @Test @@ -162,7 +162,7 @@ public class JoinProcessorIT { expected.add( new VisibilityBindingSet(bs, "c&(b|c)") ); // Run the test. - RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, 2000, statements, expected, VisibilityBindingSetDeserializer.class); + RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, statements, expected, VisibilityBindingSetDeserializer.class); } @Test @@ -219,7 +219,7 @@ public class JoinProcessorIT { expected.add( new VisibilityBindingSet(bs, "a&c") ); // Run the test. - RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, 2000, statements, expected, VisibilityBindingSetDeserializer.class); + RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, statements, expected, VisibilityBindingSetDeserializer.class); } @Test @@ -260,7 +260,7 @@ public class JoinProcessorIT { expected.add( new VisibilityBindingSet(bs, "a") ); // Run the test. - RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, 3000, statements, expected, VisibilityBindingSetDeserializer.class); + RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, statements, expected, VisibilityBindingSetDeserializer.class); } @Test @@ -311,6 +311,6 @@ public class JoinProcessorIT { expected.add( new VisibilityBindingSet(bs, "c") ); // Run the test. - RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, 2000, statements, expected, VisibilityBindingSetDeserializer.class); + RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, statements, expected, VisibilityBindingSetDeserializer.class); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/cf433607/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/projection/MultiProjectionProcessorIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/projection/MultiProjectionProcessorIT.java b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/projection/MultiProjectionProcessorIT.java index c96919c..a8de401 100644 --- a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/projection/MultiProjectionProcessorIT.java +++ b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/projection/MultiProjectionProcessorIT.java @@ -87,6 +87,6 @@ public class MultiProjectionProcessorIT { expected.add(new VisibilityStatement(vf.createStatement(blankNode, vf.createURI("urn:location"), vf.createURI("urn:corner1")), "a")); // Run the test. - RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, 2000, statements, expected, VisibilityStatementDeserializer.class); + RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, statements, expected, VisibilityStatementDeserializer.class); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/cf433607/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/projection/ProjectionProcessorIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/projection/ProjectionProcessorIT.java b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/projection/ProjectionProcessorIT.java index 63c2cc7..2af3a49 100644 --- a/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/projection/ProjectionProcessorIT.java +++ b/extras/rya.streams/kafka/src/test/java/org/apache/rya/streams/kafka/processors/projection/ProjectionProcessorIT.java @@ -80,6 +80,6 @@ public class ProjectionProcessorIT { expectedBs.addBinding("otherPerson", vf.createURI("urn:Bob")); expected.add(new VisibilityBindingSet(expectedBs, "a")); - RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, 2000, statements, Sets.newHashSet(expected), VisibilityBindingSetDeserializer.class); + RyaStreamsTestUtil.runStreamProcessingTest(kafka, statementsTopic, resultsTopic, builder, statements, Sets.newHashSet(expected), VisibilityBindingSetDeserializer.class); } } \ No newline at end of file