refactor(testing): migrate to SpoonAssertions and deprecate old assertion package

Replaces all uses of spoon.testing.Assert with SpoonAssertions from
spoon.testing.assertions. Test model building is migrated to @modeltest,
JUnit assertions are replaced with AssertJ/SpoonAssertions. The eight
assertion classes in spoon.testing (src/main) are annotated
@deprecated(since="11", forRemoval=true) pointing to SpoonAssertions.

Author: MartinWitt

src/main/java/spoon/testing/AbstractAssert.java

@@ -20,7 +20,9 @@
  * 		the self type of this assertion class.
  * @param <A>
  * 		the type of the actual value.
+ * @deprecated Use {@link spoon.testing.assertions.SpoonAssertions} instead.
  */
+@Deprecated(since = "11", forRemoval = true)
 public abstract class AbstractAssert<T extends AbstractAssert<T, A>, A> {
 	protected final LinkedList<Processor<?>> processors = new LinkedList<>();
 	protected final A actual;

src/main/java/spoon/testing/AbstractCtElementAssert.java

@@ -14,6 +14,10 @@
 import static spoon.testing.utils.Check.assertIsSame;
 import static spoon.testing.utils.ProcessorUtils.process;
 
+/**
+ * @deprecated Use {@link spoon.testing.assertions.SpoonAssertions} instead.
+ */
+@Deprecated(since = "11", forRemoval = true)
 public abstract class AbstractCtElementAssert<T extends AbstractCtElementAssert<T>> extends AbstractAssert<T, CtElement> {
 	protected AbstractCtElementAssert(CtElement actual, Class<?> selfType) {
 		super(actual, selfType);

src/main/java/spoon/testing/AbstractCtPackageAssert.java

@@ -19,6 +19,10 @@
 import static spoon.testing.utils.Check.assertNotNull;
 import static spoon.testing.utils.ProcessorUtils.process;
 
+/**
+ * @deprecated Use {@link spoon.testing.assertions.SpoonAssertions} instead.
+ */
+@Deprecated(since = "11", forRemoval = true)
 public abstract class AbstractCtPackageAssert<T extends AbstractCtPackageAssert<T>> extends AbstractAssert<T, CtPackage> {
 	protected AbstractCtPackageAssert(CtPackage actual, Class<?> selfType) {
 		super(actual, selfType);

src/main/java/spoon/testing/AbstractFileAssert.java

@@ -18,6 +18,10 @@
 import static spoon.testing.utils.ModelUtils.build;
 import static spoon.testing.utils.ProcessorUtils.process;
 
+/**
+ * @deprecated Use {@link spoon.testing.assertions.SpoonAssertions} instead.
+ */
+@Deprecated(since = "11", forRemoval = true)
 public abstract class AbstractFileAssert<T extends AbstractFileAssert<T>> extends AbstractAssert<T, File> {
 	public AbstractFileAssert(File actual, Class<?> selfType) {
 		super(actual, selfType);

src/main/java/spoon/testing/Assert.java

@@ -20,7 +20,10 @@
  * Each method in this class is a static factory for the type-specific
  * assertion objects. The purpose of this class is to make test code
  * more readable.
+ *
+ * @deprecated Use {@link spoon.testing.assertions.SpoonAssertions} instead.
  */
+@Deprecated(since = "11", forRemoval = true)
 public class Assert {
 	private Assert() { }
 	/**

src/main/java/spoon/testing/CtElementAssert.java

@@ -9,6 +9,10 @@
 
 import spoon.reflect.declaration.CtElement;
 
+/**
+ * @deprecated Use {@link spoon.testing.assertions.SpoonAssertions} instead.
+ */
+@Deprecated(since = "11", forRemoval = true)
 public class CtElementAssert extends AbstractCtElementAssert<CtElementAssert> {
 	protected CtElementAssert(CtElement actual) {
 		super(actual, CtElementAssert.class);

src/main/java/spoon/testing/CtPackageAssert.java

@@ -9,6 +9,10 @@
 
 import spoon.reflect.declaration.CtPackage;
 
+/**
+ * @deprecated Use {@link spoon.testing.assertions.SpoonAssertions} instead.
+ */
+@Deprecated(since = "11", forRemoval = true)
 public class CtPackageAssert extends AbstractCtPackageAssert<CtPackageAssert> {
 	public CtPackageAssert(CtPackage actual) {
 		super(actual, CtPackageAssert.class);

src/main/java/spoon/testing/FileAssert.java

@@ -9,6 +9,10 @@
 
 import java.io.File;
 
+/**
+ * @deprecated Use {@link spoon.testing.assertions.SpoonAssertions} instead.
+ */
+@Deprecated(since = "11", forRemoval = true)
 public class FileAssert extends AbstractFileAssert<FileAssert> {
 	public FileAssert(File actual) {
 		super(actual, FileAssert.class);

src/test/java/spoon/processing/CtGenerationTest.java

@@ -37,7 +37,7 @@
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
-import static spoon.testing.Assert.assertThat;
+import static spoon.testing.assertions.SpoonAssertions.assertThat;
 import static spoon.testing.utils.ModelUtils.build;
 
 public class CtGenerationTest {

src/test/java/spoon/processing/ProcessingTest.java

@@ -29,16 +29,22 @@
 import spoon.test.processing.processors.MyProcessor;
 import spoon.test.template.testclasses.AssertToIfAssertedStatementTemplate;
 
+import spoon.reflect.declaration.CtType;
+import spoon.reflect.factory.Factory;
+import spoon.testing.utils.ModelTest;
+
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.List;
 
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
-import static spoon.testing.Assert.assertThat;
+import static spoon.testing.assertions.SpoonAssertions.assertThat;
+import static spoon.testing.utils.ModelUtils.build;
 
 public class ProcessingTest {
 
@@ -130,8 +136,8 @@ public void testNullPointerException() throws IOException {
 		l.run();
 	}
 
-	@Test
-	public void testTemplateNotInOutput() throws IOException {
+	@ModelTest("src/test/resources/spoon/test/template/SimpleIfAsserted.java")
+	public void testTemplateNotInOutput(Factory expectedFactory) throws IOException {
 		// https://github.com/INRIA/spoon/issues/2987
 		class AssertProcessor extends AbstractProcessor<CtAssert<?>> {
 			public void process(CtAssert<?> element) {
@@ -141,24 +147,29 @@ public void process(CtAssert<?> element) {
 				);
 			}
 		}
-		
+
 		String templatePath = "src/test/java/spoon/test/template/testclasses/AssertToIfAssertedStatementTemplate.java";
 		String resourcePath = "src/test/resources/spoon/test/template/";
-		
+
 		final Launcher l = new Launcher();
 		Path outputPath = Files.createTempDirectory("emptydir");
-		
+
 		l.addProcessor(new AssertProcessor());
 		l.addTemplateResource(new FileSystemFile(templatePath));
-		
+
 		l.addInputResource(resourcePath + "SimpleAssert.java");
 		l.setSourceOutputDirectory(outputPath.toFile());
 		l.run();
 
 		// If template is applied to itself then there will be modified spoon/...Template.java on output
-		assertArrayEquals(new String[]{"SimpleAssert.java"}, outputPath.toFile().list(), "Template source found in output");
+		org.assertj.core.api.Assertions.assertThat(outputPath.toFile().list())
+			.containsExactly("SimpleAssert.java");
 		// Check that the template worked as intended
-		assertThat(outputPath.toString() + "/SimpleAssert.java")
-			.isEqualTo(resourcePath + "SimpleIfAsserted.java");
+		List<CtType<?>> actualTypes = build(new File(outputPath.toString() + "/SimpleAssert.java")).Type().getAll();
+		List<CtType<?>> expectedTypes = expectedFactory.Type().getAll();
+		org.assertj.core.api.Assertions.assertThat(actualTypes).hasSameSizeAs(expectedTypes);
+		for (int i = 0; i < actualTypes.size(); i++) {
+			assertThat(actualTypes.get(i)).isEqualTo(expectedTypes.get(i));
+		}
 	}
 }