Add detection of Scala classes (#922)

3 files changed, 37 insertions, 1 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<String> classAnnotations = new HashSet<String>();

+	public Set<String> classAttributes = new HashSet<String>();

 	public String sourceFileName = "Foo.java";

 	public String sourceDebugExtension;

 

@@ -37,6 +38,10 @@ public class FilterContextMock implements IFilterContext {
 		return classAnnotations;

 	}

 

+	public Set<String> 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();
 	}