Skip to content

Commit c4f8a88

Browse files
nedtwiggnedtwigg
authored
Polish GradleExtension tests (#1908)
2 parents 2b05af1 + f183b61 commit c4f8a88

File tree

3 files changed

+38
-67
lines changed

3 files changed

+38
-67
lines changed

‎plugin-gradle/src/test/java/com/diffplug/gradle/spotless/GroovyGradleExtensionTest.java

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2021 DiffPlug
2+
* Copyright 2016-2023 DiffPlug
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -17,24 +17,20 @@
1717

1818
import java.io.IOException;
1919

20-
import org.junit.jupiter.api.Test;
20+
import org.junit.jupiter.params.ParameterizedTest;
21+
import org.junit.jupiter.params.provider.ValueSource;
2122

2223
import com.diffplug.common.base.StringPrinter;
2324

24-
class GroovyGradleExtensionTest extends GradleIntegrationHarness {
25+
/**
26+
* We test GroovyGradleExtension only behaviors here.
27+
*/
28+
class GroovyGradleExtensionTest extends GroovyExtensionTest {
2529
private static final String HEADER = "//My tests header";
2630

27-
@Test
28-
void defaultTarget() throws IOException {
29-
testTarget(true);
30-
}
31-
32-
@Test
33-
void customTarget() throws IOException {
34-
testTarget(false);
35-
}
36-
37-
private void testTarget(boolean useDefaultTarget) throws IOException {
31+
@ParameterizedTest
32+
@ValueSource(booleans = {true, false})
33+
void testTarget(boolean useDefaultTarget) throws IOException {
3834
String target = useDefaultTarget ? "" : "target 'other.gradle'";
3935
String buildContent = StringPrinter.buildStringFromLines(
4036
"plugins {",

‎plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class KotlinExtensionTest extends GradleIntegrationHarness {
3030
void integrationDiktat() throws IOException {
3131
setFile("build.gradle").toLines(
3232
"plugins {",
33-
" id 'org.jetbrains.kotlin.jvm' version '1.4.30'",
33+
" id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
3434
" id 'com.diffplug.spotless'",
3535
"}",
3636
"repositories { mavenCentral() }",
@@ -48,7 +48,7 @@ void integrationDiktat() throws IOException {
4848
void integrationKtfmt_dropboxStyle_0_19() throws IOException {
4949
setFile("build.gradle").toLines(
5050
"plugins {",
51-
" id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
51+
" id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
5252
" id 'com.diffplug.spotless'",
5353
"}",
5454
"repositories { mavenCentral() }",
@@ -66,7 +66,7 @@ void integrationKtfmt_dropboxStyle_0_19() throws IOException {
6666
void withExperimentalEditorConfigOverride() throws IOException {
6767
setFile("build.gradle").toLines(
6868
"plugins {",
69-
" id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
69+
" id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
7070
" id 'com.diffplug.spotless'",
7171
"}",
7272
"repositories { mavenCentral() }",
@@ -90,7 +90,7 @@ void testWithInvalidEditorConfigFile() throws IOException {
9090

9191
setFile("build.gradle").toLines(
9292
"plugins {",
93-
" id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
93+
" id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
9494
" id 'com.diffplug.spotless'",
9595
"}",
9696
"repositories { mavenCentral() }",
@@ -110,7 +110,7 @@ void testReadCodeStyleFromEditorConfigFile() throws IOException {
110110
setFile(".editorconfig").toResource("kotlin/ktlint/ktlint_official/.editorconfig");
111111
setFile("build.gradle").toLines(
112112
"plugins {",
113-
" id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
113+
" id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
114114
" id 'com.diffplug.spotless'",
115115
"}",
116116
"repositories { mavenCentral() }",
@@ -127,7 +127,7 @@ void testSetEditorConfigCanOverrideEditorConfigFile() throws IOException {
127127
setFile(".editorconfig").toResource("kotlin/ktlint/intellij_idea/.editorconfig");
128128
setFile("build.gradle").toLines(
129129
"plugins {",
130-
" id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
130+
" id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
131131
" id 'com.diffplug.spotless'",
132132
"}",
133133
"repositories { mavenCentral() }",
@@ -145,7 +145,7 @@ void testSetEditorConfigCanOverrideEditorConfigFile() throws IOException {
145145
void withCustomRuleSetApply() throws IOException {
146146
setFile("build.gradle").toLines(
147147
"plugins {",
148-
" id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
148+
" id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
149149
" id 'com.diffplug.spotless'",
150150
"}",
151151
"repositories { mavenCentral() }",
@@ -169,7 +169,7 @@ void withCustomRuleSetApply() throws IOException {
169169
void testWithHeader() throws IOException {
170170
setFile("build.gradle").toLines(
171171
"plugins {",
172-
" id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
172+
" id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
173173
" id 'com.diffplug.spotless'",
174174
"}",
175175
"repositories { mavenCentral() }",
@@ -188,7 +188,7 @@ void testWithHeader() throws IOException {
188188
void testWithCustomMaxWidthDefaultStyleKtfmt() throws IOException {
189189
setFile("build.gradle").toLines(
190190
"plugins {",
191-
" id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
191+
" id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
192192
" id 'com.diffplug.spotless'",
193193
"}",
194194
"repositories { mavenCentral() }",

‎plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java

Lines changed: 19 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -15,42 +15,28 @@
1515
*/
1616
package com.diffplug.gradle.spotless;
1717

18-
import static org.assertj.core.api.Assertions.assertThat;
19-
2018
import java.io.IOException;
2119

22-
import org.gradle.testkit.runner.BuildResult;
23-
import org.junit.jupiter.api.Test;
20+
import org.junit.jupiter.params.ParameterizedTest;
21+
import org.junit.jupiter.params.provider.ValueSource;
2422

25-
class KotlinGradleExtensionTest extends GradleIntegrationHarness {
26-
@Test
27-
void integration_default_diktat() throws IOException {
28-
setFile("build.gradle").toLines(
29-
"plugins {",
30-
" id 'org.jetbrains.kotlin.jvm' version '1.4.30'",
31-
" id 'com.diffplug.spotless'",
32-
"}",
33-
"repositories { mavenCentral() }",
34-
"spotless {",
35-
" kotlinGradle {",
36-
" diktat()",
37-
" }",
38-
"}");
39-
setFile("configuration.gradle.kts").toResource("kotlin/diktat/basic.dirty");
40-
BuildResult result = gradleRunner().withArguments("spotlessApply").buildAndFail();
41-
assertThat(result.getOutput()).contains("[AVOID_NESTED_FUNCTIONS] try to avoid using nested functions");
42-
}
23+
/**
24+
* We test KotlinGradleExtension only behaviors here.
25+
*/
26+
class KotlinGradleExtensionTest extends KotlinExtensionTest {
4327

44-
@Test
45-
void withExperimentalEditorConfigOverride() throws IOException {
28+
@ParameterizedTest
29+
@ValueSource(booleans = {true, false})
30+
void testTarget(boolean useDefaultTarget) throws IOException {
4631
setFile("build.gradle").toLines(
4732
"plugins {",
48-
" id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
33+
" id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
4934
" id 'com.diffplug.spotless'",
5035
"}",
5136
"repositories { mavenCentral() }",
5237
"spotless {",
5338
" kotlinGradle {",
39+
" " + (useDefaultTarget ? "" : "target \"*.kts\""),
5440
" ktlint().editorConfigOverride([",
5541
" ktlint_experimental: \"enabled\",",
5642
" ij_kotlin_allow_trailing_comma: true,",
@@ -59,25 +45,14 @@ void withExperimentalEditorConfigOverride() throws IOException {
5945
" }",
6046
"}");
6147
setFile("configuration.gradle.kts").toResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty");
48+
setFile("configuration.kts").toResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty");
6249
gradleRunner().withArguments("spotlessApply").build();
63-
assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.clean");
64-
}
65-
66-
@Test
67-
void integration_ktfmt_with_dropbox_style() throws IOException {
68-
setFile("build.gradle").toLines(
69-
"plugins {",
70-
" id 'org.jetbrains.kotlin.jvm' version '1.5.31'",
71-
" id 'com.diffplug.spotless'",
72-
"}",
73-
"repositories { mavenCentral() }",
74-
"spotless {",
75-
" kotlinGradle {",
76-
" ktfmt().dropboxStyle()",
77-
" }",
78-
"}");
79-
setFile("configuration.gradle.kts").toResource("kotlin/ktfmt/dropboxstyle.dirty");
80-
gradleRunner().withArguments("spotlessApply").build();
81-
assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktfmt/dropboxstyle.clean");
50+
if (useDefaultTarget) {
51+
assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.clean");
52+
assertFile("configuration.kts").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty");
53+
} else {
54+
assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.clean");
55+
assertFile("configuration.kts").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.clean");
56+
}
8257
}
8358
}

0 commit comments

Comments
 (0)