-
Notifications
You must be signed in to change notification settings - Fork 459
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
Allow skipping targets based on text they contain #1749
Closed
oldergod
wants to merge
2
commits into
diffplug:main
from
sandboxing:bquenaudon.2023-07-08.filterfileconsuming
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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 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 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 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 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
141 changes: 141 additions & 0 deletions
141
...gradle/src/test/java/com/diffplug/gradle/spotless/TargetExcludeIfContentContainsTest.java
This file contains 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,141 @@ | ||
/* | ||
* Copyright 2020-2023 DiffPlug | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package com.diffplug.gradle.spotless; | ||
|
||
import java.io.IOException; | ||
|
||
import org.junit.jupiter.api.Test; | ||
|
||
class TargetExcludeIfContentContainsTest extends GradleIntegrationHarness { | ||
@Test | ||
void targetExcludeIfContentContainsWithOneValue() throws IOException { | ||
setFile("build.gradle").toLines( | ||
"plugins { id 'com.diffplug.spotless' }", | ||
"spotless {", | ||
" format 'toLower', {", | ||
" target '**/*.md'", | ||
" targetExcludeIfContentContains '// Generated by Mr. Roboto'", | ||
" custom 'lowercase', { str -> str.toLowerCase() }", | ||
" }", | ||
"}"); | ||
String content = "// Generated by Mr. Roboto, do not edit.\n" + | ||
"A B C\n" + | ||
"D E F\n" + | ||
"G H I"; | ||
setFile("test_generated.md").toContent(content); | ||
setFile("test_manual.md").toLines( | ||
"A B C", | ||
"D E F", | ||
"G H I"); | ||
gradleRunner().withArguments("spotlessApply").build(); | ||
// `test_generated` contains the excluding text so didn't change. | ||
assertFile("test_generated.md").hasContent(content); | ||
// `test_manual` does not so it changed. | ||
assertFile("test_manual.md").hasLines( | ||
"a b c", | ||
"d e f", | ||
"g h i"); | ||
} | ||
|
||
@Test | ||
void targetExcludeIfContentContainsWithMultipleSteps() throws IOException { | ||
setFile("build.gradle").toLines( | ||
"plugins { id 'com.diffplug.spotless' }", | ||
"spotless {", | ||
" format 'toLower', {", | ||
" target '**/*.md'", | ||
" targetExcludeIfContentContains '// Generated by Mr. Roboto'", | ||
" custom 'lowercase', { str -> str.toLowerCase() }", | ||
" licenseHeader('" + "// My CopyRights header" + "', '--')", | ||
" }", | ||
"}"); | ||
String generatedContent = "// Generated by Mr. Roboto, do not edit.\n" + | ||
"--\n" + | ||
"public final class MyMessage {}\n"; | ||
setFile("test_generated.md").toContent(generatedContent); | ||
String manualContent = "// Typo in License\n" + | ||
"--\n" + | ||
"public final class MyMessage {\n" + | ||
"}"; | ||
setFile("test_manual.md").toContent(manualContent); | ||
gradleRunner().withArguments("spotlessApply").build(); | ||
|
||
// `test_generated` contains the excluding text so didn't change, including the header. | ||
assertFile("test_generated.md").hasContent(generatedContent); | ||
// `test_manual` does not, it changed. | ||
assertFile("test_manual.md").hasContent( | ||
"// My CopyRights header\n" + | ||
"--\n" + | ||
"public final class mymessage {\n" + | ||
"}"); | ||
} | ||
|
||
@Test | ||
void targetExcludeIfContentContainsWithMultipleValues() throws IOException { | ||
setFile("build.gradle").toLines( | ||
"plugins { id 'com.diffplug.spotless' }", | ||
"spotless {", | ||
" format 'toLower', {", | ||
" target '**/*.md'", | ||
" targetExcludeIfContentContains '// Generated by Mr. Roboto|// Generated by Mrs. Call'", | ||
" custom 'lowercase', { str -> str.toLowerCase() }", | ||
" }", | ||
"}"); | ||
String robotoContent = "A B C\n" + | ||
"// Generated by Mr. Roboto, do not edit.\n" + | ||
"D E F\n" + | ||
"G H I"; | ||
setFile("test_generated_roboto.md").toContent(robotoContent); | ||
String callContent = "A B C\n" + | ||
"D E F\n" + | ||
"// Generated by Mrs. Call, do not edit.\n" + | ||
"G H I"; | ||
setFile("test_generated_call.md").toContent(callContent); | ||
String collaborationContent = "A B C\n" + | ||
"// Generated by Mr. Roboto, do not edit.\n" + | ||
"D E F\n" + | ||
"// Generated by Mrs. Call, do not edit.\n" + | ||
"G H I"; | ||
setFile("test_generated_collaboration.md").toContent(collaborationContent); | ||
String intruderContent = "A B C\n" + | ||
"// Generated by K2000, do not edit.\n" + | ||
"D E F\n" + | ||
"G H I"; | ||
setFile("test_generated_intruder.md").toContent(intruderContent); | ||
setFile("test_manual.md").toLines( | ||
"A B C", | ||
"D E F", | ||
"G H I"); | ||
gradleRunner().withArguments("spotlessApply").build(); | ||
// Part of the excluding values so has not changed. | ||
assertFile("test_generated_roboto.md").hasContent(robotoContent); | ||
// Part of the excluding values so has not changed. | ||
assertFile("test_generated_call.md").hasContent(callContent); | ||
// Part of the excluding values so has not changed. | ||
assertFile("test_generated_collaboration.md").hasContent(collaborationContent); | ||
// Not part of the excluding values so has changed. | ||
assertFile("test_generated_intruder.md").hasContent( | ||
"a b c\n" + | ||
"// generated by k2000, do not edit.\n" + | ||
"d e f\n" + | ||
"g h i"); | ||
// `test_manual` does not, it changed. | ||
assertFile("test_manual.md").hasLines( | ||
"a b c", | ||
"d e f", | ||
"g h i"); | ||
} | ||
} |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can update this one directly if you don't mind having an API change.