-
Notifications
You must be signed in to change notification settings - Fork 486
removeWildcardImports: throw new AssertionError instead of removing #2557
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
a93a424
removeWildcardImports: throw new AssertionError instead of removing
b846b0b
removeWildcardImports: throw new AssertionError instead of removing
730f211
Update lib/src/main/java/com/diffplug/spotless/java/RemoveWildcardImp…
Pankraz76 43adf9e
Merge remote-tracking branch 'f/fix-RemoveWildcardImportsStep' into f…
777f496
removeWildcardImports: throw new AssertionError instead of removing
0956a48
removeWildcardImports: throw new AssertionError instead of removing
350b8a4
wip
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,19 +15,49 @@ | |
*/ | ||
package com.diffplug.spotless.maven.java; | ||
|
||
import static org.assertj.core.api.Assertions.assertThat; | ||
|
||
import com.diffplug.spotless.FormatterStep; | ||
|
||
import com.diffplug.spotless.StepHarnessWithFile; | ||
import com.diffplug.spotless.TestProvisioner; | ||
import com.diffplug.spotless.kotlin.KtLintStep; | ||
|
||
import org.assertj.core.api.AbstractStringAssert; | ||
import org.junit.jupiter.api.BeforeEach; | ||
import org.junit.jupiter.api.Test; | ||
|
||
import com.diffplug.spotless.maven.MavenIntegrationHarness; | ||
|
||
class RemoveWildcardImportsStepTest extends MavenIntegrationHarness { | ||
|
||
private static final String ERROR = "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"; | ||
|
||
@BeforeEach | ||
void init() throws Exception { | ||
writePomWithJavaSteps("<removeWildcardImports/>"); | ||
} | ||
|
||
@Test | ||
void testRemoveWildcardImports() throws Exception { | ||
writePomWithJavaSteps("<removeWildcardImports/>"); | ||
setFile(PATH).toResource("java/removewildcardimports/JavaCodeWildcardsUnformatted.test"); | ||
assertFile(PATH).sameAsResource("java/removewildcardimports/JavaCodeWildcardsFormatted.test"); | ||
AbstractStringAssert<?> abstractStringAssert = assertThat(mavenRunner().withArguments("spotless:apply").runHasError().stdOutUtf8()); | ||
abstractStringAssert | ||
.contains(ERROR) | ||
.contains("11111") | ||
; | ||
|
||
String path = "src/main/java/test.java"; | ||
setFile(path).toResource("java/removewildcardimports/JavaCodeWildcardsUnformatted.test"); | ||
FormatterStep step = KtLintStep.create("0.49.0", TestProvisioner.mavenCentral()); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. meant to validate only the removeWildcardImports behavior, Is it just for testing...... pulling in a KtLint step is not required here. |
||
StepHarnessWithFile.forStep(this, step) | ||
.testResource("java/removewildcardimports/JavaCodeWildcardsUnformatted.test", "java/removewildcardimports/JavaCodeWildcardsFormatted.test") | ||
.expectLintsOfResource("kotlin/ktlint/unsolvable.dirty").toBe("L1 ktlint(standard:no-wildcard-imports) Wildcard import"); | ||
} | ||
|
||
@Test | ||
void testRemoveWildcardImportsNoError() throws Exception { | ||
setFile(PATH).toResource("java/removewildcardimports/JavaCodeNoWildcardsUnformatted.test"); | ||
assertFile(PATH).sameAsResource("java/removewildcardimports/JavaCodeNoWildcardsUnformatted.test"); | ||
mavenRunner().withArguments("spotless:apply").runNoError(); | ||
assertFile(path).sameAsResource("java/removewildcardimports/JavaCodeWildcardsFormatted.test"); | ||
} | ||
} |
4 changes: 4 additions & 0 deletions
4
testlib/src/main/resources/java/removewildcardimports/JavaCodeNoWildcardsFormatted.test
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
import java.util.List; | ||
import mylib.Helper; | ||
|
||
public class Test {} |
4 changes: 4 additions & 0 deletions
4
testlib/src/main/resources/java/removewildcardimports/JavaCodeNoWildcardsUnformatted.test
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
import java.util.List; | ||
import mylib.Helper; | ||
|
||
public class Test {} |
5 changes: 5 additions & 0 deletions
5
testlib/src/main/resources/java/removewildcardimports/JavaCodeWildcardsFormatted.test
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,9 @@ | ||
import java.util.*; | ||
import static java.util.Collections.*; | ||
import java.util.List; | ||
import mylib.Helper; | ||
import io.quarkus.maven.dependency.*; | ||
import static io.quarkus.vertx.web.Route.HttpMethod.*; | ||
import static org.springframework.web.reactive.function.BodyInserters.*; | ||
|
||
public class Test {} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.