Skip to content

Commit d585b1b

Browse files
fluentfuturecpovirk
authored andcommitted
Refactored the overloads of isAssignable*() methods to instance methods with simpler signature
------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=81364016
1 parent 81b23cd commit d585b1b

File tree

2 files changed

+144
-139
lines changed

2 files changed

+144
-139
lines changed

guava-tests/test/com/google/common/reflect/TypeTokenTest.java

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -535,8 +535,8 @@ public void testGetGenericInterfaces_noInterface() {
535535

536536
public void testGetGenericInterfaces_withInterfaces() {
537537
Map<Class<?>, Type> interfaceMap = Maps.newHashMap();
538-
for (TypeToken<?> interfaceType:
539-
new TypeToken<Implementation<Integer, String>>() {}.getGenericInterfaces()) {
538+
for (TypeToken<?> interfaceType
539+
: new TypeToken<Implementation<Integer, String>>() {}.getGenericInterfaces()) {
540540
interfaceMap.put(interfaceType.getRawType(), interfaceType.getType());
541541
}
542542
assertEquals(ImmutableMap.of(
@@ -593,6 +593,17 @@ public <T, T1 extends T> void testAssignableGenericArrayToGenericArray() {
593593
assertFalse(new TypeToken<T[]>() {}.isAssignableFrom(new TypeToken<T[][]>() {}));
594594
}
595595

596+
public <T, T1 extends T> void testAssignableGenericArrayToClass() {
597+
assertTrue(TypeToken.of(Object[].class.getSuperclass())
598+
.isAssignableFrom(new TypeToken<T[]>() {}));
599+
for (Class<?> interfaceType : Object[].class.getInterfaces()) {
600+
assertTrue(TypeToken.of(interfaceType)
601+
.isAssignableFrom(new TypeToken<T[]>() {}));
602+
}
603+
assertTrue(TypeToken.of(Object.class).isAssignableFrom(new TypeToken<T[]>() {}));
604+
assertFalse(TypeToken.of(String.class).isAssignableFrom(new TypeToken<T[]>() {}));
605+
}
606+
596607
public void testAssignableWildcardBoundedByArrayToArrayClass() {
597608
Type wildcardType = Types.subtypeOf(Object[].class);
598609
assertTrue(TypeToken.of(Object[].class).isAssignableFrom(wildcardType));
@@ -1471,20 +1482,22 @@ private abstract static class RawTypeConsistencyTester<T extends Enum<T> & CharS
14711482

14721483
static void verifyConsitentRawType() {
14731484
for (Method method : RawTypeConsistencyTester.class.getDeclaredMethods()) {
1474-
assertEquals(method.getReturnType(), TypeToken.getRawType(method.getGenericReturnType()));
1485+
assertEquals(method.getReturnType(),
1486+
TypeToken.of(method.getGenericReturnType()).getRawType());
14751487
for (int i = 0; i < method.getParameterTypes().length; i++) {
14761488
assertEquals(method.getParameterTypes()[i],
1477-
TypeToken.getRawType(method.getGenericParameterTypes()[i]));
1489+
TypeToken.of(method.getGenericParameterTypes()[i]).getRawType());
14781490
}
14791491
}
14801492
}
14811493
}
14821494

14831495
public void testRawTypes() {
14841496
RawTypeConsistencyTester.verifyConsitentRawType();
1485-
assertEquals(Object.class, TypeToken.getRawType(Types.subtypeOf(Object.class)));
1486-
assertEquals(CharSequence.class, TypeToken.getRawType(Types.subtypeOf(CharSequence.class)));
1487-
assertEquals(Object.class, TypeToken.getRawType(Types.supertypeOf(CharSequence.class)));
1497+
assertEquals(Object.class, TypeToken.of(Types.subtypeOf(Object.class)).getRawType());
1498+
assertEquals(CharSequence.class,
1499+
TypeToken.of(Types.subtypeOf(CharSequence.class)).getRawType());
1500+
assertEquals(Object.class, TypeToken.of(Types.supertypeOf(CharSequence.class)).getRawType());
14881501
}
14891502

14901503
private abstract static class IKnowMyType<T> {

0 commit comments

Comments
 (0)