RYA-377 Fixing flakey integration test.
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/f3655213 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/f3655213 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/f3655213 Branch: refs/heads/master Commit: f3655213cf4a9f2c36e5de31a2570fe0579415f5 Parents: acd7654 Author: kchilton2 <[email protected]> Authored: Thu Jan 4 18:35:58 2018 -0500 Committer: caleb <[email protected]> Committed: Tue Jan 9 15:13:02 2018 -0500 ---------------------------------------------------------------------- .../aggregation/AggregationProcessorIT.java | 13 --------- .../src/test/resources/log4j.properties | 29 ++++++++++++++++++++ .../rya/streams/kafka/RyaStreamsTestUtil.java | 5 +++- 3 files changed, 33 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/f3655213/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/aggregation/AggregationProcessorIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/aggregation/AggregationProcessorIT.java b/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/aggregation/AggregationProcessorIT.java index 072469a..866fc2b 100644 --- a/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/aggregation/AggregationProcessorIT.java +++ b/extras/rya.streams/integration/src/test/java/org/apache/rya/streams/kafka/processors/aggregation/AggregationProcessorIT.java @@ -332,13 +332,6 @@ public class AggregationProcessorIT { vf.createStatement(vf.createURI("urn:timecard3"), vf.createURI("urn:hours"), vf.createLiteral(28)), "")); statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:TacoJoint"), vf.createURI("urn:hasTimecardId"), vf.createURI("urn:timecard4")), "")); - statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:Bob"), vf.createURI("urn:hasTimecardId"), vf.createURI("urn:timecard4")), "")); - statements.add(new VisibilityStatement( - vf.createStatement(vf.createURI("urn:timecard4"), vf.createURI("urn:hours"), vf.createLiteral(28)), "")); - - statements.add(new VisibilityStatement( vf.createStatement(vf.createURI("urn:Alice"), vf.createURI("urn:worksAt"), vf.createURI("urn:CoffeeShop")), "")); statements.add(new VisibilityStatement( vf.createStatement(vf.createURI("urn:CoffeeShop"), vf.createURI("urn:hasTimecardId"), vf.createURI("urn:timecard5")), "")); @@ -368,12 +361,6 @@ public class AggregationProcessorIT { expected.add(new VisibilityBindingSet(bs, "")); bs = new MapBindingSet(); - bs.addBinding("business", vf.createURI("urn:TacoJoint")); - bs.addBinding("employee", vf.createURI("urn:Bob")); - bs.addBinding("totalHours", vf.createLiteral("56", XMLSchema.INTEGER)); - expected.add(new VisibilityBindingSet(bs, "")); - - bs = new MapBindingSet(); bs.addBinding("business", vf.createURI("urn:CoffeeShop")); bs.addBinding("employee", vf.createURI("urn:Alice")); bs.addBinding("totalHours", vf.createLiteral("12", XMLSchema.INTEGER)); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/f3655213/extras/rya.streams/integration/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/extras/rya.streams/integration/src/test/resources/log4j.properties b/extras/rya.streams/integration/src/test/resources/log4j.properties new file mode 100644 index 0000000..0bf0bcf --- /dev/null +++ b/extras/rya.streams/integration/src/test/resources/log4j.properties @@ -0,0 +1,29 @@ +# +# 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 +# with the License. You may obtain a copy of the License at +# +# 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. +# + +# Root logger option +log4j.rootLogger=INFO, stdout + +# Direct log messages to stdout +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.Target=System.out +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n + +log4j.logger.org.apache.rya.streams.kafka.processors=debug http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/f3655213/extras/rya.streams/kafka-test/src/main/java/org/apache/rya/streams/kafka/RyaStreamsTestUtil.java ---------------------------------------------------------------------- diff --git a/extras/rya.streams/kafka-test/src/main/java/org/apache/rya/streams/kafka/RyaStreamsTestUtil.java b/extras/rya.streams/kafka-test/src/main/java/org/apache/rya/streams/kafka/RyaStreamsTestUtil.java index ee25f8c..65ad840 100644 --- a/extras/rya.streams/kafka-test/src/main/java/org/apache/rya/streams/kafka/RyaStreamsTestUtil.java +++ b/extras/rya.streams/kafka-test/src/main/java/org/apache/rya/streams/kafka/RyaStreamsTestUtil.java @@ -25,8 +25,10 @@ import java.util.Arrays; import java.util.List; import java.util.Properties; import java.util.Set; +import java.util.UUID; import org.apache.kafka.clients.consumer.Consumer; +import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.Producer; import org.apache.kafka.common.serialization.Deserializer; import org.apache.kafka.common.serialization.StringDeserializer; @@ -88,7 +90,8 @@ public class RyaStreamsTestUtil { // Start the streams program. final Properties props = kafka.createBootstrapServerConfig(); - props.put(StreamsConfig.APPLICATION_ID_CONFIG, "StatementPatternProcessorIT"); + props.put(StreamsConfig.APPLICATION_ID_CONFIG, UUID.randomUUID().toString()); + props.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest"); final KafkaStreams streams = new KafkaStreams(builder, new StreamsConfig(props)); streams.cleanUp();
