Skip to content

Commit a8d5db8

Browse files
committed
Use the new error reporting to figure out exactly what was wrong.
1 parent 4a9e269 commit a8d5db8

File tree

3 files changed

+29
-3
lines changed

3 files changed

+29
-3
lines changed

lib-extra/src/test/java/com/diffplug/spotless/extra/groovy/GrEclipseFormatterStepSpecialCaseTest.java

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,30 @@
1515
*/
1616
package com.diffplug.spotless.extra.groovy;
1717

18+
import org.junit.jupiter.api.Assertions;
1819
import org.junit.jupiter.api.Test;
1920

2021
import com.diffplug.spotless.StepHarness;
2122
import com.diffplug.spotless.TestProvisioner;
2223

2324
public class GrEclipseFormatterStepSpecialCaseTest {
24-
/** https://github.com/diffplug/spotless/issues/1657 */
25+
/**
26+
* https://github.com/diffplug/spotless/issues/1657
27+
*
28+
* broken: ${parm == null ? "" : "<tag>$parm</tag>"}
29+
* works: ${parm == null ? "" : "<tag>parm</tag>"}
30+
*/
2531
@Test
2632
public void issue_1657() {
33+
Assertions.assertThrows(IllegalArgumentException.class, () -> {
34+
StepHarness.forStep(GrEclipseFormatterStep.createBuilder(TestProvisioner.mavenCentral()).build())
35+
.testResourceUnaffected("groovy/greclipse/format/SomeClass.test");
36+
});
37+
}
38+
39+
@Test
40+
public void issue_1657_fixed() {
2741
StepHarness.forStep(GrEclipseFormatterStep.createBuilder(TestProvisioner.mavenCentral()).build())
28-
.testResourceUnaffected("groovy/greclipse/format/SomeClass.test");
42+
.testResourceUnaffected("groovy/greclipse/format/SomeClass.fixed");
2943
}
3044
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package com.somepackage
2+
3+
class SomeClass {
4+
5+
def func(parm) {
6+
"""<tag>
7+
${parm == null ? "" : "<tag>parm</tag>"}
8+
${parm == null ? "" : "<tag>parm</tag>"}
9+
</tag>
10+
"""
11+
}
12+
}

testlib/src/main/resources/groovy/greclipse/format/SomeClass.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class SomeClass {
66
"""<tag>
77
${parm == null ? "" : "<tag>$parm</tag>"}
88
${parm == null ? "" : "<tag>$parm</tag>"}
9-
</tag>
9+
</tag>
1010
"""
1111
}
1212
}

0 commit comments

Comments
 (0)