From 9a91884ac586a12b9e035125af96810fb338622e Mon Sep 17 00:00:00 2001 From: Evgeny Mandrikov <138671+Godin@users.noreply.github.com> Date: Mon, 19 Aug 2019 10:10:58 +0200 Subject: Add detection of Scala classes (#922) --- .../core/internal/analysis/ClassAnalyzerTest.java | 10 ++++++++++ .../analysis/filter/FilterContextMock.java | 5 +++++ .../analysis/filter/SyntheticFilterTest.java | 23 +++++++++++++++++++++- .../core/internal/analysis/ClassAnalyzer.java | 12 +++++++++++ .../internal/analysis/filter/IFilterContext.java | 5 +++++ .../internal/analysis/filter/SyntheticFilter.java | 11 +++++++++-- 6 files changed, 63 insertions(+), 3 deletions(-) diff --git a/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/ClassAnalyzerTest.java b/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/ClassAnalyzerTest.java index 372c6023..0ffa6a00 100644 --- a/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/ClassAnalyzerTest.java +++ b/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/ClassAnalyzerTest.java @@ -12,11 +12,13 @@ package org.jacoco.core.internal.analysis; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import org.jacoco.core.internal.flow.MethodProbesVisitor; import org.jacoco.core.internal.instr.InstrSupport; import org.junit.Before; import org.junit.Test; +import org.objectweb.asm.Attribute; import org.objectweb.asm.Opcodes; /** @@ -57,4 +59,12 @@ public class ClassAnalyzerTest { assertEquals(0, coverage.getMethods().size()); } + @Test + public void should_collect_attributes() { + assertTrue(analyzer.getClassAttributes().isEmpty()); + analyzer.visitAttribute(new Attribute("foo") { + }); + assertTrue(analyzer.getClassAttributes().contains("foo")); + } + } diff --git a/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/FilterContextMock.java b/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/FilterContextMock.java index a6c881d3..0b6f0a74 100644 --- a/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/FilterContextMock.java +++ b/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/FilterContextMock.java @@ -22,6 +22,7 @@ public class FilterContextMock implements IFilterContext { public String className = "Foo"; public String superClassName = "java/lang/Object"; public Set classAnnotations = new HashSet(); + public Set classAttributes = new HashSet(); public String sourceFileName = "Foo.java"; public String sourceDebugExtension; @@ -37,6 +38,10 @@ public class FilterContextMock implements IFilterContext { return classAnnotations; } + public Set getClassAttributes() { + return classAttributes; + } + public String getSourceFileName() { return sourceFileName; } diff --git a/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/SyntheticFilterTest.java b/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/SyntheticFilterTest.java index 01b074ef..984a4b69 100644 --- a/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/SyntheticFilterTest.java +++ b/org.jacoco.core.test/src/org/jacoco/core/internal/analysis/filter/SyntheticFilterTest.java @@ -57,13 +57,34 @@ public class SyntheticFilterTest extends FilterTestBase { } @Test - public void should_not_filter_Scala_anonymous_functions() { + public void should_filter_synthetic_method_with_prefix_anonfun_in_non_Scala_classes() { final MethodNode m = new MethodNode(InstrSupport.ASM_API_VERSION, Opcodes.ACC_SYNTHETIC, "$anonfun$main$1", "()V", null, null); m.visitInsn(Opcodes.RETURN); filter.filter(m, context, output); + assertMethodIgnored(m); + } + @Test + public void should_not_filter_synthetic_method_with_prefix_anonfun_in_Scala_classes() { + final MethodNode m = new MethodNode(InstrSupport.ASM_API_VERSION, + Opcodes.ACC_SYNTHETIC, "$anonfun$main$1", "()V", null, null); + m.visitInsn(Opcodes.RETURN); + + context.classAttributes.add("ScalaSig"); + filter.filter(m, context, output); + assertIgnored(); + } + + @Test + public void should_not_filter_synthetic_method_with_prefix_anonfun_in_Scala_inner_classes() { + final MethodNode m = new MethodNode(InstrSupport.ASM_API_VERSION, + Opcodes.ACC_SYNTHETIC, "$anonfun$main$1", "()V", null, null); + m.visitInsn(Opcodes.RETURN); + + context.classAttributes.add("Scala"); + filter.filter(m, context, output); assertIgnored(); } diff --git a/org.jacoco.core/src/org/jacoco/core/internal/analysis/ClassAnalyzer.java b/org.jacoco.core/src/org/jacoco/core/internal/analysis/ClassAnalyzer.java index a18ee7ed..e20be9b8 100644 --- a/org.jacoco.core/src/org/jacoco/core/internal/analysis/ClassAnalyzer.java +++ b/org.jacoco.core/src/org/jacoco/core/internal/analysis/ClassAnalyzer.java @@ -21,6 +21,7 @@ import org.jacoco.core.internal.flow.ClassProbesVisitor; import org.jacoco.core.internal.flow.MethodProbesVisitor; import org.jacoco.core.internal.instr.InstrSupport; import org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.Attribute; import org.objectweb.asm.FieldVisitor; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.tree.MethodNode; @@ -37,6 +38,8 @@ public class ClassAnalyzer extends ClassProbesVisitor private final Set classAnnotations = new HashSet(); + private final Set classAttributes = new HashSet(); + private String sourceDebugExtension; private final IFilter filter; @@ -75,6 +78,11 @@ public class ClassAnalyzer extends ClassProbesVisitor return super.visitAnnotation(desc, visible); } + @Override + public void visitAttribute(final Attribute attribute) { + classAttributes.add(attribute.type); + } + @Override public void visitSource(final String source, final String debug) { coverage.setSourceFileName(stringPool.get(source)); @@ -146,6 +154,10 @@ public class ClassAnalyzer extends ClassProbesVisitor return classAnnotations; } + public Set getClassAttributes() { + return classAttributes; + } + public String getSourceFileName() { return coverage.getSourceFileName(); } diff --git a/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/IFilterContext.java b/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/IFilterContext.java index 8b97654d..0ac8622f 100644 --- a/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/IFilterContext.java +++ b/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/IFilterContext.java @@ -33,6 +33,11 @@ public interface IFilterContext { */ Set getClassAnnotations(); + /** + * @return names of the class attributes + */ + Set getClassAttributes(); + /** * @return file name of the corresponding source file or null * if not available diff --git a/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/SyntheticFilter.java b/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/SyntheticFilter.java index 87dde91a..5c5d05eb 100644 --- a/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/SyntheticFilter.java +++ b/org.jacoco.core/src/org/jacoco/core/internal/analysis/filter/SyntheticFilter.java @@ -19,6 +19,11 @@ import org.objectweb.asm.tree.MethodNode; */ public final class SyntheticFilter implements IFilter { + private static boolean isScalaClass(final IFilterContext context) { + return context.getClassAttributes().contains("ScalaSig") + || context.getClassAttributes().contains("Scala"); + } + public void filter(final MethodNode methodNode, final IFilterContext context, final IFilterOutput output) { if ((methodNode.access & Opcodes.ACC_SYNTHETIC) == 0) { @@ -29,8 +34,10 @@ public final class SyntheticFilter implements IFilter { return; } - if (methodNode.name.startsWith("$anonfun$")) { - return; + if (isScalaClass(context)) { + if (methodNode.name.startsWith("$anonfun$")) { + return; + } } if (KotlinGeneratedFilter.isKotlinClass(context)) { -- cgit v1.2.3