Repository: metron Updated Branches: refs/heads/master 1f9a79164 -> 073d6b50d
http://git-wip-us.apache.org/repos/asf/metron/blob/073d6b50/metron-analytics/metron-profiler/src/test/java/org/apache/metron/profiler/bolt/ProfileBuilderBoltTest.java ---------------------------------------------------------------------- diff --git a/metron-analytics/metron-profiler/src/test/java/org/apache/metron/profiler/bolt/ProfileBuilderBoltTest.java b/metron-analytics/metron-profiler/src/test/java/org/apache/metron/profiler/bolt/ProfileBuilderBoltTest.java index 1d66905..62be86e 100644 --- a/metron-analytics/metron-profiler/src/test/java/org/apache/metron/profiler/bolt/ProfileBuilderBoltTest.java +++ b/metron-analytics/metron-profiler/src/test/java/org/apache/metron/profiler/bolt/ProfileBuilderBoltTest.java @@ -24,8 +24,10 @@ import org.adrianwalker.multilinestring.Multiline; import org.apache.commons.lang3.StringUtils; import org.apache.metron.common.configuration.profiler.ProfileConfig; import org.apache.metron.common.utils.JSONUtils; +import org.apache.metron.profiler.MessageRoute; import org.apache.metron.profiler.ProfileBuilder; import org.apache.metron.profiler.ProfileMeasurement; +import org.apache.metron.stellar.dsl.Context; import org.apache.metron.test.bolt.BaseBoltTest; import org.apache.storm.Constants; import org.apache.storm.tuple.Tuple; @@ -45,7 +47,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; @@ -78,6 +79,31 @@ public class ProfileBuilderBoltTest extends BaseBoltTest { private String inputTwo; private JSONObject messageTwo; + /** + * { + * "profile": "profileOne", + * "foreach": "ip_src_addr", + * "init": { "x": "0" }, + * "update": { "x": "x + 1" }, + * "result": "x" + * } + */ + @Multiline + private String profileOne; + + + /** + * { + * "profile": "profileTwo", + * "foreach": "ip_src_addr", + * "init": { "x": "0" }, + * "update": { "x": "x + 1" }, + * "result": "x" + * } + */ + @Multiline + private String profileTwo; + public static Tuple mockTickTuple() { Tuple tuple = mock(Tuple.class); when(tuple.getSourceComponent()).thenReturn(Constants.SYSTEM_COMPONENT_ID); @@ -134,31 +160,6 @@ public class ProfileBuilderBoltTest extends BaseBoltTest { } /** - * { - * "profile": "profileOne", - * "foreach": "ip_src_addr", - * "init": { "x": "0" }, - * "update": { "x": "x + 1" }, - * "result": "x" - * } - */ - @Multiline - private String profileOne; - - - /** - * { - * "profile": "profileTwo", - * "foreach": "ip_src_addr", - * "init": { "x": "0" }, - * "update": { "x": "x + 1" }, - * "result": "x" - * } - */ - @Multiline - private String profileTwo; - - /** * The bolt should create a ProfileBuilder to manage a profile. */ @Test @@ -173,7 +174,8 @@ public class ProfileBuilderBoltTest extends BaseBoltTest { bolt.execute(tupleOne); // validate - 1 messages applied - ProfileBuilder builderOne = bolt.getBuilder(tupleOne); + MessageRoute route = new MessageRoute(definition, entity); + ProfileBuilder builderOne = bolt.getMessageDistributor().getBuilder(route, Context.EMPTY_CONTEXT()); assertEquals(1, (int) convert(builderOne.valueOf("x"), Integer.class)); } @@ -201,12 +203,14 @@ public class ProfileBuilderBoltTest extends BaseBoltTest { bolt.execute(tupleTwo); // validate - 2 messages applied - ProfileBuilder builderOne = bolt.getBuilder(tupleOne); + MessageRoute routeOne = new MessageRoute(definition, entityOne); + ProfileBuilder builderOne = bolt.getMessageDistributor().getBuilder(routeOne, Context.EMPTY_CONTEXT()); assertTrue(builderOne.isInitialized()); assertEquals(2, (int) convert(builderOne.valueOf("x"), Integer.class)); // validate - 1 message applied - ProfileBuilder builderTwo = bolt.getBuilder(tupleTwo); + MessageRoute routeTwo = new MessageRoute(definition, entityTwo); + ProfileBuilder builderTwo = bolt.getMessageDistributor().getBuilder(routeTwo, Context.EMPTY_CONTEXT()); assertTrue(builderTwo.isInitialized()); assertEquals(1, (int) convert(builderTwo.valueOf("x"), Integer.class)); @@ -235,12 +239,14 @@ public class ProfileBuilderBoltTest extends BaseBoltTest { bolt.execute(tupleTwo); // validate - 1 message applied - ProfileBuilder builderOne = bolt.getBuilder(tupleOne); + MessageRoute routeOne = new MessageRoute(definitionOne, entity); + ProfileBuilder builderOne = bolt.getMessageDistributor().getBuilder(routeOne, Context.EMPTY_CONTEXT()); assertTrue(builderOne.isInitialized()); assertEquals(1, (int) convert(builderOne.valueOf("x"), Integer.class)); // validate - 1 message applied - ProfileBuilder builderTwo = bolt.getBuilder(tupleTwo); + MessageRoute routeTwo = new MessageRoute(definitionTwo, entity); + ProfileBuilder builderTwo = bolt.getMessageDistributor().getBuilder(routeTwo, Context.EMPTY_CONTEXT()); assertTrue(builderTwo.isInitialized()); assertEquals(1, (int) convert(builderTwo.valueOf("x"), Integer.class)); http://git-wip-us.apache.org/repos/asf/metron/blob/073d6b50/metron-analytics/metron-profiler/src/test/java/org/apache/metron/profiler/bolt/ProfileSplitterBoltTest.java ---------------------------------------------------------------------- diff --git a/metron-analytics/metron-profiler/src/test/java/org/apache/metron/profiler/bolt/ProfileSplitterBoltTest.java b/metron-analytics/metron-profiler/src/test/java/org/apache/metron/profiler/bolt/ProfileSplitterBoltTest.java index 91cbf32..fbdc73a 100644 --- a/metron-analytics/metron-profiler/src/test/java/org/apache/metron/profiler/bolt/ProfileSplitterBoltTest.java +++ b/metron-analytics/metron-profiler/src/test/java/org/apache/metron/profiler/bolt/ProfileSplitterBoltTest.java @@ -142,9 +142,8 @@ public class ProfileSplitterBoltTest extends BaseBoltTest { bolt.setCuratorFramework(client); bolt.setTreeCache(cache); bolt.getConfigurations().updateProfilerConfig(profilerConfig.getBytes("UTF-8")); - bolt.setExecutor(new DefaultStellarStatefulExecutor()); - bolt.prepare(new HashMap<>(), topologyContext, outputCollector); + return bolt; }
