Till Westmann has submitted this change and it was merged. Change subject: [NO ISSUE] More tests for the Tracer ......................................................................
[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]> --- M hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/trace/TraceTest.java 1 file changed, 27 insertions(+), 4 deletions(-) Approvals: Jenkins: Verified; No violations found; Verified Murtadha Hubail: Looks good to me, approved 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,14 +49,29 @@ 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 public void testInstant() throws IOException { final ByteArrayOutputStream os = new ByteArrayOutputStream(); final StreamHandler handler = redirectTraceLog(os); + + // test with initial categories TraceCategoryRegistry registry = new TraceCategoryRegistry(); long cat1 = registry.get("CAT1"); @@ -72,8 +87,13 @@ 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 @@ 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()); } } } -- To view, visit https://asterix-gerrit.ics.uci.edu/2119 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9722c87232437c9ff3497ab9d1bcbef226094e0d Gerrit-PatchSet: 5 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till Westmann <[email protected]> Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Murtadha Hubail <[email protected]> Gerrit-Reviewer: Till Westmann <[email protected]>
