Merge pull request #1172 from WebFuzzing/issue-#1171

#1171 support for enums as keys for maps

Author: arcuri82

client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/object/ClassToSchema.java

@@ -329,11 +329,36 @@ private static String getSchema(Type type, Boolean useRefObject, List<Class<?>>
             return fieldArraySchema(klass, pType, nested, allNested, objectFieldsRequired, converters);
         }
 
-        if ((klass != null && Map.class.isAssignableFrom(klass)) || pType != null && Map.class.isAssignableFrom((Class) pType.getRawType())) {
+        if ((klass != null && Map.class.isAssignableFrom(klass))
+                || pType != null && Map.class.isAssignableFrom((Class) pType.getRawType())) {
+
             if (pType != null && pType.getActualTypeArguments().length > 0) {
                 Type keyType = pType.getActualTypeArguments()[0];
-                if (keyType != String.class) {
-                    throw new IllegalStateException("only support Map with String key");
+
+                if(keyType instanceof Class && ((Class<?>) keyType).isEnum()) {
+                    /*
+                        peculiar case... the keys of a map are an enumeration, so can have only a restricted
+                        set of them. can't add any key. adding constraints would be quite complex...
+                        so maybe a valid option is to treat it as an object?
+                        TODO should verify if any side-effects, eg when dealing with null VS undefined
+                     */
+                    Type valueType = pType.getActualTypeArguments()[1];
+                    List<String> properties = new ArrayList<>();
+                    List<String> propertiesNames = new ArrayList<>();
+                    Class<?> enumKeys = (Class<?>) keyType;
+                    for(Object e : enumKeys.getEnumConstants()){
+                       String key = e.toString();
+                        String fieldName = key;
+                        String fieldSchema;
+                        fieldSchema = named(fieldName, getOrDeriveSchema(valueType, true, nested, false, converters));
+                        properties.add(fieldSchema);
+                        propertiesNames.add("\"" + fieldName + "\"");
+                    }
+                    return fieldObjectSchema(properties, propertiesNames, false);
+                }
+
+                if (keyType != String.class ) {
+                    throw new IllegalStateException("only support Map with String and Enum keys. Not supported type: " + keyType);
                 }
             }
 

client-java/instrumentation/src/test/java/org/evomaster/client/java/instrumentation/object/ClassToSchemaTest.java

@@ -24,6 +24,33 @@ private JsonObject parse(String schema){
         return JsonParser.parseString("{" + schema + "}").getAsJsonObject();
     }
 
+
+    @Test
+    public void testDtoEnumMap(){
+
+        String schema = ClassToSchema.getOrDeriveNonNestedSchema(DtoEnumMap.class);
+        JsonObject json = parse(schema);
+
+        JsonObject obj = json.get(DtoEnumMap.class.getName()).getAsJsonObject();
+        assertNotNull(obj);
+        assertNotNull(obj.get("type"));
+        assertNotNull(obj.get("properties"));
+        assertEquals(2, obj.entrySet().size());
+
+        assertEquals("object", obj.get("type").getAsString());
+
+        JsonObject propertiesJson = obj.get("properties").getAsJsonObject();
+        assertEquals(1, propertiesJson.entrySet().size());
+
+        JsonObject data = propertiesJson.get("data").getAsJsonObject();
+        JsonObject propertiesData = data.get("properties").getAsJsonObject();
+        assertEquals(3, propertiesData.entrySet().size());
+
+        assertEquals("boolean", propertiesData.get("ONE").getAsJsonObject().get("type").getAsString());
+        assertEquals("boolean", propertiesData.get("TWO").getAsJsonObject().get("type").getAsString());
+        assertEquals("boolean", propertiesData.get("THREE").getAsJsonObject().get("type").getAsString());
+    }
+
     @Test
     public void testBase(){
 

client-java/instrumentation/src/test/java/org/evomaster/client/java/instrumentation/object/dtos/DtoEnumMap.java

@@ -0,0 +1,8 @@
+package org.evomaster.client.java.instrumentation.object.dtos;
+
+import java.util.Map;
+
+public class DtoEnumMap {
+
+    public Map<SimpleEnum, Boolean> data;
+}