Refactor EquoResourceHarness to go through StepHarnessWithFile.

Author: nedtwigg

lib-extra/src/test/java/com/diffplug/spotless/extra/cpp/EclipseCdtFormatterStepTest.java

@@ -24,17 +24,16 @@
 import com.diffplug.spotless.extra.eclipse.EquoResourceHarness;
 
 class EclipseCdtFormatterStepTest extends EquoResourceHarness {
-	private final static String INPUT = "#include <a.h>;\nint main(int argc,   \nchar *argv[]) {}";
-	private final static String EXPECTED = "#include <a.h>;\nint main(int argc, char *argv[]) {\n}\n";
-
 	public EclipseCdtFormatterStepTest() {
-		super(EclipseCdtFormatterStep.createBuilder(TestProvisioner.mavenCentral()), INPUT, EXPECTED);
+		super(EclipseCdtFormatterStep.createBuilder(TestProvisioner.mavenCentral()));
 	}
 
 	@ParameterizedTest
 	@MethodSource
 	void formatWithVersion(String version) throws Exception {
-		assertFormatted(version);
+		harnessFor(version).test("main.c",
+				"#include <a.h>;\nint main(int argc,   \nchar *argv[]) {}",
+				"#include <a.h>;\nint main(int argc, char *argv[]) {\n}\n");
 	}
 
 	private static Stream<String> formatWithVersion() {

lib-extra/src/test/java/com/diffplug/spotless/extra/eclipse/EquoResourceHarness.java

@@ -15,14 +15,12 @@
  */
 package com.diffplug.spotless.extra.eclipse;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 import java.io.File;
 import java.util.Arrays;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.LineEnding;
 import com.diffplug.spotless.ResourceHarness;
+import com.diffplug.spotless.StepHarnessWithFile;
 import com.diffplug.spotless.extra.EquoBasedStepBuilder;
 
 /**
@@ -43,57 +41,19 @@
  */
 public class EquoResourceHarness extends ResourceHarness {
 	private final EquoBasedStepBuilder stepBuilder;
-	private final String fileName;
-	private final String input;
-	private final String expected;
-
-	/**
-	 * Create harness to be used for several versions of the formatter step
-	 * @param builder Eclipse Formatter step builder
-	 * @param unformatted Simple unformatted input
-	 * @param formatted Expected formatted output
-	 */
-	public EquoResourceHarness(EquoBasedStepBuilder builder, String unformatted, String formatted) {
-		this(builder, "someSourceFile", unformatted, formatted);
-	}
 
 	/**
 	 * Create harness to be used for several versions of the formatter step
 	 * @param builder Eclipse Formatter step builder
-	 * @param sourceFileName File name of the source file
-	 * @param unformatted Simple unformatted input
-	 * @param formatted Expected formatted output
 	 */
-	public EquoResourceHarness(EquoBasedStepBuilder builder, String sourceFileName, String unformatted, String formatted) {
+	public EquoResourceHarness(EquoBasedStepBuilder builder) {
 		stepBuilder = builder;
-		fileName = sourceFileName;
-		input = unformatted;
-		expected = formatted;
 	}
 
-	/**
-	 * Assert that formatting input results in expected output
-	 * @param formatterVersion Formatter version
-	 * @param settingsFiles Formatter settings
-	 * @return Formatted string
-	 */
-	protected String assertFormatted(String formatterVersion, File... settingsFiles) throws Exception {
-		String output = format(formatterVersion, settingsFiles);
-		assertThat(output).isEqualTo(expected);
-		return output;
-	}
-
-	/**
-	 * Formatting input results and returns output
-	 * @param formatterVersion Formatter version
-	 * @param settingsFiles Formatter settings
-	 * @return Formatted string
-	 */
-	protected String format(String formatterVersion, File... settingsFiles) throws Exception {
-		File inputFile = setFile(fileName).toContent(input);
+	protected StepHarnessWithFile harnessFor(String formatterVersion, File... settingsFiles) throws Exception {
 		stepBuilder.setVersion(formatterVersion);
 		stepBuilder.setPreferences(Arrays.asList(settingsFiles));
 		FormatterStep step = stepBuilder.build();
-		return LineEnding.toUnix(step.format(input, inputFile));
+		return StepHarnessWithFile.forStep(this, step);
 	}
 }

lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepTest.java

@@ -28,13 +28,14 @@ public class GrEclipseFormatterStepTest extends EquoResourceHarness {
 	private final static String EXPECTED = "class F{\n\tdef m(){}\n}";
 
 	public GrEclipseFormatterStepTest() {
-		super(GrEclipseFormatterStep.createBuilder(TestProvisioner.mavenCentral()), INPUT, EXPECTED);
+		super(GrEclipseFormatterStep.createBuilder(TestProvisioner.mavenCentral()));
 	}
 
 	@ParameterizedTest
 	@MethodSource
 	void formatWithVersion(String version) throws Exception {
-		assertFormatted(version);
+		harnessFor(version).test("test.groovy",
+				"class F{ def m(){} }", "class F{\n\tdef m(){}\n}");
 	}
 
 	private static Stream<String> formatWithVersion() {

lib-extra/src/test/java/com/diffplug/spotless/extra/java/EclipseJdtFormatterStepTest.java

@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.extra.java;
 
-import java.io.File;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Nested;
@@ -28,21 +27,20 @@
 import com.diffplug.spotless.extra.eclipse.EquoResourceHarness;
 
 class EclipseJdtFormatterStepTest extends EquoResourceHarness {
-	private final static String INPUT = "package p; class C{}";
-	private final static String EXPECTED = "package p;\nclass C {\n}";
-
 	private static EquoBasedStepBuilder createBuilder() {
 		return EclipseJdtFormatterStep.createBuilder(TestProvisioner.mavenCentral());
 	}
 
 	public EclipseJdtFormatterStepTest() {
-		super(createBuilder(), INPUT, EXPECTED);
+		super(createBuilder());
 	}
 
 	@ParameterizedTest
 	@MethodSource
 	void formatWithVersion(String version) throws Exception {
-		assertFormatted(version);
+		harnessFor(version).test("test.java",
+				"package p; class C{}",
+				"package p;\nclass C {\n}");
 	}
 
 	private static Stream<String> formatWithVersion() {
@@ -53,13 +51,13 @@ private static Stream<String> formatWithVersion() {
 	@Nested
 	class NewFormatInterface extends EquoResourceHarness {
 		public NewFormatInterface() {
-			super(createBuilder(), "module-info.java", getTestResource("java/eclipse/ModuleInfoUnformatted.test"), getTestResource("java/eclipse/ModuleInfoFormatted.test"));
+			super(createBuilder());
 		}
 
 		@Test
 		void formatModuleInfo() throws Exception {
-			File settingsFile = createTestFile("java/eclipse/ModuleInfo.prefs");
-			assertFormatted("4.11", settingsFile);
+			harnessFor("4.11", createTestFile("java/eclipse/ModuleInfo.prefs"))
+					.testResource("module-info.java", "java/eclipse/ModuleInfoUnformatted.test", "java/eclipse/ModuleInfoFormatted.test");
 		}
 	}
 }