relax junit4 type checks for parameterized types (TNG#132)

* also write test and remove so solved `rawType` constraint * also this allows somewhat strange subtypes of lists with e.g. multiple type args Signed-off-by: Andreas Schmid <[email protected]>
maggifreak · Jan 31, 2021 · 1dbc797 · 1dbc797
1 parent 6d729df
commit 1dbc797
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 19 deletions.
diff --git a/junit4/src/main/java/com/tngtech/java/junit/dataprovider/internal/DataConverter.java b/junit4/src/main/java/com/tngtech/java/junit/dataprovider/internal/DataConverter.java
@@ -57,7 +57,7 @@ public DataConverter() {
      * </ul>
      *
      * Please note, that {@link Iterable} can be replaced by any valid subtype (checked via {@link Class#isAssignableFrom(Class)}). As well
-     * as an arbitrary inner type is also accepted. Only rawtypes are not supported currently.
+     * as an arbitrary inner type is also accepted.
      *
      * @param type to be checked for convertibility (use either {@link Method#getGenericReturnType()}, {@link Method#getReturnType()}, or
      *            simple {@link Class} if possible)
@@ -70,11 +70,7 @@ public boolean canConvert(Type type) {
 
         if (type instanceof ParameterizedType) {
             ParameterizedType parameterizedType = (ParameterizedType) type;
-
-            Type rawType = parameterizedType.getRawType();
-            if (Iterable.class.isAssignableFrom((Class<?>) rawType)) {
-                return canConvertIterableOf(parameterizedType);
-            }
+            return Iterable.class.isAssignableFrom((Class<?>) parameterizedType.getRawType());
         }
         return false;
     }
@@ -103,18 +99,6 @@ public List<Object[]> convert(Object data, boolean isVarargs, Class<?>[] paramet
         return super.convert(data, isVarargs, parameterTypes, context);
     }
 
-    private boolean canConvertIterableOf(ParameterizedType parameterizedType) {
-        if (parameterizedType.getActualTypeArguments().length == 1) {
-            Type innerType = parameterizedType.getActualTypeArguments()[0];
-            if (parameterizedType.getActualTypeArguments()[0] instanceof ParameterizedType) {
-                ParameterizedType innerType2 = (ParameterizedType) innerType;
-                return Iterable.class.isAssignableFrom((Class<?>) innerType2.getRawType());
-            }
-            return true;
-        }
-        return false;
-    }
-
     public void setObjectArrayConverter(ObjectArrayConverter objectArrayConverter) {
         this.objectArrayConverter = objectArrayConverter;
     }

diff --git a/junit4/src/test/java/com/tngtech/java/junit/dataprovider/internal/DataConverterTest.java b/junit4/src/test/java/com/tngtech/java/junit/dataprovider/internal/DataConverterTest.java
@@ -112,6 +112,30 @@ public void testCanConvertShouldReturnTrueIfTypeIsListOfObject() {
         assertThat(result).isTrue();
     }
 
+    @Test
+    public void testCanConvertShouldReturnTrueIfTypeIsListOfNonIterableParameterizedType() {
+        // Given:
+        Type type = getMethod("methodReturningListOfNonIterableParameterizedType").getGenericReturnType();
+
+        // When:
+        boolean result = underTest.canConvert(type);
+
+        // Then:
+        assertThat(result).isTrue();
+    }
+
+    @Test
+    public void testCanConvertShouldReturnTrueIfTypeIsListOfRawType() {
+        // Given:
+        Type type = getMethod("methodReturningListOfRawType").getGenericReturnType();
+
+        // When:
+        boolean result = underTest.canConvert(type);
+
+        // Then:
+        assertThat(result).isTrue();
+    }
+
     @Test
     public void testCanConvertShouldReturnTrueIfTypeIsIterableOfWildcard() {
         // Given:
@@ -169,7 +193,7 @@ public void testCanConvertShouldReturnFalseIfTypeIsTwoArgList() {
         boolean result = underTest.canConvert(type);
 
         // Then:
-        assertThat(result).isFalse();
+        assertThat(result).isTrue();
     }
 
     @Test
@@ -533,6 +557,15 @@ public static List<Object> methodReturningListOfObject() {
         return null;
     }
 
+    @SuppressWarnings("rawtypes")
+    public static List<Comparable> methodReturningListOfRawType() {
+        return null;
+    }
+
+    public static List<Comparable<Object>> methodReturningListOfNonIterableParameterizedType() {
+        return null;
+    }
+
     public static List<?> methodReturningIterableOfWildcard() {
         return null;
     }