ignore the assert statement's conditional branch. (jacoco#1378)

morganga · Oct 21, 2022 · c2aff3e · c2aff3e
1 parent 8a367e3
commit c2aff3e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/...test.validation.java5/src/org/jacoco/core/test/validation/java5/targets/AssertTarget.java b/...test.validation.java5/src/org/jacoco/core/test/validation/java5/targets/AssertTarget.java
@@ -23,7 +23,7 @@ private AssertTarget() {
 	}
 
 	public static void main(String[] args) {
-		assert t() : "msg"; // assertPartlyCovered(1, 1)
+		assert t() : "msg"; // assertFullyCovered()
 	}
 
 }
diff --git a/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/AssertFilterTest.java b/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/AssertFilterTest.java
@@ -17,6 +17,7 @@
 import org.objectweb.asm.Label;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
+import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.MethodNode;
 
 /**
@@ -124,8 +125,7 @@ public void should_filter_assert() {
 				"Z");
 		final Label label = new Label();
 		m.visitJumpInsn(Opcodes.IFNE, label);
-		final Range range = new Range(m.instructions.getLast(),
-				m.instructions.getLast());
+		final AbstractInsnNode fromInclusive = m.instructions.getLast();
 		m.visitVarInsn(Opcodes.ILOAD, 1);
 		m.visitJumpInsn(Opcodes.IFNE, label);
 		m.visitTypeInsn(Opcodes.NEW, "java/lang/AssertionError");
@@ -135,10 +135,12 @@ public void should_filter_assert() {
 				"<init>", "(Ljava/lang/Object;)V", false);
 		m.visitInsn(Opcodes.ATHROW);
 		m.visitLabel(label);
+		final AbstractInsnNode toInclusive = m.instructions.getLast();
 		m.visitInsn(Opcodes.NOP);
 
 		filter.filter(m, context, output);
 
+		final Range range = new Range(fromInclusive, toInclusive);
 		assertIgnored(range);
 	}
 

diff --git a/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/AssertFilter.java b/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/AssertFilter.java
@@ -14,6 +14,7 @@
 
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.JumpInsnNode;
 import org.objectweb.asm.tree.MethodNode;
 
 /**
@@ -58,7 +59,7 @@ public void matchGet(final String className,
 					"Z");
 			nextIs(Opcodes.IFNE);
 			if (cursor != null) {
-				output.ignore(cursor, cursor);
+				output.ignore(cursor, ((JumpInsnNode) cursor).label);
 			}
 		}
 	}