Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ public <C extends CtType<T>> C setTypeMembers(List<CtTypeMember> members) {
}
typeMembers.clear();
for (CtTypeMember typeMember : members) {
addTypeMember(typeMember);
addTypeMemberAt(typeMembers.size(), typeMember);
}
return (C) this;
}
Expand Down
28 changes: 28 additions & 0 deletions src/test/java/spoon/reflect/ast/CloneTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@
import spoon.Launcher;
import spoon.processing.AbstractProcessor;
import spoon.refactoring.Refactoring;
import spoon.reflect.CtModel;
import spoon.reflect.code.CtConditional;
import spoon.reflect.declaration.CtClass;
import spoon.reflect.declaration.CtElement;
import spoon.reflect.declaration.CtField;
import spoon.reflect.declaration.CtInterface;
import spoon.reflect.declaration.CtMethod;
import spoon.reflect.declaration.CtType;
Expand Down Expand Up @@ -237,4 +239,30 @@ public void testCopyType() {
}
}
}

@Test
public void testIssue3389() {
// test case for https://github.com/INRIA/spoon/issues/3389
Launcher launcher = new Launcher();
launcher.addInputResource( "./src/test/resources/JavaCode.java" );
launcher.buildModel();
CtModel model = launcher.getModel();

CtType<?> c = launcher.getFactory().Type().get("HelloWorld");

// sanity check: the field is at the end as in the source
assertEquals(c.getFields().get(0), c.getTypeMembers().get(2));

List<CtField<?>> fields = c.getFields();
for(CtField<?> field : fields) {
c.removeField(field);
c.addFieldAtTop(field);
}

// sanity check: the field is now at the top after the implicit constructor
assertEquals(c.getFields().get(0), c.getTypeMembers().get(0));

// contract: clone preserves the order
assertEquals(c.getFields().get(0), c.clone().getTypeMembers().get(0));
}
}
4 changes: 4 additions & 0 deletions src/test/resources/JavaCode.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
public class HelloWorld {
void testMethod() {}
private int testVariable;
}