Remove testResourceExceptionMsg and replace with expectLintsOfResource.

Author: nedtwigg

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

@@ -21,9 +21,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 
-import org.assertj.core.api.AbstractStringAssert;
-import org.assertj.core.api.Assertions;
-
 import com.diffplug.selfie.Selfie;
 import com.diffplug.selfie.StringSelfie;
 
@@ -91,34 +88,26 @@ public StepHarness testResourceUnaffected(String resourceIdempotent) {
 		return testUnaffected(idempotentElement);
 	}
 
-	public AbstractStringAssert<?> testResourceExceptionMsg(String resourceBefore) {
-		return testExceptionMsg(ResourceHarness.getTestResource(resourceBefore));
-	}
-
-	public AbstractStringAssert<?> testExceptionMsg(String before) {
-		try {
-			formatter().compute(LineEnding.toUnix(before), Formatter.NO_FILE_SENTINEL);
-			throw new SecurityException("Expected exception");
-		} catch (Throwable e) {
-			if (e instanceof SecurityException) {
-				throw new AssertionError(e.getMessage());
-			} else {
-				Throwable rootCause = e;
-				while (rootCause.getCause() != null) {
-					if (rootCause instanceof IllegalStateException) {
-						break;
-					}
-					rootCause = rootCause.getCause();
-				}
-				return Assertions.assertThat(rootCause.getMessage());
-			}
-		}
+	public StringSelfie expectLintsOfResource(String before) {
+		return expectLintsOf(ResourceHarness.getTestResource(before));
 	}
 
 	public StringSelfie expectLintsOf(String before) {
 		LintState state = LintState.of(formatter(), Formatter.NO_FILE_SENTINEL, before.getBytes(formatter().getEncoding()));
-		String assertAgainst = state.asString(Formatter.NO_FILE_SENTINEL, formatter());
+		return expectLintsOf(state, formatter());
+	}
+
+	static StringSelfie expectLintsOf(LintState state, Formatter formatter) {
+		String assertAgainst = state.asString(Formatter.NO_FILE_SENTINEL, formatter);
 		String cleaned = assertAgainst.replace("NO_FILE_SENTINEL:", "");
-		return Selfie.expectSelfie(cleaned);
+
+		int numLines = 1;
+		int lineEnding = cleaned.indexOf('\n');
+		while (lineEnding != -1 && numLines < 10) {
+			++numLines;
+			lineEnding = cleaned.indexOf('\n', lineEnding + 1);
+		}
+		String toSnapshot = lineEnding == -1 ? cleaned : (cleaned.substring(0, lineEnding) + "\n(... and more)");
+		return Selfie.expectSelfie(toSnapshot);
 	}
 }

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

@@ -18,12 +18,12 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.File;
+import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.Objects;
 
-import org.assertj.core.api.AbstractStringAssert;
-import org.assertj.core.api.Assertions;
+import com.diffplug.selfie.StringSelfie;
 
 /** An api for testing a {@code FormatterStep} that depends on the File path. */
 public class StepHarnessWithFile extends StepHarnessBase {
@@ -85,30 +85,17 @@ public StepHarnessWithFile testResourceUnaffected(String resourceIdempotent) {
 		return testUnaffected(file, contentBefore);
 	}
 
-	public AbstractStringAssert<?> testResourceExceptionMsg(String resourceBefore) {
-		return testResourceExceptionMsg(resourceBefore, resourceBefore);
+	public StringSelfie expectLintsOfResource(String resource) {
+		return expectLintsOfResource(resource, resource);
 	}
 
-	public AbstractStringAssert<?> testResourceExceptionMsg(String filename, String resourceBefore) {
-		String contentBefore = ResourceHarness.getTestResource(resourceBefore);
-		File file = harness.setFile(filename).toContent(contentBefore);
-		return testExceptionMsg(file, contentBefore);
-	}
-
-	public AbstractStringAssert<?> testExceptionMsg(File file, String before) {
+	public StringSelfie expectLintsOfResource(String filename, String resource) {
 		try {
-			formatter().compute(LineEnding.toUnix(before), file);
-			throw new SecurityException("Expected exception");
-		} catch (Throwable e) {
-			if (e instanceof SecurityException) {
-				throw new AssertionError(e.getMessage());
-			} else {
-				Throwable rootCause = e;
-				while (rootCause.getCause() != null) {
-					rootCause = rootCause.getCause();
-				}
-				return Assertions.assertThat(rootCause.getMessage());
-			}
+			File file = harness.setFile(filename).toResource(resource);
+			LintState state = LintState.of(formatter(), file);
+			return StepHarness.expectLintsOf(state, formatter());
+		} catch (IOException e) {
+			throw new AssertionError(e);
 		}
 	}
 }