Addressed review comments
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b182dc6a Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b182dc6a Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b182dc6a Branch: refs/heads/master Commit: b182dc6a76abf1a1208bf7df861bf5316468ed7c Parents: 54f0bf2 Author: Robert (Bobby) Evans <[email protected]> Authored: Wed Sep 20 16:06:09 2017 -0500 Committer: Robert (Bobby) Evans <[email protected]> Committed: Wed Sep 20 16:06:09 2017 -0500 ---------------------------------------------------------------------- .../java/org/apache/storm/TickTupleTest.java | 26 ++++++-------------- 1 file changed, 8 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/b182dc6a/storm-server/src/test/java/org/apache/storm/TickTupleTest.java ---------------------------------------------------------------------- diff --git a/storm-server/src/test/java/org/apache/storm/TickTupleTest.java b/storm-server/src/test/java/org/apache/storm/TickTupleTest.java index daa706b..65d2529 100644 --- a/storm-server/src/test/java/org/apache/storm/TickTupleTest.java +++ b/storm-server/src/test/java/org/apache/storm/TickTupleTest.java @@ -53,7 +53,7 @@ public class TickTupleTest { Config topoConf = new Config(); topoConf.put(Config.TOPOLOGY_TICK_TUPLE_FREQ_SECS, 1); try (ILocalTopology topo = cluster.submitTopology("test", topoConf, topology)) { - //Give the cluster some time to come up + //Give the topology some time to come up long time = 0; while (tickTupleTimes.size() <= 0) { assert time <= 100_000 : "took over " + time + " ms of simulated time to get a message back..."; @@ -61,21 +61,11 @@ public class TickTupleTest { time += 10_000; } tickTupleTimes.clear(); - cluster.advanceClusterTime(1); - time += 1000; - assertEquals(time, tickTupleTimes.poll(100, TimeUnit.MILLISECONDS).longValue()); - cluster.advanceClusterTime(1); - time += 1000; - assertEquals(time, tickTupleTimes.poll(100, TimeUnit.MILLISECONDS).longValue()); - cluster.advanceClusterTime(1); - time += 1000; - assertEquals(time, tickTupleTimes.poll(100, TimeUnit.MILLISECONDS).longValue()); - cluster.advanceClusterTime(1); - time += 1000; - assertEquals(time, tickTupleTimes.poll(100, TimeUnit.MILLISECONDS).longValue()); - cluster.advanceClusterTime(1); - time += 1000; - assertEquals(time, tickTupleTimes.poll(100, TimeUnit.MILLISECONDS).longValue()); + for (int i = 0; i < 5; i++) { + cluster.advanceClusterTime(1); + time += 1_000; + assertEquals("Iteration " + i, (Long)time, tickTupleTimes.poll(100, TimeUnit.MILLISECONDS)); + } } assertNull("The bolt got a tuple that is not a tick tuple " + nonTickTuple.get(), nonTickTuple.get()); } @@ -123,8 +113,8 @@ public class TickTupleTest { private StormTopology createNoOpTopology() { TopologyBuilder builder = new TopologyBuilder(); - builder.setSpout("1", new NoopSpout()); - builder.setBolt("2", new NoopBolt()).fieldsGrouping("1", new Fields("tuple")); + builder.setSpout("Spout", new NoopSpout()); + builder.setBolt("Bolt", new NoopBolt()).fieldsGrouping("Spout", new Fields("tuple")); return builder.createTopology(); } }
