Skip to content

Commit

Permalink
fix(fieldaccess): static field access in anonymous executable
Browse files Browse the repository at this point in the history
  • Loading branch information
tdurieux committed Sep 6, 2016
1 parent 1e6f6c2 commit d3d743e
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,8 @@ private <T> boolean isInitializeStaticFinalField(CtExpression<T> targetExp) {
&& targetExp.equals(((CtFieldWrite) parent).getTarget())
&& anonymousParent != null
&& ((CtFieldWrite) parent).getVariable() != null
&& ((CtFieldWrite) parent).getVariable().getModifiers().contains(ModifierKind.STATIC)) {
&& ((CtFieldWrite) parent).getVariable().getModifiers().contains(ModifierKind.STATIC)
&& ((CtFieldWrite) parent).getVariable().getModifiers().contains(ModifierKind.FINAL)) {
return true;
}
return false;
Expand Down
10 changes: 10 additions & 0 deletions src/test/java/spoon/test/fieldaccesses/FieldAccessTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import spoon.reflect.code.CtUnaryOperator;
import spoon.reflect.code.CtVariableWrite;
import spoon.reflect.code.UnaryOperatorKind;
import spoon.reflect.declaration.CtClass;
import spoon.reflect.declaration.CtField;
import spoon.reflect.declaration.CtMethod;
import spoon.reflect.declaration.CtParameter;
Expand All @@ -26,6 +27,7 @@
import spoon.reflect.visitor.Query;
import spoon.reflect.visitor.filter.NameFilter;
import spoon.reflect.visitor.filter.TypeFilter;
import spoon.test.fieldaccesses.testclasses.B;
import spoon.test.fieldaccesses.testclasses.Kuu;
import spoon.test.fieldaccesses.testclasses.Panini;
import spoon.test.fieldaccesses.testclasses.Pozole;
Expand Down Expand Up @@ -378,4 +380,12 @@ public <T> void visitCtFieldWrite(CtFieldWrite<T> fieldWrite) {

assertEquals(1, scanner.visited);
}

@Test
public void testGetReference() throws Exception {
final CtClass<B> aClass = (CtClass) ModelUtils.buildClass(B.class);
aClass.getFactory().getEnvironment().setAutoImports(true);

assertEquals("A.myField", aClass.getElements(new TypeFilter<>(CtFieldWrite.class)).get(0).toString());
}
}
5 changes: 5 additions & 0 deletions src/test/java/spoon/test/fieldaccesses/testclasses/A.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package spoon.test.fieldaccesses.testclasses;

public class A {
public static int myField = 3;
}
7 changes: 7 additions & 0 deletions src/test/java/spoon/test/fieldaccesses/testclasses/B.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package spoon.test.fieldaccesses.testclasses;

public class B {
static {
A.myField = 5;
}
}

0 comments on commit d3d743e

Please sign in to comment.