Skip to content

Commit 563ea50

Browse files
nedtwiggnedtwigg
committed
Update tests for post-buildscript-repo.
1 parent 9a1cef4 commit 563ea50

12 files changed

+28
-28
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ class ConfigAvoidanceTest extends GradleIntegrationHarness {
2424
@Test
2525
void noConfigOnHelp() throws IOException {
2626
setFile("build.gradle").toLines(
27-
"buildscript { repositories { mavenCentral() } }",
2827
"plugins {",
2928
" id 'com.diffplug.spotless'",
3029
"}",
30+
"repositories { mavenCentral() }",
3131
"apply plugin: 'java'",
3232
"spotless {",
3333
" java {",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ protected void runTasks(String... tasks) throws IOException {
3737
@Test
3838
public void helpConfigures() throws IOException {
3939
setFile("build.gradle").toLines(
40-
"buildscript { repositories { mavenCentral() } }",
4140
"plugins {",
4241
" id 'com.diffplug.spotless'",
4342
"}",
43+
"repositories { mavenCentral() }",
4444
"apply plugin: 'java'",
4545
"spotless {",
4646
" java {",
@@ -53,10 +53,10 @@ public void helpConfigures() throws IOException {
5353
@Test
5454
public void helpConfiguresIfTasksAreCreated() throws IOException {
5555
setFile("build.gradle").toLines(
56-
"buildscript { repositories { mavenCentral() } }",
5756
"plugins {",
5857
" id 'com.diffplug.spotless'",
5958
"}",
59+
"repositories { mavenCentral() }",
6060
"apply plugin: 'java'",
6161
"spotless {",
6262
" java {",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ class FilePermissionsTest extends GradleIntegrationHarness {
3232
@DisabledOnOs(WINDOWS)
3333
void spotlessApplyShouldPreservePermissions() throws IOException {
3434
setFile("build.gradle").toLines(
35-
"buildscript { repositories { mavenCentral() } }",
3635
"plugins {",
3736
" id 'com.diffplug.spotless'",
3837
"}",
38+
"repositories { mavenCentral() }",
3939
"",
4040
"spotless {",
4141
" java {",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ class FreshMarkExtensionTest extends GradleIntegrationHarness {
2727
@EnabledForJreRange(max = JAVA_14)
2828
void integration() throws IOException {
2929
setFile("build.gradle").toLines(
30-
"buildscript { repositories { mavenCentral() } }",
3130
"plugins {",
3231
" id 'java'",
3332
" id 'com.diffplug.spotless'",
3433
"}",
34+
"repositories { mavenCentral() }",
3535
"spotless {",
3636
" freshmark {",
3737
" target '*.md'",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ class GoogleJavaFormatIntegrationTest extends GradleIntegrationHarness {
2323
@Test
2424
void integration() throws IOException {
2525
setFile("build.gradle").toLines(
26-
"buildscript { repositories { mavenCentral() } }",
2726
"plugins {",
2827
" id 'com.diffplug.spotless'",
2928
"}",
29+
"repositories { mavenCentral() }",
3030
"",
3131
"spotless {",
3232
" java {",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ class IndependentTaskTest extends GradleIntegrationHarness {
2323
@Test
2424
void independent() throws IOException {
2525
setFile("build.gradle").toLines(
26-
"buildscript { repositories { mavenCentral() } }",
2726
"plugins {",
2827
" id 'com.diffplug.spotless'",
2928
"}",
29+
"repositories { mavenCentral() }",
3030
"",
3131
"import com.diffplug.gradle.spotless.JavaExtension",
3232
"",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ class JavaDefaultTargetTest extends GradleIntegrationHarness {
2323
@Test
2424
void integration() throws IOException {
2525
setFile("build.gradle").toLines(
26-
"buildscript { repositories { mavenCentral() } }",
2726
"plugins {",
2827
" id 'com.diffplug.spotless'",
2928
"}",
29+
"repositories { mavenCentral() }",
3030
"",
3131
"apply plugin: 'groovy'",
3232
"",
@@ -49,11 +49,11 @@ void integration() throws IOException {
4949
@Test
5050
void multipleBlocksShouldWork() throws IOException {
5151
setFile("build.gradle").toLines(
52-
"buildscript { repositories { mavenCentral() } }",
5352
"plugins {",
5453
" id 'com.diffplug.spotless'",
5554
" id 'java'",
5655
"}",
56+
"repositories { mavenCentral() }",
5757
"",
5858
"spotless {",
5959
" java { googleJavaFormat() }",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ class JsonExtensionTest extends GradleIntegrationHarness {
2323
@Test
2424
void defaultFormatting() throws IOException {
2525
setFile("build.gradle").toLines(
26-
"buildscript { repositories { mavenCentral() } }",
2726
"plugins {",
2827
" id 'java'",
2928
" id 'com.diffplug.spotless'",
3029
"}",
30+
"repositories { mavenCentral() }",
3131
"spotless {",
3232
" json {",
3333
" target 'examples/**/*.json'",
@@ -44,11 +44,11 @@ void defaultFormatting() throws IOException {
4444
@Test
4545
void formattingWithCustomNumberOfSpaces() throws IOException {
4646
setFile("build.gradle").toLines(
47-
"buildscript { repositories { mavenCentral() } }",
4847
"plugins {",
4948
" id 'java'",
5049
" id 'com.diffplug.spotless'",
5150
"}",
51+
"repositories { mavenCentral() }",
5252
"spotless {",
5353
" json {",
5454
" target 'src/**/*.json'",

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ class PrettierIntegrationTest extends GradleIntegrationHarness {
2828
@Test
2929
void useInlineConfig() throws IOException {
3030
setFile("build.gradle").toLines(
31-
"buildscript { repositories { mavenCentral() } }",
3231
"plugins {",
3332
" id 'com.diffplug.spotless'",
3433
"}",
34+
"repositories { mavenCentral() }",
3535
"def prettierConfig = [:]",
3636
"prettierConfig['printWidth'] = 50",
3737
"prettierConfig['parser'] = 'typescript'",
@@ -50,10 +50,10 @@ void useInlineConfig() throws IOException {
5050
@Test
5151
void verifyCleanSpotlessCheckWorks() throws IOException {
5252
setFile("build.gradle").toLines(
53-
"buildscript { repositories { mavenCentral() } }",
5453
"plugins {",
5554
" id 'com.diffplug.spotless'",
5655
"}",
56+
"repositories { mavenCentral() }",
5757
"def prettierConfig = [:]",
5858
"prettierConfig['printWidth'] = 50",
5959
"prettierConfig['parser'] = 'typescript'",
@@ -75,10 +75,10 @@ void verifyCleanSpotlessCheckWorks() throws IOException {
7575
void useFileConfig() throws IOException {
7676
setFile(".prettierrc.yml").toResource("npm/prettier/config/.prettierrc.yml");
7777
setFile("build.gradle").toLines(
78-
"buildscript { repositories { mavenCentral() } }",
7978
"plugins {",
8079
" id 'com.diffplug.spotless'",
8180
"}",
81+
"repositories { mavenCentral() }",
8282
"spotless {",
8383
" format 'mytypescript', {",
8484
" target 'test.ts'",
@@ -94,10 +94,10 @@ void useFileConfig() throws IOException {
9494
@Test
9595
void chooseParserBasedOnFilename() throws IOException {
9696
setFile("build.gradle").toLines(
97-
"buildscript { repositories { mavenCentral() } }",
9897
"plugins {",
9998
" id 'com.diffplug.spotless'",
10099
"}",
100+
"repositories { mavenCentral() }",
101101
"spotless {",
102102
" format 'webResources', {",
103103
" target 'dirty.*'",
@@ -113,10 +113,10 @@ void chooseParserBasedOnFilename() throws IOException {
113113
@Test
114114
void useJavaCommunityPlugin() throws IOException {
115115
setFile("build.gradle").toLines(
116-
"buildscript { repositories { mavenCentral() } }",
117116
"plugins {",
118117
" id 'com.diffplug.spotless'",
119118
"}",
119+
"repositories { mavenCentral() }",
120120
"def prettierConfig = [:]",
121121
"prettierConfig['tabWidth'] = 4",
122122
"prettierConfig['parser'] = 'java'",
@@ -138,10 +138,10 @@ void useJavaCommunityPlugin() throws IOException {
138138
@Test
139139
void usePhpCommunityPlugin() throws IOException {
140140
setFile("build.gradle").toLines(
141-
"buildscript { repositories { mavenCentral() } }",
142141
"plugins {",
143142
" id 'com.diffplug.spotless'",
144143
"}",
144+
"repositories { mavenCentral() }",
145145
"def prettierConfig = [:]",
146146
"prettierConfig['tabWidth'] = 3",
147147
"prettierConfig['parser'] = 'php'",
@@ -165,10 +165,10 @@ void autodetectNpmrcFileConfig() throws IOException {
165165
setFile(".npmrc").toLines(
166166
"registry=https://i.do.no.exist.com");
167167
setFile("build.gradle").toLines(
168-
"buildscript { repositories { mavenCentral() } }",
169168
"plugins {",
170169
" id 'com.diffplug.spotless'",
171170
"}",
171+
"repositories { mavenCentral() }",
172172
"def prettierConfig = [:]",
173173
"prettierConfig['printWidth'] = 50",
174174
"prettierConfig['parser'] = 'typescript'",
@@ -188,10 +188,10 @@ void pickupNpmrcFileConfig() throws IOException {
188188
setFile(".custom_npmrc").toLines(
189189
"registry=https://i.do.no.exist.com");
190190
setFile("build.gradle").toLines(
191-
"buildscript { repositories { mavenCentral() } }",
192191
"plugins {",
193192
" id 'com.diffplug.spotless'",
194193
"}",
194+
"repositories { mavenCentral() }",
195195
"def prettierConfig = [:]",
196196
"prettierConfig['printWidth'] = 50",
197197
"prettierConfig['parser'] = 'typescript'",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ void registerDependencies() throws IOException {
2626
setFile("settings.gradle")
2727
.toLines("include 'sub'");
2828
setFile("build.gradle").toLines(
29-
"buildscript { repositories { mavenCentral() } }",
30-
"plugins { id 'com.diffplug.spotless' }");
29+
"plugins { id 'com.diffplug.spotless' }",
30+
"repositories { mavenCentral() }");
3131
setFile("sub/build.gradle").toLines(
3232
"apply plugin: 'com.diffplug.spotless'",
3333
"",

0 commit comments

Comments
 (0)