Skip to content

Commit 7958dcc

Browse files
nedtwiggnedtwigg
committed
Moved all test resources into testlib/src/main. Exposes that we've got weird newline issues in our integration tests that we were suppressing by adding random newlines.
1 parent 96b2071 commit 7958dcc

122 files changed

Lines changed: 33 additions & 684 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ For the folders below in monospace text, they are published on maven central at
3232
| Folder | Description |
3333
| ------ | ----------- |
3434
| `lib` | Contains all of Spotless' core infrastructure and most of its `FormatterStep` - has no external dependencies. |
35-
| `testlib` | Contains testing infrastructure, as well as all tests for `spotless-lib`, since those tests need the testing infrastructure in `testlib`. |
35+
| `testlib` | Contains testing infrastructure and all test resources, so that they can be reused in plugin-specific integration tests. Also contains tests for `lib`. |
3636
| `lib-extra` | Contains the optional parts of Spotless which require external dependencies. `LineEnding.GIT_ATTRIBUTES` won't work unless `lib-extra` is available. |
3737
| `plugin-gradle` | Integrates spotless and all of its formatters into Gradle. |
3838
| `plugin-maven` | Integrates spotless and all of its formatters into Maven. |

‎lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseFormatterStepTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,21 @@
3030
public class EclipseFormatterStepTest extends ResourceHarness {
3131
@Test
3232
public void loadPropertiesSettings() throws Throwable {
33-
List<File> eclipseFormatFile = createTestFiles("java/eclipse/format/formatter.properties");
33+
List<File> eclipseFormatFile = createTestFiles("java/eclipse/formatter.properties");
3434
StepHarness.forStep(EclipseFormatterStep.create(eclipseFormatFile, TestProvisioner.mavenCentral()))
35-
.testResource("java/eclipse/format/JavaCodeUnformatted.test", "java/eclipse/format/JavaCodeFormatted.test");
35+
.testResource("java/eclipse/JavaCodeUnformatted.test", "java/eclipse/JavaCodeFormatted.test");
3636
}
3737

3838
@Test
3939
public void loadXmlSettings() throws Throwable {
40-
List<File> eclipseFormatFile = createTestFiles("java/eclipse/format/formatter.xml");
40+
List<File> eclipseFormatFile = createTestFiles("java/eclipse/formatter.xml");
4141
StepHarness.forStep(EclipseFormatterStep.create(eclipseFormatFile, TestProvisioner.mavenCentral()))
42-
.testResource("java/eclipse/format/JavaCodeUnformatted.test", "java/eclipse/format/JavaCodeFormatted.test");
42+
.testResource("java/eclipse/JavaCodeUnformatted.test", "java/eclipse/JavaCodeFormatted.test");
4343
}
4444

4545
@Test
4646
public void longLiteralProblem() throws Throwable {
47-
String folder = "java/eclipse/format/long_literals/";
47+
String folder = "java/eclipse/long_literals/";
4848
List<File> eclipseFormatFile = createTestFiles(folder + "spotless.eclipseformat.xml");
4949
StepHarness.forStep(EclipseFormatterStep.create(eclipseFormatFile, TestProvisioner.mavenCentral()))
5050
.testResourceUnaffected(folder + "Example1.test")
@@ -53,8 +53,8 @@ public void longLiteralProblem() throws Throwable {
5353

5454
@Test
5555
public void equality() throws IOException {
56-
List<File> xmlFile = createTestFiles("java/eclipse/format/formatter.xml");
57-
List<File> propFile = createTestFiles("java/eclipse/format/formatter.properties");
56+
List<File> xmlFile = createTestFiles("java/eclipse/formatter.xml");
57+
List<File> propFile = createTestFiles("java/eclipse/formatter.properties");
5858
new SerializableEqualityTester() {
5959
List<File> settingsFiles;
6060

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ private void writeContentWithBadFormatting() throws IOException {
4646
protected void applyIsUpToDate(boolean upToDate) throws IOException {
4747
super.applyIsUpToDate(upToDate);
4848
String result = read("README.md");
49-
Assert.assertEquals("abc\n", result);
49+
Assert.assertEquals("abc", result);
5050
}
5151

5252
@Test

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@ public void integration() throws IOException {
3838
write("README.md", "ABC");
3939
gradleRunner().withArguments("spotlessApply").build();
4040
String result = read("README.md");
41-
Assert.assertEquals("abc\n", result);
41+
Assert.assertEquals("abc", result);
4242
}
4343
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void defaultIsUtf8() throws Exception {
3737
"}");
3838
write("test.java", "µ");
3939
gradleRunner().withArguments("spotlessApply").build();
40-
Assert.assertEquals("A\n", read("test.java"));
40+
Assert.assertEquals("A", read("test.java"));
4141
}
4242

4343
@Test
@@ -55,7 +55,7 @@ public void globalIsRespected() throws Exception {
5555
"}");
5656
write("test.java", "µ");
5757
gradleRunner().withArguments("spotlessApply").build();
58-
Assert.assertEquals("??\n", read("test.java"));
58+
Assert.assertEquals("??", read("test.java"));
5959
}
6060

6161
@Test
@@ -78,10 +78,10 @@ public void globalIsRespectedButCanBeOverridden() throws Exception {
7878
"}");
7979
write("test.java", "µ");
8080
write("utf32.encoded", LineEnding.UNIX, Charset.forName("UTF-32"), "µ");
81-
Assert.assertEquals("µ\n", read("utf32.encoded", Charset.forName("UTF-32")));
81+
Assert.assertEquals("µ", read("utf32.encoded", Charset.forName("UTF-32")));
8282

8383
gradleRunner().withArguments("spotlessApply").build();
84-
Assert.assertEquals("??\n", read("test.java"));
85-
Assert.assertEquals("A\n", read("utf32.encoded", Charset.forName("UTF-32")));
84+
Assert.assertEquals("??", read("test.java"));
85+
Assert.assertEquals("A", read("utf32.encoded", Charset.forName("UTF-32")));
8686
}
8787
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void integration() throws IOException {
3333
"",
3434
"spotless {",
3535
" java {",
36-
" googleJavaFormat()",
36+
" googleJavaFormat('1.2')",
3737
" }",
3838
"}");
3939
String input = getTestResource("java/googlejavaformat/JavaCodeUnformatted.test");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public void integration_lint_script_files_without_top_level_declaration() throws
9393
write("configuration.gradle.kts", "buildscript {}");
9494
gradleRunner().withArguments("spotlessApply").build();
9595
String result = read("configuration.gradle.kts");
96-
String formatted = "buildscript {}\n";
96+
String formatted = "buildscript {}";
9797
Assert.assertEquals(formatted, result);
9898
}
9999
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public void integration() throws IOException {
3838
write("scalafmt.conf", getTestResource("scala/scalafmt/scalafmt.conf"));
3939
gradleRunner().withArguments("spotlessApply").build();
4040
String result = read("src/main/scala/basic.scala");
41-
String formatted = getTestResource("scala/scalafmt/basic.clean");
41+
String formatted = getTestResource("scala/scalafmt/basic.cleanWithCustomConf");
4242
Assert.assertEquals(formatted, result);
4343
}
4444
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void should_format_sql_with_alternative_configuration() throws IOExceptio
5656
"}");
5757

5858
File sqlFile = write("src/main/resources/aFolder/create.sql", getTestResource("sql/dbeaver/create.dirty"));
59-
write("myConfig.properties", getTestResource("sql/dbeaver/myConfig.properties"));
59+
write("myConfig.properties", getTestResource("sql/dbeaver/sqlConfig2.properties"));
6060

6161
// Run
6262
gradleRunner().withArguments("spotlessApply").build();

‎plugin-gradle/src/test/resources/freshmark/FreshMarkFormatted.test‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)