`nextIsInvokeStatic` and `nextIsInvokeVirtual` should check method descriptor (#857)

3 files changed, 15 insertions, 63 deletions

diff --git a/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/AbstractMatcherTest.java b/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/AbstractMatcherTest.java
index 56199bf5..f659632d 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/AbstractMatcherTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/AbstractMatcherTest.java
@@ -137,89 +137,41 @@ public class AbstractMatcherTest {
 	}
 
 	@Test
-	public void nextIsInvokeStatic() {
-		m.visitInsn(Opcodes.NOP);
-		m.visitMethodInsn(Opcodes.INVOKESTATIC, "owner", "name", "()V", false);
-
-		// should set cursor to null when owner mismatch
-		matcher.cursor = m.instructions.getFirst();
-		matcher.nextIsInvokeStatic("another_owner", "name");
-		assertNull(matcher.cursor);
-
-		// should set cursor to null when name mismatch
-		matcher.cursor = m.instructions.getFirst();
-		matcher.nextIsInvokeStatic("owner", "another_name");
-		assertNull(matcher.cursor);
-
-		// should set cursor to next instruction when match
-		matcher.cursor = m.instructions.getFirst();
-		matcher.nextIsInvokeStatic("owner", "name");
-		assertSame(m.instructions.getLast(), matcher.cursor);
-
-		// should not do anything when cursor is null
-		matcher.cursor = null;
-		matcher.nextIsInvokeStatic("owner", "name");
-	}
-
-	@Test
-	public void nextIsInvokeVirtual() {
+	public void nextIsInvoke() {
 		m.visitInsn(Opcodes.NOP);
 		m.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "owner", "name", "()V", false);
 
-		// should set cursor to null when owner mismatch
+		// should set cursor to null when opcode mismatch
 		matcher.cursor = m.instructions.getFirst();
-		matcher.nextIsInvokeVirtual("another_owner", "name");
+		matcher.nextIsInvoke(Opcodes.INVOKESTATIC, "owner", "name", "()V");
 		assertNull(matcher.cursor);
 
-		// should set cursor to null when name mismatch
+		// should set cursor to null when owner mismatch
 		matcher.cursor = m.instructions.getFirst();
-		matcher.nextIsInvokeVirtual("owner", "another_name");
+		matcher.nextIsInvoke(Opcodes.INVOKEVIRTUAL, "another_owner", "name",
+				"()V");
 		assertNull(matcher.cursor);
 
-		// should set cursor to next instruction when match
-		matcher.cursor = m.instructions.getFirst();
-		matcher.nextIsInvokeVirtual("owner", "name");
-		assertSame(m.instructions.getLast(), matcher.cursor);
-
-		// should not do anything when cursor is null
-		matcher.cursor = null;
-		matcher.nextIsInvokeVirtual("owner", "name");
-	}
-
-	@Test
-	public void nextIsInvokeSuper() {
-		m.visitInsn(Opcodes.NOP);
-		m.visitMethodInsn(Opcodes.INVOKESPECIAL, "owner", "not_init", "()V",
-				false);
-
 		// should set cursor to null when name mismatch
 		matcher.cursor = m.instructions.getFirst();
-		matcher.nextIsInvokeSuper("owner", "()V");
-		assertNull(matcher.cursor);
-
-		m.instructions.clear();
-		m.visitInsn(Opcodes.NOP);
-		m.visitMethodInsn(Opcodes.INVOKESPECIAL, "owner", "<init>", "()V",
-				false);
-
-		// should set cursor to null when owner mismatch
-		matcher.cursor = m.instructions.getFirst();
-		matcher.nextIsInvokeSuper("another_owner", "()V");
+		matcher.nextIsInvoke(Opcodes.INVOKEVIRTUAL, "owner", "another_name",
+				"()V");
 		assertNull(matcher.cursor);
 
 		// should set cursor to null when descriptor mismatch
 		matcher.cursor = m.instructions.getFirst();
-		matcher.nextIsInvokeSuper("owner", "(I)V");
+		matcher.nextIsInvoke(Opcodes.INVOKEVIRTUAL, "owner", "name",
+				"(Lanother_descriptor;)V");
 		assertNull(matcher.cursor);
 
 		// should set cursor to next instruction when match
 		matcher.cursor = m.instructions.getFirst();
-		matcher.nextIsInvokeSuper("owner", "()V");
+		matcher.nextIsInvoke(Opcodes.INVOKEVIRTUAL, "owner", "name", "()V");
 		assertSame(m.instructions.getLast(), matcher.cursor);
 
 		// should not do anything when cursor is null
 		matcher.cursor = null;
-		matcher.nextIsInvokeSuper("owner", "()V");
+		matcher.nextIsInvoke(Opcodes.INVOKEVIRTUAL, "owner", "name", "()V");
 	}
 
 	@Test
diff --git a/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/KotlinCoroutineFilterTest.java b/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/KotlinCoroutineFilterTest.java
index b5b06743..127ae309 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/KotlinCoroutineFilterTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/KotlinCoroutineFilterTest.java
@@ -53,7 +53,7 @@ public class KotlinCoroutineFilterTest extends FilterTestBase {
 		{
 			m.visitVarInsn(Opcodes.ALOAD, 1);
 			m.visitMethodInsn(Opcodes.INVOKESTATIC, "kotlin/ResultKt",
-					"throwOnFailure", "", false);
+					"throwOnFailure", "(Ljava/lang/Object;)V", false);
 			range1.toInclusive = m.instructions.getLast();
 		}
 
@@ -83,7 +83,7 @@ public class KotlinCoroutineFilterTest extends FilterTestBase {
 		{
 			m.visitVarInsn(Opcodes.ALOAD, 1);
 			m.visitMethodInsn(Opcodes.INVOKESTATIC, "kotlin/ResultKt",
-					"throwOnFailure", "", false);
+					"throwOnFailure", "(Ljava/lang/Object;)V", false);
 		}
 		m.visitVarInsn(Opcodes.ALOAD, 1);
 		range2.toInclusive = m.instructions.getLast();
diff --git a/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/KotlinLateinitFilterTest.java b/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/KotlinLateinitFilterTest.java
index 5b5f3285..c9e34bab 100644
--- a/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/KotlinLateinitFilterTest.java
+++ b/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/KotlinLateinitFilterTest.java
@@ -47,7 +47,7 @@ public class KotlinLateinitFilterTest extends FilterTestBase {
 		m.visitMethodInsn(Opcodes.INVOKESTATIC,
 				"kotlin/jvm/internal/Intrinsics",
 				"throwUninitializedPropertyAccessException",
-				"Ljava/lang/String;", false);
+				"(Ljava/lang/String;)V", false);
 		final AbstractInsnNode expectedTo = m.instructions.getLast();
 		m.visitLabel(l2);
 		m.visitMethodInsn(Opcodes.INVOKEVIRTUAL,