This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
commit e589e2ba62eb0aa69bf01bcef76a10525114e998
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Tue Jul 11 16:35:49 2023 -0400
Sort members
---
.../commons/lang3/reflect/TypeUtilsTest.java | 50 +++++++++++-----------
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
b/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
index fb7a41206..67de3b19e 100644
--- a/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/reflect/TypeUtilsTest.java
@@ -122,14 +122,6 @@ class AClass extends AAClass<String>.BBClass<Number> {
abstract class Test1<G> {
public abstract Object m0();
public abstract String[] m1();
- public abstract <E> E[] m2();
- public abstract <E> List<? extends E> m3();
- public abstract <E extends Enum<E>> List<? extends Enum<E>> m4();
- public abstract List<? extends Enum<?>> m5();
- public abstract List<? super Enum<?>> m6();
- public abstract List<?> m7();
- public abstract Map<? extends Enum<?>, ? super Enum<?>> m8();
- public abstract <K, V> Map<? extends K, ? super V[]> m9();
public abstract <K, V> Map<? extends K, V[]> m10();
public abstract <K, V> Map<? extends K, List<V[]>> m11();
public abstract List m12();
@@ -138,6 +130,14 @@ abstract class Test1<G> {
public abstract G m15();
public abstract List<G> m16();
public abstract Enum m17();
+ public abstract <E> E[] m2();
+ public abstract <E> List<? extends E> m3();
+ public abstract <E extends Enum<E>> List<? extends Enum<E>> m4();
+ public abstract List<? extends Enum<?>> m5();
+ public abstract List<? super Enum<?>> m6();
+ public abstract List<?> m7();
+ public abstract Map<? extends Enum<?>, ? super Enum<?>> m8();
+ public abstract <K, V> Map<? extends K, ? super V[]> m9();
}
/**
@@ -824,7 +824,7 @@ public class TypeUtilsTest<B> extends AbstractLangTest {
}
@Test
- public void testIsAssignableGenericArrayTypeToParameterizedType() {
+ public void testIsAssignableGenericArrayTypeToObject() {
final Class<Constructor> rawClass = Constructor.class;
final Class<Insets> typeArgClass = Insets.class;
// Builds a ParameterizedType for Constructor<Insets>
@@ -832,19 +832,18 @@ public class TypeUtilsTest<B> extends AbstractLangTest {
assertEquals(rawClass, paramType.getRawType());
assertEquals(typeArgClass, paramType.getActualTypeArguments()[0]);
-
assertFalse(GenericArrayType.class.isAssignableFrom(paramType.getClass()));
-
assertFalse(paramType.getClass().isAssignableFrom(GenericArrayType.class));
+ assertTrue(Object.class.isAssignableFrom(paramType.getClass()));
+ assertFalse(paramType.getClass().isAssignableFrom(Object.class));
- final GenericArrayType testType =
TypeUtils.genericArrayType(paramType);
- assertFalse(TypeUtils.isAssignable(paramType, testType),
+ final Type testType = Object.class;
+ assertTrue(TypeUtils.isAssignable(paramType, testType),
() -> String.format("TypeUtils.isAssignable(%s, %s)",
paramType, testType));
assertFalse(TypeUtils.isAssignable(testType, paramType),
() -> String.format("TypeUtils.isAssignable(%s, %s)",
testType, paramType));
}
@Test
- @Disabled("TODO")
- public void testIsAssignableGenericArrayTypeToWildercardType() {
+ public void testIsAssignableGenericArrayTypeToParameterizedType() {
final Class<Constructor> rawClass = Constructor.class;
final Class<Insets> typeArgClass = Insets.class;
// Builds a ParameterizedType for Constructor<Insets>
@@ -852,12 +851,10 @@ public class TypeUtilsTest<B> extends AbstractLangTest {
assertEquals(rawClass, paramType.getRawType());
assertEquals(typeArgClass, paramType.getActualTypeArguments()[0]);
- assertFalse(WildcardType.class.isAssignableFrom(paramType.getClass()));
- assertFalse(paramType.getClass().isAssignableFrom(WildcardType.class));
+
assertFalse(GenericArrayType.class.isAssignableFrom(paramType.getClass()));
+
assertFalse(paramType.getClass().isAssignableFrom(GenericArrayType.class));
- final WildcardType testType = TypeUtils.WILDCARD_ALL;
- // TODO This test returns true unlike the test above.
- // Is this a bug in this test or in the main code?
+ final GenericArrayType testType =
TypeUtils.genericArrayType(paramType);
assertFalse(TypeUtils.isAssignable(paramType, testType),
() -> String.format("TypeUtils.isAssignable(%s, %s)",
paramType, testType));
assertFalse(TypeUtils.isAssignable(testType, paramType),
@@ -865,7 +862,8 @@ public class TypeUtilsTest<B> extends AbstractLangTest {
}
@Test
- public void testIsAssignableGenericArrayTypeToObject() {
+ @Disabled("TODO")
+ public void testIsAssignableGenericArrayTypeToWildercardType() {
final Class<Constructor> rawClass = Constructor.class;
final Class<Insets> typeArgClass = Insets.class;
// Builds a ParameterizedType for Constructor<Insets>
@@ -873,11 +871,13 @@ public class TypeUtilsTest<B> extends AbstractLangTest {
assertEquals(rawClass, paramType.getRawType());
assertEquals(typeArgClass, paramType.getActualTypeArguments()[0]);
- assertTrue(Object.class.isAssignableFrom(paramType.getClass()));
- assertFalse(paramType.getClass().isAssignableFrom(Object.class));
+ assertFalse(WildcardType.class.isAssignableFrom(paramType.getClass()));
+ assertFalse(paramType.getClass().isAssignableFrom(WildcardType.class));
- final Type testType = Object.class;
- assertTrue(TypeUtils.isAssignable(paramType, testType),
+ final WildcardType testType = TypeUtils.WILDCARD_ALL;
+ // TODO This test returns true unlike the test above.
+ // Is this a bug in this test or in the main code?
+ assertFalse(TypeUtils.isAssignable(paramType, testType),
() -> String.format("TypeUtils.isAssignable(%s, %s)",
paramType, testType));
assertFalse(TypeUtils.isAssignable(testType, paramType),
() -> String.format("TypeUtils.isAssignable(%s, %s)",
testType, paramType));
