fix(test): much stronger contracts for setter spec and tests

Close PR #975
INRIA · Nov 17, 2016 · cac5ade · cac5ade
1 parent 9272284
commit cac5ade
Show file tree

Hide file tree

Showing 28 changed files with 423 additions and 336 deletions.
diff --git a/src/main/java/spoon/reflect/code/CtTypeAccess.java b/src/main/java/spoon/reflect/code/CtTypeAccess.java
@@ -16,8 +16,10 @@
  */
 package spoon.reflect.code;
 
+import spoon.reflect.declaration.CtTypedElement;
 import spoon.reflect.reference.CtTypeReference;
 import spoon.support.DerivedProperty;
+import spoon.support.UnsettableProperty;
 
 /**
  * This code element represents a type reference usable as an expression.
@@ -72,6 +74,10 @@ public interface CtTypeAccess<A> extends CtExpression<Void> {
 	@DerivedProperty
 	CtTypeReference<Void> getType();
 
+	@Override
+	@UnsettableProperty
+	<C extends CtTypedElement> C setType(CtTypeReference<Void> type);
+
 	@Override
 	CtTypeAccess<A> clone();
 }
diff --git a/src/main/java/spoon/reflect/declaration/CtAnonymousExecutable.java b/src/main/java/spoon/reflect/declaration/CtAnonymousExecutable.java
@@ -38,4 +38,8 @@ public interface CtAnonymousExecutable extends CtExecutable<Void>, CtTypeMember
 	@Override
 	@UnsettableProperty
 	<T extends CtExecutable<Void>> T setParameters(List<CtParameter<?>> parameters);
+
+	@Override
+	@UnsettableProperty
+	<C extends CtTypedElement> C setType(CtTypeReference<Void> type);
 }
diff --git a/src/main/java/spoon/reflect/declaration/CtConstructor.java b/src/main/java/spoon/reflect/declaration/CtConstructor.java
@@ -16,6 +16,9 @@
  */
 package spoon.reflect.declaration;
 
+import spoon.reflect.reference.CtTypeReference;
+import spoon.support.UnsettableProperty;
+
 /**
  * This element defines a constructor declaration.
  */
@@ -28,4 +31,8 @@ public interface CtConstructor<T> extends CtExecutable<T>, CtTypeMember, CtForma
 
 	@Override
 	CtConstructor<T> clone();
+
+	@Override
+	@UnsettableProperty
+	<C extends CtTypedElement> C setType(CtTypeReference<T> type);
 }
diff --git a/src/main/java/spoon/reflect/declaration/CtTypeParameter.java b/src/main/java/spoon/reflect/declaration/CtTypeParameter.java
@@ -50,4 +50,15 @@ public interface CtTypeParameter extends CtType<Object> {
 	@UnsettableProperty
 	<C extends CtType<Object>> C setTypeMembers(List<CtTypeMember> members);
 
+	@Override
+	@UnsettableProperty
+	<C extends CtType<Object>> C setFields(List<CtField<?>> fields);
+
+	@Override
+	@UnsettableProperty
+	<C extends CtType<Object>> C setMethods(Set<CtMethod<?>> methods);
+
+	@Override
+	@UnsettableProperty
+	<C extends CtType<Object>> C setNestedTypes(Set<CtType<?>> nestedTypes);
 }
diff --git a/src/main/java/spoon/reflect/visitor/printer/ElementPrinterHelper.java b/src/main/java/spoon/reflect/visitor/printer/ElementPrinterHelper.java
@@ -256,7 +256,10 @@ public void writeHeader(List<CtType<?>> types, Collection<CtTypeReference<?>> im
 				writeComment(ctType, CommentOffset.TOP_FILE);
 				printer.writeln().writeln().writeTabs();
 			}
-			prettyPrinter.scan(types.get(0).getPackage());
+			// writing the header package
+			if (!types.get(0).getPackage().isUnnamedPackage()) {
+				printer.write("package " + types.get(0).getPackage().getQualifiedName() + ";");
+			}
 			printer.writeln().writeln().writeTabs();
 			if (env.isAutoImports()) {
 				for (CtTypeReference<?> ref : imports) {

diff --git a/src/main/java/spoon/support/DefaultCoreFactory.java b/src/main/java/spoon/support/DefaultCoreFactory.java
@@ -873,7 +873,7 @@ public CtElement create(Class<? extends CtElement> klass) {
 		if (klass.equals(spoon.reflect.reference.CtWildcardReference.class)) {
 			return createWildcardReference();
 		}
-		throw new IllegalArgumentException("not instantiable by CoreFactory()");
+		throw new IllegalArgumentException("not instantiable by CoreFactory(): " + klass);
 	}
 
 }
diff --git a/src/main/java/spoon/support/reflect/code/CtCatchVariableImpl.java b/src/main/java/spoon/support/reflect/code/CtCatchVariableImpl.java
@@ -27,6 +27,7 @@
 import spoon.reflect.reference.CtCatchVariableReference;
 import spoon.reflect.reference.CtTypeReference;
 import spoon.reflect.visitor.CtVisitor;
+import spoon.support.UnsettableProperty;
 import spoon.support.reflect.declaration.CtElementImpl;
 
 import java.util.ArrayList;
@@ -73,8 +74,10 @@ public CtTypeReference<T> getType() {
 	}
 
 	@Override
+	@UnsettableProperty
 	public <C extends CtVariable<T>> C setDefaultExpression(CtExpression<T> defaultExpression) {
-		throw new UnsupportedOperationException();
+		// unsettable property
+		return (C) this;
 	}
 
 	@Override

diff --git a/src/main/java/spoon/support/reflect/code/CtConstructorCallImpl.java b/src/main/java/spoon/support/reflect/code/CtConstructorCallImpl.java
@@ -53,6 +53,10 @@ public List<CtExpression<?>> getArguments() {
 
 	@Override
 	public CtExecutableReference<T> getExecutable() {
+		if (executable == null) {
+			// default reference
+			executable = getFactory().Core().createExecutableReference();
+		}
 		return executable;
 	}
 
@@ -173,6 +177,9 @@ public CtTypeReference<T> getType() {
 
 	@Override
 	public <C extends CtTypedElement> C setType(CtTypeReference<T> type) {
+		if (type != null) {
+			type.setParent(this);
+		}
 		if (getExecutable() != null) {
 			getExecutable().setType(type);
 		}

diff --git a/src/main/java/spoon/support/reflect/code/CtInvocationImpl.java b/src/main/java/spoon/support/reflect/code/CtInvocationImpl.java
@@ -75,6 +75,10 @@ public void removeArgument(CtExpression<?> argument) {
 
 	@Override
 	public CtExecutableReference<T> getExecutable() {
+		if (executable == null) {
+			// default reference
+			executable = getFactory().Core().createExecutableReference();
+		}
 		return executable;
 	}
 
@@ -150,6 +154,9 @@ public CtTypeReference<T> getType() {
 
 	@Override
 	public <C extends CtTypedElement> C setType(CtTypeReference<T> type) {
+		if (type != null) {
+			type.setParent(this);
+		}
 		if (getExecutable() != null) {
 			getExecutable().setType(type);
 		}

diff --git a/src/main/java/spoon/support/reflect/code/CtLambdaImpl.java b/src/main/java/spoon/support/reflect/code/CtLambdaImpl.java
@@ -30,6 +30,7 @@
 import spoon.reflect.visitor.CtVisitor;
 import spoon.support.reflect.declaration.CtElementImpl;
 import spoon.support.util.QualifiedNameBasedSortedSet;
+import spoon.support.visitor.SignaturePrinter;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -160,7 +161,9 @@ public boolean removeThrownType(CtTypeReference<? extends Throwable> throwType)
 
 	@Override
 	public String getSignature() {
-		throw new UnsupportedOperationException();
+		final SignaturePrinter pr = new SignaturePrinter();
+		pr.scan(this);
+		return pr.getSignature();
 	}
 
 	@Override

diff --git a/src/main/java/spoon/support/reflect/code/CtTypeAccessImpl.java b/src/main/java/spoon/support/reflect/code/CtTypeAccessImpl.java
@@ -20,6 +20,7 @@
 import spoon.reflect.declaration.CtTypedElement;
 import spoon.reflect.reference.CtTypeReference;
 import spoon.reflect.visitor.CtVisitor;
+import spoon.support.UnsettableProperty;
 
 public class CtTypeAccessImpl<A> extends CtExpressionImpl<Void> implements CtTypeAccess<A> {
 	private CtTypeReference<Void> voidType;
@@ -54,6 +55,7 @@ public CtTypeReference<Void> getType() {
 	}
 
 	@Override
+	@UnsettableProperty
 	public <C extends CtTypedElement> C setType(CtTypeReference<Void> type) {
 		// type is used in setAccessedType now.
 		return (C) this;

diff --git a/src/main/java/spoon/support/reflect/declaration/CtAnnotationTypeImpl.java b/src/main/java/spoon/support/reflect/declaration/CtAnnotationTypeImpl.java
@@ -22,6 +22,7 @@
 import spoon.reflect.declaration.CtType;
 import spoon.reflect.reference.CtTypeReference;
 import spoon.reflect.visitor.CtVisitor;
+import spoon.support.UnsettableProperty;
 
 import java.lang.annotation.Annotation;
 import java.util.Collections;
@@ -52,8 +53,15 @@ public Set<CtTypeReference<?>> getSuperInterfaces() {
 	}
 
 	@Override
+	@UnsettableProperty
+	public <C extends CtType<T>> C setSuperclass(CtTypeReference<?> superClass) {
+		return (C) this;
+	}
+
+	@Override
+	@UnsettableProperty
 	public <C extends CtType<T>> C setSuperInterfaces(Set<CtTypeReference<?>> interfaces) {
-		throw new UnsupportedOperationException("You can't have super interfaces in an annotation.");
+		return (C) this;
 	}
 
 	@Override

diff --git a/src/main/java/spoon/support/reflect/declaration/CtAnonymousExecutableImpl.java b/src/main/java/spoon/support/reflect/declaration/CtAnonymousExecutableImpl.java
@@ -26,6 +26,7 @@
 import spoon.reflect.declaration.ModifierKind;
 import spoon.reflect.reference.CtTypeReference;
 import spoon.reflect.visitor.CtVisitor;
+import spoon.support.UnsettableProperty;
 
 import java.util.EnumSet;
 import java.util.List;
@@ -110,18 +111,23 @@ public List<CtParameter<?>> getParameters() {
 	}
 
 	@Override
+	@UnsettableProperty
 	public CtExecutable setParameters(List list) {
-		throw new UnsupportedOperationException("You can't have parameters in a anonymous executable");
+		// unsettable property
+		return this;
 	}
 
 	@Override
+	@UnsettableProperty
 	public CtExecutable addParameter(CtParameter parameter) {
-		throw new UnsupportedOperationException("You can't have parameters in a anonymous executable");
+		// unsettable property
+		return this;
 	}
 
 	@Override
+	@UnsettableProperty
 	public boolean removeParameter(CtParameter parameter) {
-		throw new UnsupportedOperationException("You can't have parameters in a anonymous executable");
+		return false;
 	}
 
 	@Override
@@ -130,18 +136,24 @@ public Set<CtTypeReference<? extends Throwable>> getThrownTypes() {
 	}
 
 	@Override
+	@UnsettableProperty
 	public CtExecutable setThrownTypes(Set thrownTypes) {
-		throw new UnsupportedOperationException("You can't have throw types in a anonymous executable");
+		// unsettable property
+		return this;
 	}
 
 	@Override
+	@UnsettableProperty
 	public CtExecutable addThrownType(CtTypeReference throwType) {
-		throw new UnsupportedOperationException("You can't have throw types in a anonymous executable");
+		// unsettable property
+		return this;
 	}
 
 	@Override
+	@UnsettableProperty
 	public boolean removeThrownType(CtTypeReference throwType) {
-		throw new UnsupportedOperationException("You can't have throw types in a anonymous executable");
+		// unsettable property
+		return false;
 	}
 
 	@Override
@@ -150,8 +162,10 @@ public String getSimpleName() {
 	}
 
 	@Override
+	@UnsettableProperty
 	public <T extends CtNamedElement> T setSimpleName(String simpleName) {
-		throw new UnsupportedOperationException("You can't have a name in a anonymous executable");
+		// unsettable property
+		return (T) this;
 	}
 
 	@Override
@@ -160,8 +174,10 @@ public CtTypeReference<Void> getType() {
 	}
 
 	@Override
+	@UnsettableProperty
 	public <C extends CtTypedElement> C setType(CtTypeReference<Void> type) {
-		throw new UnsupportedOperationException("An anonymous executable isn't typed");
+		// unsettable property
+		return (C) this;
 	}
 
 	@Override

diff --git a/src/main/java/spoon/support/reflect/declaration/CtClassImpl.java b/src/main/java/spoon/support/reflect/declaration/CtClassImpl.java
@@ -31,6 +31,7 @@
 import spoon.reflect.reference.CtExecutableReference;
 import spoon.reflect.reference.CtTypeReference;
 import spoon.reflect.visitor.CtVisitor;
+import spoon.support.UnsettableProperty;
 import spoon.support.compiler.jdt.JDTBasedSpoonCompiler;
 import spoon.support.reflect.code.CtStatementImpl;
 import spoon.support.reflect.eval.VisitorPartialEvaluator;
@@ -216,8 +217,9 @@ public String getLabel() {
 	}
 
 	@Override
+	@UnsettableProperty
 	public <C extends CtStatement> C setLabel(String label) {
-		throw new UnsupportedOperationException("cannot set a label on a class declaration");
+		return (C) this;
 	}
 
 	@SuppressWarnings("unchecked")

diff --git a/src/main/java/spoon/support/reflect/declaration/CtConstructorImpl.java b/src/main/java/spoon/support/reflect/declaration/CtConstructorImpl.java
@@ -28,6 +28,8 @@
 import spoon.reflect.reference.CtTypeParameterReference;
 import spoon.reflect.reference.CtTypeReference;
 import spoon.reflect.visitor.CtVisitor;
+import spoon.support.DerivedProperty;
+import spoon.support.UnsettableProperty;
 
 import java.util.ArrayList;
 import java.util.EnumSet;
@@ -51,8 +53,9 @@ public void accept(CtVisitor visitor) {
 	}
 
 	@Override
+	@UnsettableProperty
 	public <C extends CtNamedElement> C setSimpleName(String simpleName) {
-		throw new UnsupportedOperationException();
+		return (C) this;
 	}
 
 	@Override
@@ -67,6 +70,7 @@ public CtType<T> getDeclaringType() {
 	}
 
 	@Override
+	@DerivedProperty
 	public CtTypeReference<T> getType() {
 		if (getDeclaringType() == null) {
 			return null;
@@ -75,8 +79,10 @@ public CtTypeReference<T> getType() {
 	}
 
 	@Override
+	@UnsettableProperty
 	public <C extends CtTypedElement> C setType(CtTypeReference<T> type) {
-		throw new UnsupportedOperationException();
+		// unsettable property
+		return (C) this;
 	}
 
 	@Override

diff --git a/src/main/java/spoon/support/reflect/declaration/CtInterfaceImpl.java b/src/main/java/spoon/support/reflect/declaration/CtInterfaceImpl.java
@@ -17,9 +17,11 @@
 package spoon.support.reflect.declaration;
 
 import spoon.reflect.declaration.CtInterface;
+import spoon.reflect.declaration.CtType;
 import spoon.reflect.reference.CtExecutableReference;
 import spoon.reflect.reference.CtTypeReference;
 import spoon.reflect.visitor.CtVisitor;
+import spoon.support.UnsettableProperty;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -67,4 +69,11 @@ public Collection<CtExecutableReference<?>> getDeclaredExecutables() {
 	public CtInterface<T> clone() {
 		return (CtInterface<T>) super.clone();
 	}
+
+	@Override
+	@UnsettableProperty
+	public <C extends CtType<T>> C setSuperclass(CtTypeReference<?> superClass) {
+		// unsettable property
+		return (C) this;
+	}
 }
diff --git a/src/main/java/spoon/support/reflect/declaration/CtParameterImpl.java b/src/main/java/spoon/support/reflect/declaration/CtParameterImpl.java
@@ -27,6 +27,7 @@
 import spoon.reflect.reference.CtParameterReference;
 import spoon.reflect.reference.CtTypeReference;
 import spoon.reflect.visitor.CtVisitor;
+import spoon.support.UnsettableProperty;
 
 import java.util.EnumSet;
 import java.util.Set;
@@ -70,8 +71,10 @@ public CtTypeReference<T> getType() {
 	}
 
 	@Override
+	@UnsettableProperty
 	public <C extends CtVariable<T>> C setDefaultExpression(CtExpression<T> defaultExpression) {
-		throw new UnsupportedOperationException();
+		// unsettable property
+		return (C) this;
 	}
 
 	@Override