Skip to content

Commit cff607b

Browse files
committed
Move the Maven selfie harnessing somewhere more natural.
1 parent 6a734f6 commit cff607b

File tree

4 files changed

+19
-44
lines changed

4 files changed

+19
-44
lines changed

plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import java.nio.charset.StandardCharsets;
3030
import java.nio.file.Files;
3131
import java.nio.file.Path;
32-
import java.util.*;
32+
import java.util.stream.Collectors;
3333

3434
import org.junit.jupiter.api.AfterAll;
3535
import org.junit.jupiter.api.BeforeAll;
@@ -41,6 +41,8 @@
4141

4242
import com.diffplug.common.base.Unhandled;
4343
import com.diffplug.common.io.Resources;
44+
import com.diffplug.selfie.Selfie;
45+
import com.diffplug.selfie.StringSelfie;
4446
import com.diffplug.spotless.Jvm;
4547
import com.diffplug.spotless.ProcessRunner;
4648
import com.diffplug.spotless.ResourceHarness;
@@ -347,4 +349,20 @@ protected static String[] formats(String[]... formats) {
347349
.toArray(String[]::new);
348350
return formats(formatsArray);
349351
}
352+
353+
private static final String ERROR_PREFIX = "[ERROR] ";
354+
355+
protected static StringSelfie expectSelfieErrorMsg(ProcessRunner.Result result) {
356+
String concatenatedError = result.stdOutUtf8().lines()
357+
.map(line -> line.startsWith(ERROR_PREFIX) ? line.substring(ERROR_PREFIX.length()) : null)
358+
.filter(line -> line != null)
359+
.collect(Collectors.joining("\n"));
360+
361+
String sanitizedVersion = concatenatedError.replaceFirst("com\\.diffplug\\.spotless:spotless-maven-plugin:([^:]+):", "com.diffplug.spotless:spotless-maven-plugin:VERSION:");
362+
363+
int help1 = sanitizedVersion.indexOf("-> [Help 1]");
364+
String trimTrailingString = sanitizedVersion.substring(0, help1);
365+
366+
return Selfie.expectSelfie(trimTrailingString);
367+
}
350368
}

plugin-maven/src/test/java/com/diffplug/spotless/maven/biome/BiomeMavenTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import static org.junit.jupiter.api.Assertions.assertEquals;
2020
import static org.junit.jupiter.api.Assertions.assertTrue;
2121
import static org.owasp.encoder.Encode.forXml;
22-
import static selfie.MavenSelfie.expectSelfieErrorMsg;
2322

2423
import java.io.File;
2524

plugin-maven/src/test/java/com/diffplug/spotless/maven/java/RemoveWildcardImportsStepTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616
package com.diffplug.spotless.maven.java;
1717

18-
import static selfie.MavenSelfie.expectSelfieErrorMsg;
19-
2018
import org.junit.jupiter.api.Test;
2119

2220
import com.diffplug.spotless.maven.MavenIntegrationHarness;

plugin-maven/src/test/java/selfie/MavenSelfie.java

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)