cleanup some enum tests that were testing the wrong thing anyways

Author: JasperGeurtz

src/test/java/bwapi/EnumsTest.java

@@ -4,9 +4,15 @@
 
 import java.io.File;
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
@@ -15,35 +21,59 @@ public class EnumsTest {
     static String ARRAY_VALUE = "idToEnum";
     static String ID_VALUE = "id";
 
+
+    static List<Class<?>> getBWAPIEnums() throws ClassNotFoundException {
+        List<Class<?>> enums = new ArrayList<>();
+        for (File file : Objects.requireNonNull(new File(CLASSES_LOCATION).listFiles())) {
+            if (file.isFile()) {
+                Class<?> cls = Class.forName("bwapi." + file.getName().replace(".java", ""));
+                if (cls.isEnum()) {
+                    enums.add(cls);
+                }
+            }
+        }
+        return enums;
+    }
     /*
      * Check, via reflection, that all Enums that have an "idToEnum" array to be of correct lenght
      */
     @Test
-    public void checkAllEnums() throws Exception {
-        for (File file : Objects.requireNonNull(new File(CLASSES_LOCATION).listFiles())) {
-            if (file.isFile()) {
-                Class<?> cls = Class.forName("bwapi." + file.getName().replace(".java", ""));
-                if (cls.isEnum() && Arrays.stream(cls.getDeclaredFields()).anyMatch(f -> f.getName().equals(ARRAY_VALUE))) {
-                    Field field = cls.getDeclaredField(ARRAY_VALUE);
-                    assertFalse(field.isAccessible());
-                    field.setAccessible(true);
-
-                    int arrayLength = ((Object[])field.get(null)).length;
-                    int maxEnumVal = Arrays.stream((Object[]) cls.getDeclaredMethod("values").invoke(null))
-                            .mapToInt(obj -> {
-                                try {
-                                    Field f = obj.getClass().getDeclaredField(ID_VALUE);
-                                    assertFalse(f.isAccessible());
-                                    f.setAccessible(true);
-                                    return f.getInt(obj);
-                                } catch (Exception e) {
-                                    e.printStackTrace();
-                                    return -1;
-                                }
-                            })
-                            .max()
-                            .orElse(-1);
-                    assertEquals(arrayLength, maxEnumVal + 1);
+    public void checkAllidToEnumsArrayLenghts() throws Exception {
+        for (Class<?> cls : getBWAPIEnums()) {
+            if (Arrays.stream(cls.getDeclaredFields()).anyMatch(f -> f.getName().equals(ARRAY_VALUE))) {
+                Field field = cls.getDeclaredField(ARRAY_VALUE);
+                assertFalse(field.isAccessible());
+                field.setAccessible(true);
+
+                int arrayLength = ((Object[])field.get(null)).length;
+                int maxEnumVal = Integer.MIN_VALUE;
+                for (Object obj : (Object[]) cls.getDeclaredMethod("values").invoke(null)) {
+                    Field f = obj.getClass().getDeclaredField(ID_VALUE);
+                    assertFalse(f.isAccessible());
+                    f.setAccessible(true);
+                    int val = f.getInt(obj);
+                    if (val > maxEnumVal) {
+                        maxEnumVal = val;
+                    }
+                }
+                assertEquals(arrayLength, maxEnumVal + 1);
+            }
+        }
+    }
+
+    @Test
+    public void ensureSimpleGettersReturnNonNullAndDontFail() throws ClassNotFoundException, InvocationTargetException, IllegalAccessException {
+        for (Class<?> cls : getBWAPIEnums()) {
+            List<Method> simpleGetters = Arrays.stream(cls.getMethods())
+                    .filter(it -> it.getParameterCount() == 0 && it.getReturnType() != Void.TYPE)
+                    .collect(Collectors.toList());
+            for (Object type : cls.getEnumConstants()) {
+                for (Method getter : simpleGetters) {
+                    // WHEN
+                    Object result = getter.invoke(type);
+
+                    // THEN
+                    assertThat(result).describedAs("When calling " + getter.getName()).isNotNull();
                 }
             }
         }