refactor(testing): migrate to SpoonAssertions and deprecate old assertion package by MartinWitt · Pull Request #6741 · INRIA/spoon

MartinWitt · 2026-05-31T12:15:56Z

Removes the usage of old Assertions in our codebase and marks them for deprecation. Given we have the new ones we should only use them. Removing them is downstream breaking but tbf u shouldn't use them.

@deprecated

…tion 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.

Copilot

Pull request overview

This PR migrates test code away from the legacy spoon.testing.Assert fluent API toward the newer SpoonAssertions (from spoon.testing.assertions) and AssertJ. Test model construction is moved to the @ModelTest / @ByClass annotations, and assertThrows is replaced by assertThatThrownBy. The eight assertion classes that previously lived in src/main/java/spoon/testing are now marked @Deprecated(since = "11", forRemoval = true) and their Javadoc points to the replacement.

Changes:

Annotate the legacy spoon.testing.*Assert* classes as deprecated for removal.
Replace JUnit/spoon.testing.Assert usages in tests with SpoonAssertions + AssertJ, using @ModelTest/@ByClass for model setup.
Switch processor-driven assertions to call ProcessorUtils.process(...) directly and then compare resulting types.

Reviewed changes

Copilot reviewed 17 out of 17 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
src/main/java/spoon/testing/Assert.java	Adds `@Deprecated(forRemoval=true)` with pointer to `SpoonAssertions`.
src/main/java/spoon/testing/AbstractAssert.java	Deprecation annotation + Javadoc.
src/main/java/spoon/testing/AbstractCtElementAssert.java	Deprecation annotation + Javadoc.
src/main/java/spoon/testing/AbstractCtPackageAssert.java	Deprecation annotation + Javadoc.
src/main/java/spoon/testing/AbstractFileAssert.java	Deprecation annotation + Javadoc.
src/main/java/spoon/testing/CtElementAssert.java	Deprecation annotation + Javadoc.
src/main/java/spoon/testing/CtPackageAssert.java	Deprecation annotation + Javadoc.
src/main/java/spoon/testing/FileAssert.java	Deprecation annotation + Javadoc.
src/test/java/spoon/testing/AbstractAssertTest.java	Migrates to `@ModelTest` + `ProcessorUtils.process`; the three processor-variant tests now contain identical bodies.
src/test/java/spoon/testing/CtElementAssertTest.java	Migrates to `@ModelTest`/`@ByClass` and `SpoonAssertions`/AssertJ.
src/test/java/spoon/testing/CtPackageAssertTest.java	Migrates to `@ModelTest` and `SpoonAssertions`/AssertJ.
src/test/java/spoon/testing/FileAssertTest.java	Replaces file-path assertions with `CtType`-based comparisons via `@ModelTest`.
src/test/java/spoon/processing/ProcessingTest.java	Migrates template-output test to `@ModelTest` + `SpoonAssertions`.
src/test/java/spoon/processing/CtGenerationTest.java	Updates `assertThat` import to `SpoonAssertions`.
src/test/java/spoon/support/TypeAdaptorTest.java	Updates `assertThat` import to `SpoonAssertions`.
src/test/java/spoon/test/pkg/PackageTest.java	Updates `assertThat` import to `SpoonAssertions`.
src/test/java/spoon/test/fieldaccesses/FieldAccessTest.java	Removes `spoon.testing.Assert` import and converts a CtElement-vs-String assertion to a raw `toString()` comparison.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

+	@ModelTest("./src/test/java/spoon/testing/testclasses/" + "Foo.java")
+	public void testTransformationWithProcessorClass(Factory actual) {
+		ProcessorUtils.process(actual, List.of(new FooToBarProcessor()));
+		List<CtType<?>> actualTypes = actual.Type().getAll();
+		List<CtType<?>> expectedTypes = build(new File("./src/test/java/spoon/testing/testclasses/" + "Bar.java")).Type().getAll();
+		Assertions.assertThat(actualTypes).hasSameSizeAs(expectedTypes);
+		for (int i = 0; i < actualTypes.size(); i++) {
+			assertThat(actualTypes.get(i)).isEqualTo(expectedTypes.get(i));
+		}
 	}

-	@Test
-	public void testTransformationWithProcessorName() {
-		assertThat(PATH + "Foo.java").withProcessor(FooToBarProcessor.class.getName()).isEqualTo(PATH + "Bar.java");
+	@ModelTest("./src/test/java/spoon/testing/testclasses/" + "Foo.java")
+	public void testTransformationWithProcessorName(Factory actual) {
+		ProcessorUtils.process(actual, List.of(new FooToBarProcessor()));
+		List<CtType<?>> actualTypes = actual.Type().getAll();
+		List<CtType<?>> expectedTypes = build(new File("./src/test/java/spoon/testing/testclasses/" + "Bar.java")).Type().getAll();
+		Assertions.assertThat(actualTypes).hasSameSizeAs(expectedTypes);
+		for (int i = 0; i < actualTypes.size(); i++) {
+			assertThat(actualTypes.get(i)).isEqualTo(expectedTypes.get(i));
+		}
 	}


 		assertEquals(1, elements.size());
 		assertTrue(elements.get(0).getType().getDeclaringType().isAnonymous());
-		assertThat(elements.get(0)).isEqualTo("private final Test test = new Test();");
+		assertEquals("private final Test test = new Test();", elements.get(0).toString());


…nAssertions

MartinWitt · 2026-05-31T17:59:57Z

@I-Al-Istannen @SirYwell any comments?

I-Al-Istannen · 2026-05-31T21:51:01Z

-	@Test
-	public void testTransformationWithProcessorInstantiated() {
-		assertThat(PATH + "Foo.java").withProcessor(new FooToBarProcessor()).isEqualTo(PATH + "Bar.java");
+	@ModelTest("./src/test/java/spoon/testing/testclasses/" + "Foo.java")


Why not one string?

I-Al-Istannen · 2026-05-31T21:51:20Z

+	public void testTransformationWithProcessorInstantiated(Factory actual) {
+		ProcessorUtils.process(actual, List.of(new FooToBarProcessor()));
+		List<CtType<?>> actualTypes = actual.Type().getAll();
+		List<CtType<?>> expectedTypes = build(new File("./src/test/java/spoon/testing/testclasses/" + "Bar.java")).Type().getAll();


I-Al-Istannen · 2026-05-31T21:51:35Z

+		ProcessorUtils.process(actual, List.of(new FooToBarProcessor()));
+		List<CtType<?>> actualTypes = actual.Type().getAll();
+		List<CtType<?>> expectedTypes = build(new File("./src/test/java/spoon/testing/testclasses/" + "Bar.java")).Type().getAll();
+		Assertions.assertThat(actualTypes).hasSameSizeAs(expectedTypes);


We can probably use the list assert here?

I-Al-Istannen · 2026-05-31T21:52:35Z

I think it also changes some test a bit but I like the idea :)

…bstractAssertTest

MartinWitt · 2026-06-04T12:24:09Z

@I-Al-Istannen fixed ur comments

Copilot AI review requested due to automatic review settings May 31, 2026 12:15

Copilot started reviewing on behalf of MartinWitt May 31, 2026 12:16 View session

Copilot AI reviewed May 31, 2026

View reviewed changes

MartinWitt added 4 commits May 31, 2026 14:18

refactor(tests): update file paths in assertions and simplify imports

99661f5

refactor(tests): update file paths in assertions and simplify imports

f7869c6

refactor(tests): update file paths in assertions and simplify imports

50e9ab4

refactor: update deprecation messages to use code formatting for Spoo…

22918dc

…nAssertions

I-Al-Istannen reviewed May 31, 2026

View reviewed changes

refactor(tests): simplify assertions and unify test method names in A…

f52bc36

…bstractAssertTest

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

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

refactor(testing): migrate to SpoonAssertions and deprecate old assertion package#6741
MartinWitt wants to merge 6 commits into
masterfrom
refactor/migrate-to-spoon-assertions

MartinWitt commented May 31, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

MartinWitt commented May 31, 2026

Uh oh!

I-Al-Istannen May 31, 2026

Uh oh!

I-Al-Istannen May 31, 2026

Uh oh!

I-Al-Istannen May 31, 2026

Uh oh!

I-Al-Istannen commented May 31, 2026

Uh oh!

MartinWitt commented Jun 4, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

MartinWitt commented May 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

MartinWitt commented May 31, 2026

Uh oh!

I-Al-Istannen May 31, 2026

Choose a reason for hiding this comment

Uh oh!

I-Al-Istannen May 31, 2026

Choose a reason for hiding this comment

Uh oh!

I-Al-Istannen May 31, 2026

Choose a reason for hiding this comment

Uh oh!

I-Al-Istannen commented May 31, 2026

Uh oh!

MartinWitt commented Jun 4, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

MartinWitt commented May 31, 2026 •

edited

Loading