fix(replace): Use generic replace with CtStatementList elements (closes

#792)
INRIA · Aug 19, 2016 · baeb8e4 · baeb8e4
1 parent 9266242
commit baeb8e4
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 37 deletions.
diff --git a/src/main/java/spoon/support/reflect/code/CtConstructorCallImpl.java b/src/main/java/spoon/support/reflect/code/CtConstructorCallImpl.java
@@ -84,15 +84,6 @@ public <C extends CtStatement> C insertBefore(CtStatementList statements) {
  return (C) this;
  }
 
- @Override
- public void replace(CtElement element) {
- if (element instanceof CtStatementList) {
- CtStatementImpl.replace(this, (CtStatementList) element);
- } else {
- super.replace(element);
- }
- }
-
  @Override
  public <C extends CtAbstractInvocation<T>> C setArguments(List<CtExpression<?>> arguments) {
  if (arguments == null || arguments.isEmpty()) {

diff --git a/src/main/java/spoon/support/reflect/code/CtInvocationImpl.java b/src/main/java/spoon/support/reflect/code/CtInvocationImpl.java
@@ -143,15 +143,6 @@ public void replace(CtStatement element) {
  replace((CtElement) element);
  }
 
- @Override
- public void replace(CtElement element) {
- if (element instanceof CtStatementList) {
- CtStatementImpl.replace(this, (CtStatementList) element);
- } else {
- super.replace(element);
- }
- }
-
  @Override
  public CtTypeReference<T> getType() {
  return getExecutable() == null ? null : getExecutable().getType();

diff --git a/src/main/java/spoon/support/reflect/code/CtStatementImpl.java b/src/main/java/spoon/support/reflect/code/CtStatementImpl.java
@@ -43,6 +43,10 @@ public static void insertAfter(CtStatement target, CtStatement statement)
  insertAfter(target, sts);
  }
 
+ /**
+ * @see CtElement#replace(CtElement)
+ */
+ @Deprecated
  public static void replace(CtStatement target, CtStatementList statements)
  throws ParentNotInitializedException {
  insertAfter(target, statements);
@@ -269,15 +273,6 @@ public <T extends CtStatement> T insertAfter(CtStatementList statements) throws
  return (T) this;
  }
 
- @Override
- public void replace(CtElement element) {
- if (element instanceof CtStatementList) {
- CtStatementImpl.replace(this, (CtStatementList) element);
- } else {
- super.replace(element);
- }
- }
-
  String label;
 
  @Override

diff --git a/src/main/java/spoon/support/reflect/code/CtUnaryOperatorImpl.java b/src/main/java/spoon/support/reflect/code/CtUnaryOperatorImpl.java
@@ -77,15 +77,6 @@ public <C extends CtStatement> C insertBefore(CtStatementList statements) {
  return (C) this;
  }
 
- @Override
- public void replace(CtElement element) {
- if (element instanceof CtStatementList) {
- CtStatementImpl.replace(this, (CtStatementList) element);
- } else {
- super.replace(element);
- }
- }
-
  @Override
  public <C extends CtUnaryOperator> C setOperand(CtExpression<T> expression) {
  if (expression != null) {

diff --git a/src/test/java/spoon/test/replace/ReplaceTest.java b/src/test/java/spoon/test/replace/ReplaceTest.java
@@ -13,6 +13,7 @@
 import spoon.reflect.code.CtLiteral;
 import spoon.reflect.code.CtLocalVariable;
 import spoon.reflect.code.CtStatement;
+import spoon.reflect.code.CtTry;
 import spoon.reflect.code.CtVariableRead;
 import spoon.reflect.declaration.CtClass;
 import spoon.reflect.declaration.CtElement;
@@ -29,13 +30,16 @@
 import spoon.reflect.visitor.filter.NameFilter;
 import spoon.reflect.visitor.filter.ReferenceTypeFilter;
 import spoon.reflect.visitor.filter.TypeFilter;
+import spoon.test.replace.testclasses.Mole;
 import spoon.test.replace.testclasses.Tacos;
 
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertSame;
 import static spoon.testing.utils.ModelUtils.build;
+import static spoon.testing.utils.ModelUtils.buildClass;
 
 public class ReplaceTest {
 
@@ -154,7 +158,8 @@ public void testReplaceStmtByList() {
  stmt.replace(lst);
 
  // we should have only 2 statements after (from the stmt list)
- assertEquals(2, sample.getMethod("retry").getBody().getStatements().size());
+ assertEquals(1, sample.getMethod("retry").getBody().getStatements().size());
+ assertEquals(2, ((CtBlock) sample.getMethod("retry").getBody().getStatement(0)).getStatements().size());
  }
 
  @Test
@@ -329,4 +334,15 @@ public void testReplaceExecutableReferenceByAnotherOne() throws Exception {
  assertEquals(newExecutable, inv.getExecutable());
  assertEquals("java.io.PrintStream#print(java.lang.String)", inv.getExecutable().toString());
  }
+
+ @Test
+ public void testReplaceBlockTry() throws Exception {
+ final CtType<Mole> aMole = buildClass(Mole.class);
+ final CtBlock<?> newBlock = aMole.getFactory().Code().createCtBlock(aMole.getFactory().Code().createCodeSnippetStatement("int j = 0;").compile());
+ final CtTry ctTry = aMole.getMethod("m").getElements(new TypeFilter<>(CtTry.class)).get(0);
+
+ assertNotEquals(newBlock, ctTry.getBody());
+ ctTry.getBody().replace(newBlock);
+ assertEquals(newBlock, ctTry.getBody());
+ }
 }
diff --git a/src/test/java/spoon/test/replace/testclasses/Mole.java b/src/test/java/spoon/test/replace/testclasses/Mole.java
@@ -0,0 +1,10 @@
+package spoon.test.replace.testclasses;
+
+public class Mole {
+ void m() {
+ try {
+ int i;
+ } finally {
+ }
+ }
+}