StepHarness should operate on the post-roundtripped set, not the pre-roundtripped.

nedtwigg · nedtwigg · commit cffb2f474547 · 2024-05-29T14:59:19.000-07:00
diff --git a/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java b/testlib/src/main/java/com/diffplug/spotless/StepHarnessBase.java
@@ -27,14 +27,15 @@ enum RoundTrip {
 	private final Formatter formatter;
 
 	protected StepHarnessBase(Formatter formatter, RoundTrip roundTrip) {
-		this.formatter = Objects.requireNonNull(formatter);
 		if (roundTrip == RoundTrip.DONT_ROUNDTRIP) {
+			this.formatter = Objects.requireNonNull(formatter);
 			return;
 		}
 		Formatter roundTripped = SerializableEqualityTester.reserialize(formatter);
 		if (roundTrip == RoundTrip.ASSERT_EQUAL) {
 			Assertions.assertThat(roundTripped).isEqualTo(formatter);
 		}
+		this.formatter = roundTripped;
 	}
 
 	protected Formatter formatter() {

Original file line number	Diff line number	Diff line change
`@@ -27,14 +27,15 @@ enum RoundTrip {`
`27`	`27`	`private final Formatter formatter;`
`28`	`28`
`29`	`29`	`protected StepHarnessBase(Formatter formatter, RoundTrip roundTrip) {`
`30`		`- this.formatter = Objects.requireNonNull(formatter);`
`31`	`30`	`if (roundTrip == RoundTrip.DONT_ROUNDTRIP) {`
	`31`	`+ this.formatter = Objects.requireNonNull(formatter);`
`32`	`32`	`return;`
`33`	`33`	`}`
`34`	`34`	`Formatter roundTripped = SerializableEqualityTester.reserialize(formatter);`
`35`	`35`	`if (roundTrip == RoundTrip.ASSERT_EQUAL) {`
`36`	`36`	`Assertions.assertThat(roundTripped).isEqualTo(formatter);`
`37`	`37`	`}`
	`38`	`+ this.formatter = roundTripped;`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`protected Formatter formatter() {`