Add filter for bytecode that ECJ generates for String in switch (#735)

2 files changed, 3 insertions, 31 deletions

diff --git a/org.jacoco.core.test.validation.java7/src/org/jacoco/core/test/validation/java7/StringSwitchTest.java b/org.jacoco.core.test.validation.java7/src/org/jacoco/core/test/validation/java7/StringSwitchTest.java
index 242a55f5..0a40c010 100644
--- a/org.jacoco.core.test.validation.java7/src/org/jacoco/core/test/validation/java7/StringSwitchTest.java
+++ b/org.jacoco.core.test.validation.java7/src/org/jacoco/core/test/validation/java7/StringSwitchTest.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.jacoco.core.test.validation.java7;
 
-import org.jacoco.core.test.validation.Source.Line;
 import org.jacoco.core.test.validation.ValidationTestBase;
 import org.jacoco.core.test.validation.java7.targets.StringSwitchTarget;
 
@@ -25,31 +24,4 @@ public class StringSwitchTest extends ValidationTestBase {
 		super(StringSwitchTarget.class);
 	}
 
-	public void assertSwitchCovered(final Line line) {
-		if (isJDKCompiler) {
-			assertFullyCovered(line, 0, 4);
-		} else {
-			// Filtering for ECJ not yet implemented:
-			assertPartlyCovered(line, 2, 7);
-		}
-	}
-
-	public void assertSwitchNotCovered(final Line line) {
-		if (isJDKCompiler) {
-			assertNotCovered(line, 4, 0);
-		} else {
-			// Filtering for ECJ not yet implemented:
-			assertNotCovered(line, 9, 0);
-		}
-	}
-
-	public void assertLookupswitch(final Line line) {
-		if (isJDKCompiler) {
-			assertNotCovered(line, 3, 0);
-		} else {
-			// Filtering for ECJ not yet implemented:
-			assertNotCovered(line, 7, 0);
-		}
-	}
-
 }
diff --git a/org.jacoco.core.test.validation.java7/src/org/jacoco/core/test/validation/java7/targets/StringSwitchTarget.java b/org.jacoco.core.test.validation.java7/src/org/jacoco/core/test/validation/java7/targets/StringSwitchTarget.java
index 7b1bc291..db933f78 100644
--- a/org.jacoco.core.test.validation.java7/src/org/jacoco/core/test/validation/java7/targets/StringSwitchTarget.java
+++ b/org.jacoco.core.test.validation.java7/src/org/jacoco/core/test/validation/java7/targets/StringSwitchTarget.java
@@ -19,7 +19,7 @@ import static org.jacoco.core.test.validation.targets.Stubs.nop;
 public class StringSwitchTarget {
 
 	private static void covered(Object s) {
-		switch (String.valueOf(s)) { // assertSwitchCovered()
+		switch (String.valueOf(s)) { // assertFullyCovered(0, 4)
 		case "a":
 			nop("case a"); // assertFullyCovered()
 			break;
@@ -36,7 +36,7 @@ public class StringSwitchTarget {
 	}
 
 	private static void notCovered(Object s) {
-		switch (String.valueOf(s)) { // assertSwitchNotCovered()
+		switch (String.valueOf(s)) { // assertNotCovered(4, 0)
 		case "a":
 			nop("case a");
 			break;
@@ -88,7 +88,7 @@ public class StringSwitchTarget {
 	 * In this case javac generates <code>LOOKUPSWITCH</code> for second switch.
 	 */
 	private static void lookupswitch(Object s) {
-		switch (String.valueOf(s)) { // assertLookupswitch()
+		switch (String.valueOf(s)) { // assertNotCovered(3, 0)
 		case "a":
 			nop("case a");
 			break;