From 4d08365f76149b7739beb5e17deaa0c7d024f47e Mon Sep 17 00:00:00 2001 From: "Marc R. Hoffmann" Date: Fri, 15 Sep 2017 03:25:09 +0200 Subject: Add "--verbose" option to "classinfo" CLI command (#578) --- .../src/org/jacoco/cli/internal/CommandTestBase.java | 6 ++++++ .../org/jacoco/cli/internal/commands/ClassInfoTest.java | 17 +++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) (limited to 'org.jacoco.cli.test') diff --git a/org.jacoco.cli.test/src/org/jacoco/cli/internal/CommandTestBase.java b/org.jacoco.cli.test/src/org/jacoco/cli/internal/CommandTestBase.java index 4d12a373..2dee3adf 100644 --- a/org.jacoco.cli.test/src/org/jacoco/cli/internal/CommandTestBase.java +++ b/org.jacoco.cli.test/src/org/jacoco/cli/internal/CommandTestBase.java @@ -12,6 +12,7 @@ package org.jacoco.cli.internal; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import java.io.PrintWriter; @@ -59,6 +60,11 @@ public abstract class CommandTestBase { assertTrue(content, content.contains(expected)); } + protected void assertContainsNot(String expected, StringWriter buffer) { + final String content = buffer.toString(); + assertFalse(content, content.contains(expected)); + } + protected String getClassPath() { final String name = getClass().getName(); final String res = "/" + name.replace('.', '/') + ".class"; diff --git a/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/ClassInfoTest.java b/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/ClassInfoTest.java index 62934e28..cff5116c 100644 --- a/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/ClassInfoTest.java +++ b/org.jacoco.cli.test/src/org/jacoco/cli/internal/commands/ClassInfoTest.java @@ -45,10 +45,19 @@ public class ClassInfoTest extends CommandTestBase { execute("classinfo", getClassPath()); assertOk(); - assertContains( - "class name: org/jacoco/cli/internal/commands/ClassInfoTest", - out); - assertContains("methods: 4", out); + assertContains("class", out); + assertContains("org/jacoco/cli/internal/commands/ClassInfoTest", out); + assertContainsNot("method", out); + } + + @Test + public void should_print_class_details_when_verbose() throws Exception { + execute("classinfo", "--verbose", getClassPath()); + + assertOk(); + assertContains("line", out); + assertContains("method", out); + assertContains("line", out); } } -- cgit v1.2.3