Merge pull request #300 from diffplug/feature/windowsEclipseCommonTests

nedtwigg · web-flow · commit a2fe993f1c7e · 2018-09-12T01:42:57.000-07:00
EclipseCommonTests are no longer sensitive to line-ending problems.
diff --git a/lib-extra/src/test/java/com/diffplug/spotless/extra/eclipse/EclipseCommonTests.java b/lib-extra/src/test/java/com/diffplug/spotless/extra/eclipse/EclipseCommonTests.java
@@ -22,6 +22,7 @@
 import org.junit.Test;
 
 import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.LineEnding;
 import com.diffplug.spotless.ResourceHarness;
 
 /**
@@ -78,7 +79,7 @@ public void testSupportedVersions() throws Exception {
 			}
 			String output = null;
 			try {
-				output = step.format(input, inputFile);
+				output = LineEnding.toUnix(step.format(input, inputFile));
 			} catch (Exception e) {
 				fail("Exception occured when formatting input with version: " + version, e);
 			}

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`import org.junit.Test;`
`23`	`23`
`24`	`24`	`import com.diffplug.spotless.FormatterStep;`
	`25`	`+import com.diffplug.spotless.LineEnding;`
`25`	`26`	`import com.diffplug.spotless.ResourceHarness;`
`26`	`27`
`27`	`28`	`/**`
`@@ -78,7 +79,7 @@ public void testSupportedVersions() throws Exception {`
`78`	`79`	`}`
`79`	`80`	`String output = null;`
`80`	`81`	`try {`
`81`		`- output = step.format(input, inputFile);`
	`82`	`+ output = LineEnding.toUnix(step.format(input, inputFile));`
`82`	`83`	`} catch (Exception e) {`
`83`	`84`	`fail("Exception occured when formatting input with version: " + version, e);`
`84`	`85`	`}`