From 311ba2cb0f9c0543d9c41b79867625f6cdc3dc1e Mon Sep 17 00:00:00 2001 From: Spencer Williams Date: Thu, 14 Oct 2021 16:01:38 -0400 Subject: [PATCH] test: Migrate CtUnresolvedImportTest to JUnit5 --- .../java/spoon/test/imports/CtUnresolvedImportTest.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/test/java/spoon/test/imports/CtUnresolvedImportTest.java b/src/test/java/spoon/test/imports/CtUnresolvedImportTest.java index 9e8f1ad6ce2..65d58b94717 100644 --- a/src/test/java/spoon/test/imports/CtUnresolvedImportTest.java +++ b/src/test/java/spoon/test/imports/CtUnresolvedImportTest.java @@ -1,6 +1,6 @@ package spoon.test.imports; -import org.junit.Test; +import org.junit.jupiter.api.Test; import spoon.reflect.declaration.CtImport; import spoon.reflect.factory.Factory; import spoon.reflect.reference.CtReference; @@ -9,14 +9,13 @@ import java.util.HashSet; import java.util.Set; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import static spoon.testing.utils.ModelUtils.build; public class CtUnresolvedImportTest { @Test public void testEquality() throws Exception { - final Factory factory = build(A.class); CtImport i1 = factory.createUnresolvedImport("spoon.A", false); CtImport i2 = factory.createUnresolvedImport("spoon.A", false); @@ -25,7 +24,6 @@ public void testEquality() throws Exception { CtImport i5 = factory.createUnresolvedImport("spoon.m", true); CtImport i6 = factory.createUnresolvedImport("spoon.m", true); - CtReference ref = factory.createReference("spoon.A"); CtImport i7 = factory.createImport(ref); @@ -45,6 +43,8 @@ public void testEquality() throws Exception { assertEquals(i1.hashCode(), i2.hashCode()); assertNotEquals(i1, i3); + // hashCode() and equals() should work as expected for set-element-membership identification based on + // the contained reference and isStatic field Set imports = new HashSet<>(); assertTrue(imports.add(i1)); assertFalse(imports.add(i2)); @@ -55,5 +55,4 @@ public void testEquality() throws Exception { assertTrue(imports.add(i7)); assertEquals(5, imports.size()); } - } \ No newline at end of file