Skip to content

Commit 745810b

Browse files
committed
Refactor test codes
- use Selfie.expectSelfie(result).toBe_TODO()
1 parent fb5aa2d commit 745810b

File tree

1 file changed

+5
-13
lines changed

1 file changed

+5
-13
lines changed

lib-extra/src/test/java/com/diffplug/spotless/extra/middleware/ReviewDogGeneratorTest.java

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import static org.junit.jupiter.api.Assertions.assertNotNull;
2020
import static org.junit.jupiter.api.Assertions.assertTrue;
2121

22+
import com.diffplug.selfie.Selfie;
23+
2224
import java.io.File;
2325
import java.util.ArrayList;
2426
import java.util.Arrays;
@@ -84,10 +86,7 @@ public void lintsSingleIssue() {
8486
String result = ReviewDogGenerator.rdjsonlLints("src/main.java", steps, lintsPerStep);
8587

8688
assertNotNull(result);
87-
assertTrue(result.contains("\"path\":\"src/main.java\""));
88-
assertTrue(result.contains("\"line\":1"));
89-
assertTrue(result.contains("\"message\":\"Test lint message\""));
90-
assertTrue(result.contains("\"code\":\"testStep\""));
89+
Selfie.expectSelfie(result).toBe("{\"source\":\"spotless\",\"code\":\"testStep\",\"level\":\"warning\",\"message\":\"Test lint message\",\"path\":\"src/main.java\",\"line\":1,\"column\":1}");
9190
}
9291

9392
@Test
@@ -122,14 +121,7 @@ public void close() {}
122121
Collections.singletonList(lint2));
123122

124123
String result = ReviewDogGenerator.rdjsonlLints("src/main.java", steps, lintsPerStep);
125-
126-
assertNotNull(result);
127-
assertTrue(result.contains("\"code\":\"step1\""));
128-
assertTrue(result.contains("\"code\":\"step2\""));
129-
assertTrue(result.contains("\"message\":\"First issue\""));
130-
assertTrue(result.contains("\"message\":\"Second issue\""));
131-
132-
String[] lines = result.split("\n");
133-
assertEquals(2, lines.length);
124+
Selfie.expectSelfie(result).toBe("{\"source\":\"spotless\",\"code\":\"step1\",\"level\":\"warning\",\"message\":\"First issue\",\"path\":\"src/main.java\",\"line\":1,\"column\":1}",
125+
"{\"source\":\"spotless\",\"code\":\"step2\",\"level\":\"warning\",\"message\":\"Second issue\",\"path\":\"src/main.java\",\"line\":5,\"column\":1}");
134126
}
135127
}

0 commit comments

Comments
 (0)