Fixed the tests in storm-starter that do not use the actual TupleImpl but mock everything themselves
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/71bd4a43 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/71bd4a43 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/71bd4a43 Branch: refs/heads/master Commit: 71bd4a435b882120f7542fcae678a52e20600539 Parents: cd47f1d Author: Niels Basjes <[email protected]> Authored: Tue Dec 9 13:53:05 2014 +0100 Committer: Niels Basjes <[email protected]> Committed: Tue Dec 9 13:53:05 2014 +0100 ---------------------------------------------------------------------- .../test/jvm/storm/starter/tools/MockTupleHelpers.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/71bd4a43/examples/storm-starter/test/jvm/storm/starter/tools/MockTupleHelpers.java ---------------------------------------------------------------------- diff --git a/examples/storm-starter/test/jvm/storm/starter/tools/MockTupleHelpers.java b/examples/storm-starter/test/jvm/storm/starter/tools/MockTupleHelpers.java index b253350..3180fd3 100644 --- a/examples/storm-starter/test/jvm/storm/starter/tools/MockTupleHelpers.java +++ b/examples/storm-starter/test/jvm/storm/starter/tools/MockTupleHelpers.java @@ -19,6 +19,7 @@ package storm.starter.tools; import backtype.storm.Constants; import backtype.storm.tuple.Tuple; +import backtype.storm.tuple.TupleImpl; import static org.mockito.Mockito.*; @@ -28,13 +29,22 @@ public final class MockTupleHelpers { } public static Tuple mockTickTuple() { - return mockTuple(Constants.SYSTEM_COMPONENT_ID, Constants.SYSTEM_TICK_STREAM_ID); + Tuple tuple = mockTuple(Constants.SYSTEM_COMPONENT_ID, Constants.SYSTEM_TICK_STREAM_ID); + when(tuple.isTick()).thenReturn(true); + return tuple; } public static Tuple mockTuple(String componentId, String streamId) { Tuple tuple = mock(Tuple.class); when(tuple.getSourceComponent()).thenReturn(componentId); when(tuple.getSourceStreamId()).thenReturn(streamId); + when(tuple.isTick()).thenReturn(isTick(componentId, streamId)); return tuple; } + + private static boolean isTick(String componentId, String streamId) { + return componentId.equals(Constants.SYSTEM_COMPONENT_ID) && + streamId.equals(Constants.SYSTEM_TICK_STREAM_ID); + } + }
