Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add filter for Java assert statement (#1196)
- Loading branch information
Showing
9 changed files
with
332 additions
and
1 deletion.
There are no files selected for viewing
27 changes: 27 additions & 0 deletions
27
...coco.core.test.validation.java5/src/org/jacoco/core/test/validation/java5/AssertTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
/******************************************************************************* | ||
* Copyright (c) 2009, 2021 Mountainminds GmbH & Co. KG and Contributors | ||
* This program and the accompanying materials are made available under | ||
* the terms of the Eclipse Public License 2.0 which is available at | ||
* http://www.eclipse.org/legal/epl-2.0 | ||
* | ||
* SPDX-License-Identifier: EPL-2.0 | ||
* | ||
* Contributors: | ||
* Evgeny Mandrikov - initial API and implementation | ||
* | ||
*******************************************************************************/ | ||
package org.jacoco.core.test.validation.java5; | ||
|
||
import org.jacoco.core.test.validation.ValidationTestBase; | ||
import org.jacoco.core.test.validation.java5.targets.AssertTarget; | ||
|
||
/** | ||
* Test of code coverage in {@link AssertTarget}. | ||
*/ | ||
public class AssertTest extends ValidationTestBase { | ||
|
||
public AssertTest() { | ||
super(AssertTarget.class); | ||
} | ||
|
||
} |
29 changes: 29 additions & 0 deletions
29
...test.validation.java5/src/org/jacoco/core/test/validation/java5/targets/AssertTarget.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
/******************************************************************************* | ||
* Copyright (c) 2009, 2021 Mountainminds GmbH & Co. KG and Contributors | ||
* This program and the accompanying materials are made available under | ||
* the terms of the Eclipse Public License 2.0 which is available at | ||
* http://www.eclipse.org/legal/epl-2.0 | ||
* | ||
* SPDX-License-Identifier: EPL-2.0 | ||
* | ||
* Contributors: | ||
* Evgeny Mandrikov - initial API and implementation | ||
* | ||
*******************************************************************************/ | ||
package org.jacoco.core.test.validation.java5.targets; | ||
|
||
import static org.jacoco.core.test.validation.targets.Stubs.t; | ||
|
||
/** | ||
* This target exercises assert statement. | ||
*/ | ||
public class AssertTarget { // assertFullyCovered() | ||
|
||
private AssertTarget() { | ||
} | ||
|
||
public static void main(String[] args) { | ||
assert t() : "msg"; // assertPartlyCovered(1, 1) | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
145 changes: 145 additions & 0 deletions
145
org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/AssertFilterTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,145 @@ | ||
/******************************************************************************* | ||
* Copyright (c) 2009, 2021 Mountainminds GmbH & Co. KG and Contributors | ||
* This program and the accompanying materials are made available under | ||
* the terms of the Eclipse Public License 2.0 which is available at | ||
* http://www.eclipse.org/legal/epl-2.0 | ||
* | ||
* SPDX-License-Identifier: EPL-2.0 | ||
* | ||
* Contributors: | ||
* Evgeny Mandrikov - initial API and implementation | ||
* | ||
*******************************************************************************/ | ||
package org.jacoco.core.internal.analysis.filter; | ||
|
||
import org.jacoco.core.internal.instr.InstrSupport; | ||
import org.junit.Test; | ||
import org.objectweb.asm.Label; | ||
import org.objectweb.asm.Opcodes; | ||
import org.objectweb.asm.Type; | ||
import org.objectweb.asm.tree.MethodNode; | ||
|
||
/** | ||
* Unit tests for {@link AssertFilter}. | ||
*/ | ||
public class AssertFilterTest extends FilterTestBase { | ||
|
||
private final AssertFilter filter = new AssertFilter(); | ||
|
||
/** | ||
* <code><pre> | ||
* class Example { | ||
* void example(boolean b) { | ||
* ... | ||
* assert b : "message"; | ||
* ... | ||
* } | ||
* } | ||
* </pre></code> | ||
*/ | ||
@Test | ||
public void should_filter_static_initializer() { | ||
context.className = "Example"; | ||
final MethodNode m = new MethodNode(InstrSupport.ASM_API_VERSION, | ||
Opcodes.ACC_STATIC, "<clinit>", "()V", null, null); | ||
|
||
m.visitLdcInsn(Type.getType("LExample;")); | ||
final Range range = new Range(); | ||
range.fromInclusive = m.instructions.getLast(); | ||
m.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/Class", | ||
"desiredAssertionStatus", "()Z", false); | ||
final Label label1 = new Label(); | ||
final Label label2 = new Label(); | ||
m.visitJumpInsn(Opcodes.IFNE, label1); | ||
m.visitInsn(Opcodes.ICONST_1); | ||
m.visitJumpInsn(Opcodes.GOTO, label2); | ||
m.visitLabel(label1); | ||
m.visitInsn(Opcodes.ICONST_0); | ||
m.visitLabel(label2); | ||
m.visitFieldInsn(Opcodes.PUTSTATIC, "Example", "$assertionsDisabled", | ||
"Z"); | ||
range.toInclusive = m.instructions.getLast(); | ||
m.visitInsn(Opcodes.RETURN); | ||
|
||
filter.filter(m, context, output); | ||
|
||
assertIgnored(range); | ||
} | ||
|
||
/** | ||
* <code><pre> | ||
* class Example { | ||
* static final f; | ||
* | ||
* static { | ||
* f = !Example.class.desiredAssertionStatus(); | ||
* } | ||
* } | ||
* </pre></code> | ||
*/ | ||
@Test | ||
public void should_not_filter_static_initializer_when_field_name_does_not_match() { | ||
context.className = "Example"; | ||
final MethodNode m = new MethodNode(InstrSupport.ASM_API_VERSION, | ||
Opcodes.ACC_STATIC, "<clinit>", "()V", null, null); | ||
|
||
m.visitLdcInsn(Type.getType("LExample;")); | ||
m.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/Class", | ||
"desiredAssertionStatus", "()Z", false); | ||
final Label label1 = new Label(); | ||
final Label label2 = new Label(); | ||
m.visitJumpInsn(Opcodes.IFNE, label1); | ||
m.visitInsn(Opcodes.ICONST_1); | ||
m.visitJumpInsn(Opcodes.GOTO, label2); | ||
m.visitLabel(label1); | ||
m.visitInsn(Opcodes.ICONST_0); | ||
m.visitLabel(label2); | ||
m.visitFieldInsn(Opcodes.PUTSTATIC, "Foo", "f", "Z"); | ||
m.visitInsn(Opcodes.RETURN); | ||
|
||
filter.filter(m, context, output); | ||
|
||
assertIgnored(); | ||
} | ||
|
||
/** | ||
* <code><pre> | ||
* class Example { | ||
* void example(boolean b) { | ||
* ... | ||
* assert b : "message"; | ||
* ... | ||
* } | ||
* } | ||
* </pre></code> | ||
*/ | ||
@Test | ||
public void should_filter_assert() { | ||
context.className = "Example"; | ||
final MethodNode m = new MethodNode(InstrSupport.ASM_API_VERSION, 0, | ||
"example", "()V", null, null); | ||
|
||
m.visitInsn(Opcodes.NOP); | ||
m.visitFieldInsn(Opcodes.GETSTATIC, "Example", "$assertionsDisabled", | ||
"Z"); | ||
final Label label = new Label(); | ||
m.visitJumpInsn(Opcodes.IFNE, label); | ||
final Range range = new Range(m.instructions.getLast(), | ||
m.instructions.getLast()); | ||
m.visitVarInsn(Opcodes.ILOAD, 1); | ||
m.visitJumpInsn(Opcodes.IFNE, label); | ||
m.visitTypeInsn(Opcodes.NEW, "java/lang/AssertionError"); | ||
m.visitInsn(Opcodes.DUP); | ||
m.visitLdcInsn("message"); | ||
m.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/lang/AssertionError", | ||
"<init>", "(Ljava/lang/Object;)V", false); | ||
m.visitInsn(Opcodes.ATHROW); | ||
m.visitLabel(label); | ||
m.visitInsn(Opcodes.NOP); | ||
|
||
filter.filter(m, context, output); | ||
|
||
assertIgnored(range); | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
66 changes: 66 additions & 0 deletions
66
org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/AssertFilter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
/******************************************************************************* | ||
* Copyright (c) 2009, 2021 Mountainminds GmbH & Co. KG and Contributors | ||
* This program and the accompanying materials are made available under | ||
* the terms of the Eclipse Public License 2.0 which is available at | ||
* http://www.eclipse.org/legal/epl-2.0 | ||
* | ||
* SPDX-License-Identifier: EPL-2.0 | ||
* | ||
* Contributors: | ||
* Evgeny Mandrikov - initial API and implementation | ||
* | ||
*******************************************************************************/ | ||
package org.jacoco.core.internal.analysis.filter; | ||
|
||
import org.objectweb.asm.Opcodes; | ||
import org.objectweb.asm.tree.AbstractInsnNode; | ||
import org.objectweb.asm.tree.MethodNode; | ||
|
||
/** | ||
* Filters code that is generated for an <code>assert</code> statement. | ||
*/ | ||
final class AssertFilter implements IFilter { | ||
|
||
public void filter(final MethodNode methodNode, | ||
final IFilterContext context, final IFilterOutput output) { | ||
final Matcher matcher = new Matcher(); | ||
if ("<clinit>".equals(methodNode.name)) { | ||
for (final AbstractInsnNode i : methodNode.instructions) { | ||
matcher.matchSet(context.getClassName(), i, output); | ||
} | ||
} | ||
for (final AbstractInsnNode i : methodNode.instructions) { | ||
matcher.matchGet(context.getClassName(), i, output); | ||
} | ||
} | ||
|
||
private static class Matcher extends AbstractMatcher { | ||
public void matchSet(final String className, | ||
final AbstractInsnNode start, final IFilterOutput output) { | ||
cursor = start; | ||
nextIsInvoke(Opcodes.INVOKEVIRTUAL, "java/lang/Class", | ||
"desiredAssertionStatus", "()Z"); | ||
nextIs(Opcodes.IFNE); | ||
nextIs(Opcodes.ICONST_1); | ||
nextIs(Opcodes.GOTO); | ||
nextIs(Opcodes.ICONST_0); | ||
nextIsField(Opcodes.PUTSTATIC, className, "$assertionsDisabled", | ||
"Z"); | ||
if (cursor != null) { | ||
output.ignore(start, cursor); | ||
} | ||
} | ||
|
||
public void matchGet(final String className, | ||
final AbstractInsnNode start, final IFilterOutput output) { | ||
cursor = start; | ||
nextIsField(Opcodes.GETSTATIC, className, "$assertionsDisabled", | ||
"Z"); | ||
nextIs(Opcodes.IFNE); | ||
if (cursor != null) { | ||
output.ignore(cursor, cursor); | ||
} | ||
} | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters