Everything that gets passed to StepHarness now gets round-tripped.

Author: nedtwigg

testlib/src/main/java/com/diffplug/spotless/StepHarness.java

@@ -26,7 +26,7 @@
 import org.assertj.core.api.Assertions;
 
 /** An api for testing a {@code FormatterStep} that doesn't depend on the File path. DO NOT ADD FILE SUPPORT TO THIS, use {@link StepHarnessWithFile} if you need that. */
-public class StepHarness extends StepHarnessBase<StepHarness> {
+public class StepHarness extends StepHarnessBase {
 	private StepHarness(Formatter formatter) {
 		super(formatter);
 	}

testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java

@@ -15,67 +15,25 @@
  */
 package com.diffplug.spotless;
 
-import java.util.Locale;
 import java.util.Objects;
-import java.util.Set;
 
 import org.assertj.core.api.Assertions;
 
-class StepHarnessBase<T extends StepHarnessBase<?>> implements AutoCloseable {
+class StepHarnessBase implements AutoCloseable {
 	private final Formatter formatter;
-	private Formatter roundTripped;
-	private boolean supportsRoundTrip = false;
 
 	protected StepHarnessBase(Formatter formatter) {
 		this.formatter = Objects.requireNonNull(formatter);
-		if (formatter.getSteps().size() == 1) {
-			// our goal is for everything to be roundtrip serializable
-			// the steps to get there are
-			// - make every individual step round-trippable
-			// - make the other machinery (Formatter, LineEnding, etc) round-trippable
-			// - done!
-			//
-			// Right now, we're still trying to get each and every single step to be round-trippable.
-			// You can help by add a test below, make sure that the test for that step fails, and then
-			// make the test pass. `FormatterStepEqualityOnStateSerialization` is a good base class for
-			// easily converting a step to round-trip serialization while maintaining easy and concise
-			// equality code.
-			String onlyStepName = formatter.getSteps().get(0).getName();
-			if (onlyStepName.startsWith("indentWith")) {
-				supportsRoundTrip = true;
-			} else if (onlyStepName.equals("diktat")) {
-				supportsRoundTrip = true;
-			} else if (onlyStepName.toLowerCase(Locale.ROOT).contains("eclipse")) {
-				supportsRoundTrip = true;
-			} else if (onlyStepName.equals("fence")) {
-				supportsRoundTrip = true;
-			} else if (Set.of("black", "buf", "clang", "ktlint", "ktfmt", "scalafmt", "palantir-java-format", "google-java-format",
-					"removeUnusedImports", "cleanthat", "No line break between type annotation and type", "antlr4Formatter",
-					"gson", "jacksonJson", "apply-json-patch", "jsonSimple", "sortPom", "jacksonYaml", "gherkinUtils",
-					"flexmark-java", "freshmark",
-					"importOrder", "Remove unnecessary semicolons").contains(onlyStepName)) {
-				supportsRoundTrip = true;
-			}
-		}
+		Formatter roundTripped = SerializableEqualityTester.reserialize(formatter);
+		Assertions.assertThat(roundTripped).isEqualTo(formatter);
 	}
 
 	protected Formatter formatter() {
-		if (!supportsRoundTrip) {
-			return formatter;
-		} else {
-			if (roundTripped == null) {
-				roundTripped = SerializableEqualityTester.reserialize(formatter);
-				Assertions.assertThat(roundTripped).isEqualTo(formatter);
-			}
-			return roundTripped;
-		}
+		return formatter;
 	}
 
 	@Override
 	public void close() {
 		formatter.close();
-		if (roundTripped != null) {
-			roundTripped.close();
-		}
 	}
 }

testlib/src/main/java/com/diffplug/spotless/StepHarnessWithFile.java

@@ -26,7 +26,7 @@
 import org.assertj.core.api.Assertions;
 
 /** An api for testing a {@code FormatterStep} that depends on the File path. */
-public class StepHarnessWithFile extends StepHarnessBase<StepHarnessWithFile> {
+public class StepHarnessWithFile extends StepHarnessBase {
 	private final ResourceHarness harness;
 
 	private StepHarnessWithFile(ResourceHarness harness, Formatter formatter) {