Make CodeListTest robust to code list values created in other tests.

Author: desruisseaux

geoapi/src/test/java/org/opengis/geoapi/CodeListTest.java

@@ -41,6 +41,13 @@
  * @since   2.0
  */
 public final class CodeListTest {
+    /**
+     * Suffix of code list values created by other tests.
+     * Those values need to be ignored by {@code CodeListTest}.
+     * We use the {@value} prefix in their name for identifying them.
+     */
+    public static final String IGNORABLE_NAME_SUFFIX = "Test";
+
     /**
      * Creates a new test case.
      */
@@ -72,6 +79,7 @@ public void testAll() throws NoSuchFieldException, NoSuchMethodException,
             assertTrue(Modifier.isStatic(valuesMethod.getModifiers()), () -> className + ".values() is not static.");
             final ControlledVocabulary[] values = (ControlledVocabulary[]) valuesMethod.invoke(null, (Object[]) null);
             assertNotNull(values, () -> className + ".values() returned null.");
+            int ignored = 0;
             /*
              * Tests every CodeList instances returned by values().
              * Every field should be public, static and final.
@@ -81,6 +89,10 @@ public void testAll() throws NoSuchFieldException, NoSuchMethodException,
                 final String valueName = value.name();
                 final String fullName  = className + '.' + valueName;
                 assertTrue(codeClass.isInstance(value), () -> fullName + " is of unexpected type.");
+                if (valueName.endsWith(IGNORABLE_NAME_SUFFIX)) {
+                    ignored++;
+                    continue;       // Skip values created in other tests.
+                }
                 final Field field = codeClass.getDeclaredField(valueName);
                 final int modifiers = field.getModifiers();
                 if (field.isAnnotationPresent(UML.class)) {
@@ -110,7 +122,7 @@ public void testAll() throws NoSuchFieldException, NoSuchMethodException,
             if (CodeList.class.isAssignableFrom(codeClass)) {
                 final Vocabulary desc = codeClass.getAnnotation(Vocabulary.class);
                 assertNotNull(desc, () -> className + " has no @Vocabulary annotation.");
-                assertEquals(values.length, desc.capacity(), () -> className + " is not properly sized.");
+                assertEquals(values.length - ignored, desc.capacity(), () -> className + " is not properly sized.");
                 /*
                  * Tests valueOf(String).
                  */

geoapi/src/test/java/org/opengis/referencing/ReferenceSystemTypeTest.java

@@ -42,6 +42,7 @@
 import org.opengis.referencing.crs.VerticalCRS;
 import org.junit.jupiter.api.Test;
 
+import static org.opengis.geoapi.CodeListTest.IGNORABLE_NAME_SUFFIX;
 import static org.junit.jupiter.api.Assertions.*;
 
 
@@ -81,16 +82,17 @@ public void testCompound() {
                 "COMPOUND_ENGINEERING_TEMPORAL", ReferenceSystemType.TEMPORAL);
         assertSame(ReferenceSystemType.COMPOUND_ENGINEERING_TEMPORAL, base);
 
-        final ReferenceSystemType compound = base.compound("MyCustomCompound", ReferenceSystemType.PARAMETRIC);
-        assertSame(compound, base.compound("MyCustomCompound", ReferenceSystemType.PARAMETRIC));
-        assertEquals("MyCustomCompound", compound.name());
+        final String name = "Compound" + IGNORABLE_NAME_SUFFIX;
+        final ReferenceSystemType compound = base.compound(name, ReferenceSystemType.PARAMETRIC);
+        assertSame(compound, base.compound(name, ReferenceSystemType.PARAMETRIC));
+        assertEquals(name, compound.name());
 
         RuntimeException e;
         e = assertThrows(IllegalStateException.class, () -> base.compound("Dummy", ReferenceSystemType.ENGINEERING_DESIGN));
         assertEquals("ENGINEERING_DESIGN", e.getMessage());
 
-        e = assertThrows(IllegalArgumentException.class, () -> base.compound("MyCustomCompound", ReferenceSystemType.VERTICAL));
-        assertTrue(e.getMessage().contains("MyCustomCompound"));
+        e = assertThrows(IllegalArgumentException.class, () -> base.compound(name, ReferenceSystemType.VERTICAL));
+        assertTrue(e.getMessage().contains(name));
     }
 
     /**