Skip to content

Commit 57f2b91

Browse files
author
Vincent Potucek
committed
removeWildcardImports: throw new AssertionError instead of removing
1 parent b7c829e commit 57f2b91

File tree

7 files changed

+54
-4
lines changed

7 files changed

+54
-4
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
import com.diffplug.spotless.ResourceHarness;
4747

4848
public class MavenIntegrationHarness extends ResourceHarness {
49+
50+
protected static final String PATH = "src/main/java/test.java";
4951
/**
5052
* To run tests in the IDE, run {@code gradlew :plugin-maven:changelogPrint}, then
5153
* put the last version it prints into {@code SPOTLESS_MAVEN_VERSION_IDE}. From now

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

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,40 @@
1515
*/
1616
package com.diffplug.spotless.maven.java;
1717

18+
import static org.assertj.core.api.Assertions.assertThat;
19+
20+
import org.junit.jupiter.api.BeforeEach;
1821
import org.junit.jupiter.api.Test;
1922

2023
import com.diffplug.spotless.maven.MavenIntegrationHarness;
2124

2225
class RemoveWildcardImportsStepTest extends MavenIntegrationHarness {
2326

27+
private static final String ERROR = "Do not use wildcard imports. 'spotlessApply' cannot resolve this issue.";
28+
29+
@BeforeEach
30+
void init() throws Exception {
31+
writePomWithJavaSteps("<removeWildcardImports/>");
32+
}
33+
2434
@Test
2535
void testRemoveWildcardImports() throws Exception {
26-
writePomWithJavaSteps("<removeWildcardImports/>");
36+
setFile(PATH).toResource("java/removewildcardimports/JavaCodeWildcardsFormatted.test");
37+
assertFile(PATH).sameAsResource("java/removewildcardimports/JavaCodeWildcardsFormatted.test");
38+
assertThat(mavenRunner().withArguments("spotless:apply").runHasError().stdOutUtf8()).contains(ERROR);
39+
}
2740

28-
String path = "src/main/java/test.java";
29-
setFile(path).toResource("java/removewildcardimports/JavaCodeWildcardsUnformatted.test");
41+
@Test
42+
void testRemoveStaticWildcardImports() throws Exception {
43+
setFile(PATH).toResource("java/removewildcardimports/JavaCodeStaticWildcardsFormatted.test");
44+
assertFile(PATH).sameAsResource("java/removewildcardimports/JavaCodeStaticWildcardsFormatted.test");
45+
assertThat(mavenRunner().withArguments("spotless:apply").runHasError().stdOutUtf8()).contains(ERROR);
46+
}
47+
48+
@Test
49+
void testRemoveWildcardImportsNoError() throws Exception {
50+
setFile(PATH).toResource("java/removewildcardimports/JavaCodeNoWildcardsUnformatted.test");
51+
assertFile(PATH).sameAsResource("java/removewildcardimports/JavaCodeNoWildcardsUnformatted.test");
3052
mavenRunner().withArguments("spotless:apply").runNoError();
31-
assertFile(path).sameAsResource("java/removewildcardimports/JavaCodeWildcardsFormatted.test");
3253
}
3354
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import java.util.List;
2+
import mylib.Helper;
3+
4+
public class Test {}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import java.util.List;
2+
import mylib.Helper;
3+
4+
public class Test {}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import java.util.*;
2+
import static java.util.Collections.*;
3+
import java.util.List;
4+
import mylib.Helper;
5+
import io.quarkus.maven.dependency.*;
6+
import static io.quarkus.vertx.web.Route.HttpMethod.*;
7+
import static org.springframework.web.reactive.function.BodyInserters.*;
8+
9+
public class Test {}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import java.util.List;
2+
import mylib.Helper;
3+
import static io.quarkus.vertx.web.Route.HttpMethod.*;
4+
5+
public class Test {}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1+
import java.util.*;
2+
import static java.util.Collections.*;
13
import java.util.List;
24
import mylib.Helper;
5+
import io.quarkus.maven.dependency.*;
6+
import static io.quarkus.vertx.web.Route.HttpMethod.*;
7+
import static org.springframework.web.reactive.function.BodyInserters.*;
38

49
public class Test {}

0 commit comments

Comments
 (0)