From 47094b8e7670994bc9dc6e2e31a4db6b343f5a63 Mon Sep 17 00:00:00 2001 From: "Marc R. Hoffmann" Date: Wed, 22 Mar 2017 23:43:46 +0100 Subject: Use isJDKCompiler constant to validate all cases (#503) --- .../jacoco/core/test/validation/ControlStructuresTest.java | 4 ++-- .../org/jacoco/core/test/validation/ValidationTestBase.java | 11 +++-------- 2 files changed, 5 insertions(+), 10 deletions(-) (limited to 'org.jacoco.core.test') diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/validation/ControlStructuresTest.java b/org.jacoco.core.test/src/org/jacoco/core/test/validation/ControlStructuresTest.java index c882fa57..146d7957 100644 --- a/org.jacoco.core.test/src/org/jacoco/core/test/validation/ControlStructuresTest.java +++ b/org.jacoco.core.test/src/org/jacoco/core/test/validation/ControlStructuresTest.java @@ -41,8 +41,8 @@ public class ControlStructuresTest extends ValidationTestBase { assertLine("missedelse", ICounter.NOT_COVERED); // 4. Missed while block - // ECJ and javac produce different status here - assertLine("whilefalse", 1, 1); + assertLine("whilefalse", isJDKCompiler ? ICounter.FULLY_COVERED + : ICounter.PARTLY_COVERED, 1, 1); assertLine("missedwhile", ICounter.NOT_COVERED); // 5. Always true while block diff --git a/org.jacoco.core.test/src/org/jacoco/core/test/validation/ValidationTestBase.java b/org.jacoco.core.test/src/org/jacoco/core/test/validation/ValidationTestBase.java index 8521d96c..aa6b35bd 100644 --- a/org.jacoco.core.test/src/org/jacoco/core/test/validation/ValidationTestBase.java +++ b/org.jacoco.core.test/src/org/jacoco/core/test/validation/ValidationTestBase.java @@ -118,8 +118,9 @@ public abstract class ValidationTestBase { assertEquals(msg, STATUS_NAME[status], STATUS_NAME[insnStatus]); } - protected void assertLine(final String tag, final int missedBranches, - final int coveredBranches) { + protected void assertLine(final String tag, final int status, + final int missedBranches, final int coveredBranches) { + assertLine(tag, status); final int nr = source.getLineNumber(tag); final ILine line = sourceCoverage.getLine(nr); final String msg = String.format("Branches in line %s: %s", @@ -129,12 +130,6 @@ public abstract class ValidationTestBase { line.getBranchCounter()); } - protected void assertLine(final String tag, final int status, - final int missedBranches, final int coveredBranches) { - assertLine(tag, status); - assertLine(tag, missedBranches, coveredBranches); - } - protected void assertLogEvents(String... events) throws Exception { final Method getter = Class.forName(Stubs.class.getName(), false, loader).getMethod("getLogEvents"); -- cgit v1.2.3