Skip to content

Commit 37e84a8

Browse files
eyalrotheyalroth
committed
scoverage#171 Migrate ScoveragePlugin from Groovy to Kotlin
1 parent 16fc1c6 commit 37e84a8

21 files changed

+787
-774
lines changed

‎build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
plugins {
22
`java-gradle-plugin`
3+
`kotlin-dsl`
34
id("com.gradle.plugin-publish") version "0.15.0"
45
id("org.jetbrains.gradle.plugin.idea-ext") version "1.0"
5-
kotlin("jvm") version "1.5.31"
66
id("org.jetbrains.dokka") version "1.5.30"
77
}
88

‎src/crossScalaVersionTest/java/org/scoverage/ScalaCrossVersionAggregationTest.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ public ScalaCrossVersionAggregationTest() {
1212
@Test
1313
public void checkAndAggregateAll() throws Exception {
1414

15-
AssertableBuildResult result = run("clean", ScoveragePlugin.getCHECK_NAME(),
16-
ScoveragePlugin.getAGGREGATE_NAME());
17-
18-
result.assertTaskSkipped(ScoveragePlugin.getREPORT_NAME());
19-
result.assertTaskSucceeded("2_12:" + ScoveragePlugin.getREPORT_NAME());
20-
result.assertTaskSucceeded("2_13:" + ScoveragePlugin.getREPORT_NAME());
21-
result.assertTaskSucceeded(ScoveragePlugin.getCHECK_NAME());
22-
result.assertTaskSucceeded("2_12:" + ScoveragePlugin.getCHECK_NAME());
23-
result.assertTaskSucceeded("2_13:" + ScoveragePlugin.getCHECK_NAME());
24-
result.assertTaskSucceeded(ScoveragePlugin.getAGGREGATE_NAME());
15+
AssertableBuildResult result = run("clean", ScoveragePlugin.CHECK_NAME,
16+
ScoveragePlugin.AGGREGATE_NAME);
17+
18+
result.assertTaskSkipped(ScoveragePlugin.REPORT_NAME);
19+
result.assertTaskSucceeded("2_12:" + ScoveragePlugin.REPORT_NAME);
20+
result.assertTaskSucceeded("2_13:" + ScoveragePlugin.REPORT_NAME);
21+
result.assertTaskSucceeded(ScoveragePlugin.CHECK_NAME);
22+
result.assertTaskSucceeded("2_12:" + ScoveragePlugin.CHECK_NAME);
23+
result.assertTaskSucceeded("2_13:" + ScoveragePlugin.CHECK_NAME);
24+
result.assertTaskSucceeded(ScoveragePlugin.AGGREGATE_NAME);
2525

2626
assertAggregationFilesExist();
2727
assertCoverage(100.0);

‎src/crossScalaVersionTest/java/org/scoverage/ScalaVersionTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ public ScalaVersionTest(String scalaVersion) {
2222
@Test
2323
public void report() throws Exception {
2424

25-
AssertableBuildResult result = run("clean", ":" + scalaVersion + ":" + ScoveragePlugin.getREPORT_NAME());
26-
result.assertTaskSucceeded(scalaVersion + ":" + ScoveragePlugin.getREPORT_NAME());
25+
AssertableBuildResult result = run("clean", ":" + scalaVersion + ":" + ScoveragePlugin.REPORT_NAME);
26+
result.assertTaskSucceeded(scalaVersion + ":" + ScoveragePlugin.REPORT_NAME);
2727

2828
File reportDir = reportDir(projectDir().toPath().resolve(scalaVersion).toFile());
2929
Assert.assertTrue(resolve(reportDir, "index.html").exists());

‎src/functionalTest/java/org/scoverage/CompositeBuildTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public void buildComposite() {
2929
@Test
3030
public void reportComposite() {
3131

32-
runComposite("clean", ScoveragePlugin.getREPORT_NAME());
32+
runComposite("clean", ScoveragePlugin.REPORT_NAME);
3333
}
3434

3535
private AssertableBuildResult runComposite(String... arguments) {

‎src/functionalTest/java/org/scoverage/DetectScalaLibraryTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ public class DetectScalaLibraryTest extends ScoverageFunctionalTest {
3333
@Parameterized.Parameters(name = "{index}: Project {0} ")
3434
public static Collection<Object[]> data() {
3535
Object[][] data = new Object[][]{
36-
{"/compile", new String[] {".0", ".+"}, true, new String[0]},
37-
{"/compileOnly", new String[] {".0", ".+"}, true, new String[0]},
38-
{"/implementation", new String[] {".0", ".+"}, true, new String[0]},
39-
{"/dependency-management", new String[] {".0", ".+"}, true, new String[0]},
36+
{"/compile", new String[]{".0", ".+"}, true, new String[0]},
37+
{"/compileOnly", new String[]{".0", ".+"}, true, new String[0]},
38+
{"/implementation", new String[]{".0", ".+"}, true, new String[0]},
39+
{"/dependency-management", new String[]{".0", ".+"}, true, new String[0]},
4040
// disabled until the consistent-versions plugin supports Gradle 7
4141
// {"/gradle-consistent-versions", new String[] {"ignored"}, false, new String[] {"--write-locks"}},
4242
};

‎src/functionalTest/java/org/scoverage/MultiModulePluginNotConfiguredForScalaTest.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ public MultiModulePluginNotConfiguredForScalaTest() {
1212
@Test
1313
public void checkAndAggregateScoverage() throws Exception {
1414

15-
AssertableBuildResult result = run("clean", ScoveragePlugin.getCHECK_NAME(),
16-
ScoveragePlugin.getAGGREGATE_NAME());
17-
18-
result.assertTaskSkipped(ScoveragePlugin.getREPORT_NAME());
19-
result.assertTaskSkipped("scala_only:" + ScoveragePlugin.getREPORT_NAME());
20-
result.assertTaskSkipped("java_only:" + ScoveragePlugin.getREPORT_NAME());
21-
result.assertTaskSkipped(ScoveragePlugin.getCHECK_NAME());
22-
result.assertTaskSkipped("scala_only:" + ScoveragePlugin.getCHECK_NAME());
23-
result.assertTaskSkipped("java_only:" + ScoveragePlugin.getCHECK_NAME());
24-
result.assertTaskSkipped(ScoveragePlugin.getAGGREGATE_NAME());
15+
AssertableBuildResult result = run("clean", ScoveragePlugin.CHECK_NAME,
16+
ScoveragePlugin.AGGREGATE_NAME);
17+
18+
result.assertTaskSkipped(ScoveragePlugin.REPORT_NAME);
19+
result.assertTaskSkipped("scala_only:" + ScoveragePlugin.REPORT_NAME);
20+
result.assertTaskSkipped("java_only:" + ScoveragePlugin.REPORT_NAME);
21+
result.assertTaskSkipped(ScoveragePlugin.CHECK_NAME);
22+
result.assertTaskSkipped("scala_only:" + ScoveragePlugin.CHECK_NAME);
23+
result.assertTaskSkipped("java_only:" + ScoveragePlugin.CHECK_NAME);
24+
result.assertTaskSkipped(ScoveragePlugin.AGGREGATE_NAME);
2525

2626
assertReportDirsEmpty();
2727

‎src/functionalTest/java/org/scoverage/MultipleCheckTasksTest.java

+16-7
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ protected void assertOutput(AssertableBuildResult result, CoverageType type, dou
2828

2929
private AssertableBuildResult run() {
3030
if (shouldSucceed) {
31-
return run("clean", ScoveragePlugin.getCHECK_NAME(), "--info");
31+
return run("clean", ScoveragePlugin.CHECK_NAME, "--info");
3232
} else {
33-
return runAndFail(ScoveragePlugin.getCHECK_NAME(), "--info");
33+
return runAndFail(ScoveragePlugin.CHECK_NAME, "--info");
3434
}
3535
}
3636

@@ -40,52 +40,61 @@ public static class MultipleChecks extends MultipleCheckTasksTest {
4040
public MultipleChecks() {
4141
super("multiple-checks", true);
4242
}
43+
4344
@Override
4445
protected void assertResult(AssertableBuildResult result) {
4546

46-
result.assertTaskSucceeded(ScoveragePlugin.getCHECK_NAME());
47+
result.assertTaskSucceeded(ScoveragePlugin.CHECK_NAME);
4748
assertOutput(result, CoverageType.Line, 0.3);
4849
assertOutput(result, CoverageType.Branch, 0.1);
4950
assertOutput(result, CoverageType.Statement, 0.6);
5051

5152
}
5253
}
54+
5355
public static class SingleCheckNewSyntax extends MultipleCheckTasksTest {
5456
public SingleCheckNewSyntax() {
5557
super("single-check-new-syntax", true);
5658
}
59+
5760
@Override
5861
protected void assertResult(AssertableBuildResult result) {
59-
result.assertTaskSucceeded(ScoveragePlugin.getCHECK_NAME());
62+
result.assertTaskSucceeded(ScoveragePlugin.CHECK_NAME);
6063
assertOutput(result, CoverageType.Line, 0.3);
6164
}
6265
}
66+
6367
public static class SingleCheckOldSyntax extends MultipleCheckTasksTest {
6468
public SingleCheckOldSyntax() {
6569
super("single-check-old-syntax", true);
6670
}
71+
6772
@Override
6873
protected void assertResult(AssertableBuildResult result) {
69-
result.assertTaskSucceeded(ScoveragePlugin.getCHECK_NAME());
74+
result.assertTaskSucceeded(ScoveragePlugin.CHECK_NAME);
7075
assertOutput(result, CoverageType.Line, 0.3);
7176
}
7277
}
78+
7379
public static class OldAndNewSyntax extends MultipleCheckTasksTest {
7480
public OldAndNewSyntax() {
7581
super("old-and-new-syntax", false);
7682
}
83+
7784
@Override
7885
protected void assertResult(AssertableBuildResult result) {
7986
}
8087
}
88+
8189
public static class NoCheck extends MultipleCheckTasksTest {
8290
public NoCheck() {
8391
super("no-check", true);
8492
}
93+
8594
@Override
8695
protected void assertResult(AssertableBuildResult result) {
87-
result.assertTaskSucceeded(ScoveragePlugin.getCHECK_NAME());
96+
result.assertTaskSucceeded(ScoveragePlugin.CHECK_NAME);
8897
assertOutput(result, ScoverageExtension.DEFAULT_COVERAGE_TYPE, ScoverageExtension.DEFAULT_MINIMUM_RATE);
8998
}
9099
}
91-
}
100+
}

‎src/functionalTest/java/org/scoverage/ScalaJavaAnnotationProcessorTest.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@ public ScalaJavaAnnotationProcessorTest() {
1515
@Test
1616
public void checkAndAggregateScoverage() throws Exception {
1717

18-
AssertableBuildResult result = run("clean", ScoveragePlugin.getCHECK_NAME(),
19-
ScoveragePlugin.getAGGREGATE_NAME());
18+
AssertableBuildResult result = run("clean", ScoveragePlugin.CHECK_NAME,
19+
ScoveragePlugin.AGGREGATE_NAME);
2020

21-
result.assertTaskSkipped("java_only:" + ScoveragePlugin.getCOMPILE_NAME());
21+
result.assertTaskSkipped("java_only:" + ScoveragePlugin.COMPILE_NAME);
2222

23-
result.assertTaskSkipped(ScoveragePlugin.getREPORT_NAME());
24-
result.assertTaskSucceeded("mixed_scala_java:" + ScoveragePlugin.getREPORT_NAME());
25-
result.assertTaskSkipped("java_only:" + ScoveragePlugin.getREPORT_NAME());
23+
result.assertTaskSkipped(ScoveragePlugin.REPORT_NAME);
24+
result.assertTaskSucceeded("mixed_scala_java:" + ScoveragePlugin.REPORT_NAME);
25+
result.assertTaskSkipped("java_only:" + ScoveragePlugin.REPORT_NAME);
2626

27-
result.assertTaskSucceeded(ScoveragePlugin.getCHECK_NAME());
28-
result.assertTaskSucceeded("mixed_scala_java:" + ScoveragePlugin.getCHECK_NAME());
29-
result.assertTaskSkipped("java_only:" + ScoveragePlugin.getCHECK_NAME());
27+
result.assertTaskSucceeded(ScoveragePlugin.CHECK_NAME);
28+
result.assertTaskSucceeded("mixed_scala_java:" + ScoveragePlugin.CHECK_NAME);
29+
result.assertTaskSkipped("java_only:" + ScoveragePlugin.CHECK_NAME);
3030

31-
result.assertTaskSucceeded(ScoveragePlugin.getAGGREGATE_NAME());
31+
result.assertTaskSucceeded(ScoveragePlugin.AGGREGATE_NAME);
3232

3333
assertAllReportFilesExist();
3434
assertCoverage(100.0);

‎src/functionalTest/java/org/scoverage/ScalaJavaMultiModuleTest.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@ public ScalaJavaMultiModuleTest() {
1414
@Test
1515
public void checkAndAggregateScoverage() throws Exception {
1616

17-
AssertableBuildResult result = run("clean", ScoveragePlugin.getCHECK_NAME(),
18-
ScoveragePlugin.getAGGREGATE_NAME());
17+
AssertableBuildResult result = run("clean", ScoveragePlugin.CHECK_NAME,
18+
ScoveragePlugin.AGGREGATE_NAME);
1919

20-
result.assertTaskSkipped("java_only:" + ScoveragePlugin.getCOMPILE_NAME());
20+
result.assertTaskSkipped("java_only:" + ScoveragePlugin.COMPILE_NAME);
2121

22-
result.assertTaskSkipped(ScoveragePlugin.getREPORT_NAME());
23-
result.assertTaskSucceeded("scala_only:" + ScoveragePlugin.getREPORT_NAME());
24-
result.assertTaskSucceeded("mixed_scala_java:" + ScoveragePlugin.getREPORT_NAME());
25-
result.assertTaskSkipped("java_only:" + ScoveragePlugin.getREPORT_NAME());
22+
result.assertTaskSkipped(ScoveragePlugin.REPORT_NAME);
23+
result.assertTaskSucceeded("scala_only:" + ScoveragePlugin.REPORT_NAME);
24+
result.assertTaskSucceeded("mixed_scala_java:" + ScoveragePlugin.REPORT_NAME);
25+
result.assertTaskSkipped("java_only:" + ScoveragePlugin.REPORT_NAME);
2626

27-
result.assertTaskSucceeded(ScoveragePlugin.getCHECK_NAME());
28-
result.assertTaskSucceeded("scala_only:" + ScoveragePlugin.getCHECK_NAME());
29-
result.assertTaskSucceeded("mixed_scala_java:" + ScoveragePlugin.getCHECK_NAME());
30-
result.assertTaskSkipped("java_only:" + ScoveragePlugin.getCHECK_NAME());
27+
result.assertTaskSucceeded(ScoveragePlugin.CHECK_NAME);
28+
result.assertTaskSucceeded("scala_only:" + ScoveragePlugin.CHECK_NAME);
29+
result.assertTaskSucceeded("mixed_scala_java:" + ScoveragePlugin.CHECK_NAME);
30+
result.assertTaskSkipped("java_only:" + ScoveragePlugin.CHECK_NAME);
3131

32-
result.assertTaskSucceeded(ScoveragePlugin.getAGGREGATE_NAME());
32+
result.assertTaskSucceeded(ScoveragePlugin.AGGREGATE_NAME);
3333

3434
assertAllReportFilesExist();
3535
assertCoverage(100.0);

0 commit comments

Comments
 (0)