Repository: asterixdb Updated Branches: refs/heads/master 85e6f43c8 -> 7094b7dea
[NO ISSUE] More tests for the Tracer Change-Id: I9722c87232437c9ff3497ab9d1bcbef226094e0d Reviewed-on: https://asterix-gerrit.ics.uci.edu/2119 Sonar-Qube: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Reviewed-by: Murtadha Hubail <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/7094b7de Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/7094b7de Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/7094b7de Branch: refs/heads/master Commit: 7094b7dea72fab87ec8411681abd96f31ca5b37a Parents: 85e6f43 Author: Till Westmann <[email protected]> Authored: Fri Nov 10 16:48:31 2017 -0800 Committer: Till Westmann <[email protected]> Committed: Mon Nov 13 09:04:08 2017 -0800 ---------------------------------------------------------------------- .../apache/hyracks/util/trace/TraceTest.java | 31 +++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/7094b7de/hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/trace/TraceTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/trace/TraceTest.java b/hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/trace/TraceTest.java index 02bf41c..a6ed4c8 100644 --- a/hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/trace/TraceTest.java +++ b/hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/trace/TraceTest.java @@ -49,8 +49,21 @@ public class TraceTest { return handler; } - private JsonNode validate(String line) throws IOException { - return mapper.readTree(line); + public JsonNode validate(String line) throws IOException { + final JsonNode traceRecord = mapper.readTree(line); + + Assert.assertTrue(traceRecord.has("ph")); + + Assert.assertTrue(traceRecord.has("pid")); + Integer.parseInt(traceRecord.get("pid").asText()); + + Assert.assertTrue(traceRecord.has("tid")); + Long.parseLong(traceRecord.get("tid").asText()); + + Assert.assertTrue(traceRecord.has("ts")); + Long.parseLong(traceRecord.get("ts").asText()); + + return traceRecord; } @Test @@ -58,6 +71,8 @@ public class TraceTest { final ByteArrayOutputStream os = new ByteArrayOutputStream(); final StreamHandler handler = redirectTraceLog(os); + // test with initial categories + TraceCategoryRegistry registry = new TraceCategoryRegistry(); long cat1 = registry.get("CAT1"); long cat2 = registry.get("CAT2"); @@ -72,8 +87,13 @@ public class TraceTest { String[] lines = os.toString().split("\n"); for (String line : lines) { - Assert.assertFalse(validate(line).get("cat").equals("CAT3")); + final JsonNode traceRecord = validate(line); + Assert.assertEquals("i", traceRecord.get("ph").asText()); + Assert.assertNotEquals("CAT3", traceRecord.get("cat").asText()); } + + // test with modified categories + tracer.setCategories("CAT1", "CAT3"); os.reset(); @@ -82,9 +102,12 @@ public class TraceTest { tracer.instant("test3", cat3, ITracer.Scope.p, null); handler.flush(); + lines = os.toString().split("\n"); for (String line : lines) { - Assert.assertFalse(validate(line).get("cat").equals("CAT2")); + final JsonNode traceRecord = validate(line); + Assert.assertEquals("i", traceRecord.get("ph").asText()); + Assert.assertNotEquals("CAT2", validate(line).get("cat").asText()); } } }
