Skip to content

Commit 250b840

Browse files
committed
Add support for -coverage-exclude-classlikes and -coverage-exclude-files for Scala 3 (only ScalaSingleModuleTest goes with new scalatest version)
1 parent 43732c1 commit 250b840

File tree

3 files changed

+17
-1
lines changed

3 files changed

+17
-1
lines changed

src/functionalTest/java/org/scoverage/ScalaSingleModuleTest.java

+7
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,19 @@
44
import org.junit.Ignore;
55
import org.junit.Test;
66

7+
import java.util.List;
8+
79
public class ScalaSingleModuleTest extends ScoverageFunctionalTest {
810

911
public ScalaSingleModuleTest() {
1012
super("scala-single-module");
1113
}
1214

15+
@Override
16+
protected List<String> getVersionAgruments() {
17+
return ScalaVersionArguments.version2;
18+
}
19+
1320
@Test
1421
public void test() {
1522

src/functionalTest/java/org/scoverage/ScalaVersionArguments.java

+9
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@
44
import java.util.List;
55

66
public interface ScalaVersionArguments {
7+
List<String> version2WithLegacyScalatest = Arrays.asList(
8+
"-PscalaVersionMajor=2",
9+
"-PscalaVersionMinor=13",
10+
"-PscalaVersionBuild=14",
11+
"-PjunitVersion=5.3.2",
12+
"-PjunitPlatformVersion=1.3.2",
13+
"-PscalatestVersion=3.0.8"
14+
);
15+
716
List<String> version2 = Arrays.asList(
817
"-PscalaVersionMajor=2",
918
"-PscalaVersionMinor=13",

src/functionalTest/java/org/scoverage/ScoverageFunctionalTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ private Double coverage(File reportDir, CoverageType coverageType) throws IOExce
116116
}
117117

118118
protected List<String> getVersionAgruments() {
119-
return ScalaVersionArguments.version2;
119+
return ScalaVersionArguments.version2WithLegacyScalatest;
120120
}
121121

122122
private void configureArguments(String... arguments) {

0 commit comments

Comments
 (0)