Skip to content

Commit e18bd50

Browse files
committed
Turn off limiting in tests
1 parent 258affe commit e18bd50

5 files changed

Lines changed: 20 additions & 4 deletions

File tree

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: java
22
jdk:
3-
- oraclejdk7
3+
- oraclejdk8
44
install: true
55
script: ./buildViaTravis.sh
66
after_success:

build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ plugins {
2222
id 'nebula.optional-base' version '3.1.0'
2323
}
2424

25+
sourceCompatibility = '1.7'
26+
2527
group = 'io.jschneider'
2628

2729
repositories {

src/main/java/org/powerassert/PowerAssertProcessor.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,15 @@
2929

3030
@SupportedAnnotationTypes("*")
3131
public class PowerAssertProcessor extends AbstractProcessor {
32-
private JavacPowerAssertGenerator javacGenerator = new JavacPowerAssertGenerator();
32+
private JavacPowerAssertGenerator javacGenerator;
33+
34+
public PowerAssertProcessor() {
35+
this(true);
36+
}
37+
38+
public PowerAssertProcessor(boolean limitDepthOnJava8) {
39+
this.javacGenerator = new JavacPowerAssertGenerator(limitDepthOnJava8);
40+
}
3341

3442
@Override
3543
public synchronized void init(ProcessingEnvironment processingEnv) {

src/main/java/org/powerassert/javac/JavacPowerAssertGenerator.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,12 @@ public class JavacPowerAssertGenerator extends TreePathScanner<TreePath, Context
3737
private Context context;
3838
private Messager messager;
3939

40+
private boolean limitDepthOnJava8;
41+
42+
public JavacPowerAssertGenerator(boolean limitDepthOnJava8) {
43+
this.limitDepthOnJava8 = limitDepthOnJava8;
44+
}
45+
4046
@Override
4147
public void init(ProcessingEnvironment env) {
4248
this.trees = Trees.instance(env);
@@ -371,7 +377,7 @@ private boolean isType(Name name) {
371377
* @return a wrapped expression
372378
*/
373379
private JCTree.JCExpression injectRecordValue(JCTree.JCExpression expr, int anchor, int recordingDepth) {
374-
if(System.getProperty("java.version").startsWith("1.8") && recordingDepth > MAX_JAVA8_DEPTH) {
380+
if(limitDepthOnJava8 && System.getProperty("java.version").startsWith("1.8") && recordingDepth > MAX_JAVA8_DEPTH) {
375381
return expr;
376382
}
377383

src/test/java/org/powerassert/AbstractAssertTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public abstract class AbstractAssertTest {
1010

1111
@Before
1212
public void setup() {
13-
java = new JavaCompilerHelper(new PowerAssertProcessor());
13+
java = new JavaCompilerHelper(new PowerAssertProcessor(false));
1414
}
1515

1616
void testFailsWithMessage(String clazz, String test, String... messageLines) {

0 commit comments

Comments
 (0)