Skip to content

Commit 9ad4993

Browse files
committed
refactor test for removeWildCardImports to forbidWildcardImports
1 parent 14e0230 commit 9ad4993

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/JavaDefaultTargetTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ void removeUnusedImportsWithCleanthat() throws IOException {
8282
}
8383

8484
@Test
85-
void removeWildCardImports() throws IOException {
85+
void forbidWildcardImports() throws IOException {
8686
setFile("build.gradle").toLines(
8787
"plugins {",
8888
" id 'com.diffplug.spotless'",
@@ -92,17 +92,17 @@ void removeWildCardImports() throws IOException {
9292
"spotless {",
9393
" java {",
9494
" target file('test.java')",
95-
" removeWildcardImports()",
95+
" forbidWildcardImports()",
9696
" }",
9797
"}");
9898

99-
setFile("test.java").toResource("java/removewildcardimports/JavaCodeWildcardsUnformatted.test");
99+
setFile("test.java").toResource("java/forbidwildcardimports/JavaCodeWildcardsUnformatted.test");
100100
gradleRunner().withArguments("spotlessApply").buildAndFail();
101-
assertFile("test.java").sameAsResource("java/removewildcardimports/JavaCodeWildcardsFormatted.test");
101+
assertFile("test.java").sameAsResource("java/forbidwildcardimports/JavaCodeWildcardsFormatted.test");
102102
}
103103

104104
@Test
105-
void removeModuleImports() throws IOException {
105+
void forbidModuleImports() throws IOException {
106106
setFile("build.gradle").toLines(
107107
"plugins {",
108108
" id 'com.diffplug.spotless'",

plugin-maven/src/test/java/com/diffplug/spotless/maven/java/ForbidWildcardImportsStepTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ void testForbidWildcardImports() throws Exception {
2626
writePomWithJavaSteps("<forbidWildcardImports/>");
2727

2828
String path = "src/main/java/test.java";
29-
setFile(path).toResource("java/removewildcardimports/JavaCodeWildcardsUnformatted.test");
29+
setFile(path).toResource("java/forbidwildcardimports/JavaCodeWildcardsUnformatted.test");
3030
var selfie = expectSelfieErrorMsg(mavenRunner().withArguments("spotless:apply").runHasError());
31-
assertFile(path).sameAsResource("java/removewildcardimports/JavaCodeWildcardsUnformatted.test");
31+
assertFile(path).sameAsResource("java/forbidwildcardimports/JavaCodeWildcardsUnformatted.test");
3232
selfie.toBe("""
3333
Failed to execute goal com.diffplug.spotless:spotless-maven-plugin:VERSION:apply (default-cli) on project spotless-maven-plugin-tests: There were 5 lint error(s), they must be fixed or suppressed.
3434
src/main/java/test.java:L1 forbidWildcardImports(import java.util.*;) Do not use wildcard imports (e.g. java.util.*) - replace with specific class imports (e.g. java.util.List) as 'spotlessApply' cannot auto-fix this

plugin-maven/src/test/java/com/diffplug/spotless/maven/java/LintSuppressionTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ void testNoSuppressionFailsOnWildcardImports() throws Exception {
3030
writePomWithJavaSteps("<forbidWildcardImports/>");
3131

3232
String path = "src/main/java/TestFile.java";
33-
setFile(path).toResource("java/removewildcardimports/JavaCodeWildcardsUnformatted.test");
33+
setFile(path).toResource("java/forbidwildcardimports/JavaCodeWildcardsUnformatted.test");
3434

3535
expectSelfieErrorMsg(mavenRunner().withArguments("spotless:check").runHasError()).toBe("""
3636
Failed to execute goal com.diffplug.spotless:spotless-maven-plugin:VERSION:check (default-cli) on project spotless-maven-plugin-tests: Unable to format file ${PROJECT_DIR}/src/main/java/TestFile.java
@@ -58,8 +58,8 @@ void testSuppressByFilePath() throws Exception {
5858
String suppressedFile = "src/main/java/TestFile1.java";
5959
String unsuppressedFile = "src/main/java/TestFile2.java";
6060

61-
setFile(suppressedFile).toResource("java/removewildcardimports/JavaCodeWildcardsUnformatted.test");
62-
setFile(unsuppressedFile).toResource("java/removewildcardimports/JavaCodeWildcardsUnformatted.test");
61+
setFile(suppressedFile).toResource("java/forbidwildcardimports/JavaCodeWildcardsUnformatted.test");
62+
setFile(unsuppressedFile).toResource("java/forbidwildcardimports/JavaCodeWildcardsUnformatted.test");
6363

6464
var result = mavenRunner().withArguments("spotless:check").runHasError();
6565
assertThat(result.stdOutUtf8()).contains("TestFile2.java");
@@ -79,7 +79,7 @@ void testSuppressByStep() throws Exception {
7979
"</lintSuppressions>");
8080

8181
String path = "src/main/java/TestFile.java";
82-
setFile(path).toResource("java/removewildcardimports/JavaCodeWildcardsUnformatted.test");
82+
setFile(path).toResource("java/forbidwildcardimports/JavaCodeWildcardsUnformatted.test");
8383

8484
// Should succeed because we suppressed the entire step
8585
mavenRunner().withArguments("spotless:check").runNoError();
@@ -99,7 +99,7 @@ void testSuppressByShortCode() throws Exception {
9999
"</lintSuppressions>");
100100

101101
String path = "src/main/java/TestFile.java";
102-
setFile(path).toResource("java/removewildcardimports/JavaCodeWildcardsUnformatted.test");
102+
setFile(path).toResource("java/forbidwildcardimports/JavaCodeWildcardsUnformatted.test");
103103

104104
// Should succeed because we suppressed all error codes
105105
mavenRunner().withArguments("spotless:check").runNoError();
@@ -126,9 +126,9 @@ void testMultipleSuppressionsWork() throws Exception {
126126
String file2 = "src/main/java/TestFile2.java";
127127
String file3 = "src/main/java/TestFile3.java";
128128

129-
setFile(file1).toResource("java/removewildcardimports/JavaCodeWildcardsUnformatted.test");
130-
setFile(file2).toResource("java/removewildcardimports/JavaCodeWildcardsUnformatted.test");
131-
setFile(file3).toResource("java/removewildcardimports/JavaCodeWildcardsUnformatted.test");
129+
setFile(file1).toResource("java/forbidwildcardimports/JavaCodeWildcardsUnformatted.test");
130+
setFile(file2).toResource("java/forbidwildcardimports/JavaCodeWildcardsUnformatted.test");
131+
setFile(file3).toResource("java/forbidwildcardimports/JavaCodeWildcardsUnformatted.test");
132132

133133
var result = mavenRunner().withArguments("spotless:check").runHasError();
134134
assertThat(result.stdOutUtf8()).contains("TestFile3.java");

testlib/src/main/resources/java/removewildcardimports/JavaCodeNoWildcardsFormatted.test renamed to testlib/src/main/resources/java/forbidwildcardimports/JavaCodeNoWildcardsFormatted.test

File renamed without changes.

testlib/src/main/resources/java/removewildcardimports/JavaCodeNoWildcardsUnformatted.test renamed to testlib/src/main/resources/java/forbidwildcardimports/JavaCodeNoWildcardsUnformatted.test

File renamed without changes.

testlib/src/main/resources/java/removewildcardimports/JavaCodeWildcardsFormatted.test renamed to testlib/src/main/resources/java/forbidwildcardimports/JavaCodeWildcardsFormatted.test

File renamed without changes.

testlib/src/main/resources/java/removewildcardimports/JavaCodeWildcardsUnformatted.test renamed to testlib/src/main/resources/java/forbidwildcardimports/JavaCodeWildcardsUnformatted.test

File renamed without changes.

0 commit comments

Comments
 (0)