Repository: apex-malhar Updated Branches: refs/heads/master 1449d9b4a -> cae42df3c
APEXMALHAR-2206 : Application tests fixes 1. Fixing placement for lc.shutdown() 2. Disabling log messages for console output in JsonFormatterTest. 3. Incorporating review comments Project: http://git-wip-us.apache.org/repos/asf/apex-malhar/repo Commit: http://git-wip-us.apache.org/repos/asf/apex-malhar/commit/edf9635e Tree: http://git-wip-us.apache.org/repos/asf/apex-malhar/tree/edf9635e Diff: http://git-wip-us.apache.org/repos/asf/apex-malhar/diff/edf9635e Branch: refs/heads/master Commit: edf9635e005a6366341438970cbcd8a21416f106 Parents: 7d9386d Author: yogidevendra <[email protected]> Authored: Fri Aug 26 21:44:04 2016 +0530 Committer: yogidevendra <[email protected]> Committed: Sat Aug 27 04:03:23 2016 +0530 ---------------------------------------------------------------------- .../test/java/com/datatorrent/lib/db/jdbc/JdbcIOAppTest.java | 5 +---- .../java/com/datatorrent/lib/formatter/JsonFormatterTest.java | 2 +- .../apache/apex/malhar/lib/dedup/DeduperPartitioningTest.java | 2 +- .../apex/malhar/lib/join/POJOPartitionJoinOperatorTest.java | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/edf9635e/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcIOAppTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcIOAppTest.java b/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcIOAppTest.java index fe31f01..908f02f 100644 --- a/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcIOAppTest.java +++ b/library/src/test/java/com/datatorrent/lib/db/jdbc/JdbcIOAppTest.java @@ -121,13 +121,10 @@ public class JdbcIOAppTest lma.prepareDAG(new JdbcIOApp(), conf); LocalMode.Controller lc = lma.getController(); lc.runAsync(); - // wait for records to be added to table Thread.sleep(3000); - - Assert.assertEquals("Events in store", 10, getNumOfEventsInStore()); lc.shutdown(); - + Assert.assertEquals("Events in store", 10, getNumOfEventsInStore()); } catch (ConstraintViolationException e) { Assert.fail("constraint violations: " + e.getConstraintViolations()); } http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/edf9635e/library/src/test/java/com/datatorrent/lib/formatter/JsonFormatterTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/com/datatorrent/lib/formatter/JsonFormatterTest.java b/library/src/test/java/com/datatorrent/lib/formatter/JsonFormatterTest.java index 126639c..397c1ef 100644 --- a/library/src/test/java/com/datatorrent/lib/formatter/JsonFormatterTest.java +++ b/library/src/test/java/com/datatorrent/lib/formatter/JsonFormatterTest.java @@ -218,7 +218,7 @@ public class JsonFormatterTest JsonFormatter formatter = dag.addOperator("formatter", new JsonFormatter()); dag.getMeta(formatter).getMeta(formatter.in).getAttributes().put(Context.PortContext.TUPLE_CLASS, Ad.class); ConsoleOutputOperator output = dag.addOperator("output", new ConsoleOutputOperator()); - output.setDebug(true); + output.setDebug(false); dag.addStream("input", input.output, formatter.in); dag.addStream("output", formatter.out, output.input); } http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/edf9635e/library/src/test/java/org/apache/apex/malhar/lib/dedup/DeduperPartitioningTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/org/apache/apex/malhar/lib/dedup/DeduperPartitioningTest.java b/library/src/test/java/org/apache/apex/malhar/lib/dedup/DeduperPartitioningTest.java index 9594e63..479fbe8 100644 --- a/library/src/test/java/org/apache/apex/malhar/lib/dedup/DeduperPartitioningTest.java +++ b/library/src/test/java/org/apache/apex/malhar/lib/dedup/DeduperPartitioningTest.java @@ -190,7 +190,7 @@ public class DeduperPartitioningTest LocalMode.Controller lc = lma.getController(); lc.runAsync(); app.dedup.latch.await(); - Assert.assertFalse(testFailed); lc.shutdown(); + Assert.assertFalse(testFailed); } } http://git-wip-us.apache.org/repos/asf/apex-malhar/blob/edf9635e/library/src/test/java/org/apache/apex/malhar/lib/join/POJOPartitionJoinOperatorTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/org/apache/apex/malhar/lib/join/POJOPartitionJoinOperatorTest.java b/library/src/test/java/org/apache/apex/malhar/lib/join/POJOPartitionJoinOperatorTest.java index 89a1068..9b05fcb 100644 --- a/library/src/test/java/org/apache/apex/malhar/lib/join/POJOPartitionJoinOperatorTest.java +++ b/library/src/test/java/org/apache/apex/malhar/lib/join/POJOPartitionJoinOperatorTest.java @@ -188,8 +188,8 @@ public class POJOPartitionJoinOperatorTest LocalMode.Controller lc = lma.getController(); lc.runAsync(); app.joinOp.latch.await(); - Assert.assertFalse(testFailed); lc.shutdown(); + Assert.assertFalse(testFailed); } }
