Fixup FenceStepTest so that we don't need so much forStepNoRoundtrip.

Author: nedtwigg

testlib/src/test/java/com/diffplug/spotless/generic/FenceStepTest.java

@@ -16,16 +16,11 @@
 package com.diffplug.spotless.generic;
 
 import java.io.File;
-import java.io.Serializable;
 import java.util.Arrays;
-import java.util.Objects;
-
-import javax.annotation.Nullable;
 
 import org.junit.jupiter.api.Test;
 
 import com.diffplug.common.base.StringPrinter;
-import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.StepHarness;
@@ -34,8 +29,8 @@ class FenceStepTest extends ResourceHarness {
 	@Test
 	void single() {
 		FormatterStep fence = FenceStep.named("fence").openClose("spotless:off", "spotless:on")
-				.preserveWithin(Arrays.asList(createNeverUpToDateSerializable("lowercase", String::toLowerCase)));
-		StepHarness harness = StepHarness.forStepNoRoundtrip(fence);
+				.preserveWithin(Arrays.asList(ToCaseStep.lower()));
+		StepHarness harness = StepHarness.forStep(fence);
 		harness.test(
 				StringPrinter.buildStringFromLines(
 						"A B C",
@@ -54,8 +49,8 @@ void single() {
 	@Test
 	void multiple() {
 		FormatterStep fence = FenceStep.named("fence").openClose("spotless:off", "spotless:on")
-				.preserveWithin(Arrays.asList(createNeverUpToDateSerializable("lowercase", String::toLowerCase)));
-		StepHarness harness = StepHarness.forStepNoRoundtrip(fence);
+				.preserveWithin(Arrays.asList(ToCaseStep.lower()));
+		StepHarness harness = StepHarness.forStep(fence);
 		harness.test(
 				StringPrinter.buildStringFromLines(
 						"A B C",
@@ -88,7 +83,7 @@ void multiple() {
 	@Test
 	void broken() {
 		FormatterStep fence = FenceStep.named("fence").openClose("spotless:off", "spotless:on")
-				.preserveWithin(Arrays.asList(createNeverUpToDateSerializable("uppercase", String::toUpperCase)));
+				.preserveWithin(Arrays.asList(ToCaseStep.upper()));
 		// this fails because uppercase turns spotless:off into SPOTLESS:OFF, etc
 		StepHarness.forStepNoRoundtrip(fence).testExceptionMsg(StringPrinter.buildStringFromLines("A B C",
 				"spotless:off",
@@ -100,8 +95,8 @@ void broken() {
 	@Test
 	void andApply() {
 		FormatterStep fence = FenceStep.named("fence").openClose("<lower>", "</lower>")
-				.applyWithin(Arrays.asList(createNeverUpToDateSerializable("lowercase", String::toLowerCase)));
-		StepHarness.forStepNoRoundtrip(fence).test(
+				.applyWithin(Arrays.asList(ToCaseStep.lower()));
+		StepHarness.forStep(fence).test(
 				StringPrinter.buildStringFromLines(
 						"A B C",
 						"<lower>",
@@ -116,46 +111,45 @@ void andApply() {
 						"G H I"));
 	}
 
-	/**
-	 * @param name
-	 *             The name of the formatter step
-	 * @param function
-	 *             The function used by the formatter step
-	 * @return A FormatterStep which will never report that it is up-to-date, because
-	 *         it is not equal to the serialized representation of itself.
-	 */
-	static <T extends FormatterFunc & Serializable> FormatterStep createNeverUpToDateSerializable(
-			String name,
-			T function) {
-		Objects.requireNonNull(function, "function");
-		return new NeverUpToDateSerializable(name, function);
-	}
+	static class ToCaseStep implements FormatterStep {
+		static ToCaseStep upper() {
+			return new ToCaseStep(true);
+		}
 
-	static class NeverUpToDateSerializable<T extends FormatterFunc & Serializable> implements FormatterStep, Serializable {
-		private final String name;
-		private final T formatterFunc;
+		static ToCaseStep lower() {
+			return new ToCaseStep(false);
+		}
+
+		private final boolean uppercase;
 
-		private NeverUpToDateSerializable(String name, T formatterFunc) {
-			this.name = name;
-			this.formatterFunc = formatterFunc;
+		ToCaseStep(boolean uppercase) {
+			this.uppercase = uppercase;
 		}
 
 		@Override
 		public String getName() {
-			return name;
+			return uppercase ? "uppercase" : "lowercase";
 		}
 
-		@Nullable
+		@org.jetbrains.annotations.Nullable
 		@Override
 		public String format(String rawUnix, File file) throws Exception {
-			return formatterFunc.apply(rawUnix, file);
+			return uppercase ? rawUnix.toUpperCase() : rawUnix.toLowerCase();
 		}
 
 		@Override
 		public void close() throws Exception {
-			if (formatterFunc instanceof FormatterFunc.Closeable) {
-				((FormatterFunc.Closeable) formatterFunc).close();
-			}
+
+		}
+
+		@Override
+		public int hashCode() {
+			return getName().hashCode();
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			return obj instanceof ToCaseStep && getName().equals(((ToCaseStep) obj).getName());
 		}
 	}
 }