Refactored the overloads of isAssignable*() methods to instance metho…

…ds with simpler signature ------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=81364016
google · Dec 5, 2014 · d585b1b · d585b1b
1 parent 81b23cd
commit d585b1b
Show file tree

Hide file tree

Showing 2 changed files with 144 additions and 139 deletions.
diff --git a/guava-tests/test/com/google/common/reflect/TypeTokenTest.java b/guava-tests/test/com/google/common/reflect/TypeTokenTest.java
@@ -535,8 +535,8 @@ public void testGetGenericInterfaces_noInterface() {
 
   public void testGetGenericInterfaces_withInterfaces() {
     Map<Class<?>, Type> interfaceMap = Maps.newHashMap();
-    for (TypeToken<?> interfaceType:
-        new TypeToken<Implementation<Integer, String>>() {}.getGenericInterfaces()) {
+    for (TypeToken<?> interfaceType
+        : new TypeToken<Implementation<Integer, String>>() {}.getGenericInterfaces()) {
       interfaceMap.put(interfaceType.getRawType(), interfaceType.getType());
     }
     assertEquals(ImmutableMap.of(
@@ -593,6 +593,17 @@ public <T, T1 extends T> void testAssignableGenericArrayToGenericArray() {
     assertFalse(new TypeToken<T[]>() {}.isAssignableFrom(new TypeToken<T[][]>() {}));
   }
 
+  public <T, T1 extends T> void testAssignableGenericArrayToClass() {
+    assertTrue(TypeToken.of(Object[].class.getSuperclass())
+        .isAssignableFrom(new TypeToken<T[]>() {}));
+    for (Class<?> interfaceType : Object[].class.getInterfaces()) {
+      assertTrue(TypeToken.of(interfaceType)
+          .isAssignableFrom(new TypeToken<T[]>() {}));
+    }
+    assertTrue(TypeToken.of(Object.class).isAssignableFrom(new TypeToken<T[]>() {}));
+    assertFalse(TypeToken.of(String.class).isAssignableFrom(new TypeToken<T[]>() {}));
+  }
+
   public void testAssignableWildcardBoundedByArrayToArrayClass() {
     Type wildcardType = Types.subtypeOf(Object[].class);
     assertTrue(TypeToken.of(Object[].class).isAssignableFrom(wildcardType));
@@ -1471,20 +1482,22 @@ private abstract static class RawTypeConsistencyTester<T extends Enum<T> & CharS
 
     static void verifyConsitentRawType() {
       for (Method method : RawTypeConsistencyTester.class.getDeclaredMethods()) {
-        assertEquals(method.getReturnType(), TypeToken.getRawType(method.getGenericReturnType()));
+        assertEquals(method.getReturnType(),
+            TypeToken.of(method.getGenericReturnType()).getRawType());
         for (int i = 0; i < method.getParameterTypes().length; i++) {
           assertEquals(method.getParameterTypes()[i],
-              TypeToken.getRawType(method.getGenericParameterTypes()[i]));
+              TypeToken.of(method.getGenericParameterTypes()[i]).getRawType());
         }
       }
     }
   }
 
   public void testRawTypes() {
     RawTypeConsistencyTester.verifyConsitentRawType();
-    assertEquals(Object.class, TypeToken.getRawType(Types.subtypeOf(Object.class)));
-    assertEquals(CharSequence.class, TypeToken.getRawType(Types.subtypeOf(CharSequence.class)));
-    assertEquals(Object.class, TypeToken.getRawType(Types.supertypeOf(CharSequence.class)));
+    assertEquals(Object.class, TypeToken.of(Types.subtypeOf(Object.class)).getRawType());
+    assertEquals(CharSequence.class,
+        TypeToken.of(Types.subtypeOf(CharSequence.class)).getRawType());
+    assertEquals(Object.class, TypeToken.of(Types.supertypeOf(CharSequence.class)).getRawType());
   }
 
   private abstract static class IKnowMyType<T> {