Revision: ee9a8f34f061
Author: Sam Berlin <[email protected]>
Date: Wed Nov 9 15:44:24 2011
Log: Fix TypesTest to use an actual parameterized array. Necessary
because JDK7 got a little smarter in its getActualTypeArguments method
where it returns a Class if the array type isn't generic, and
GenericArrayType only if it was actually generic.
Revision created by MOE tool push_codebase.
MOE_MIGRATION=3664
http://code.google.com/p/google-guice/source/detail?r=ee9a8f34f061
Modified:
/core/test/com/google/inject/util/TypesTest.java
=======================================
--- /core/test/com/google/inject/util/TypesTest.java Thu Jul 7 17:34:16
2011
+++ /core/test/com/google/inject/util/TypesTest.java Wed Nov 9 15:44:24
2011
@@ -46,28 +46,29 @@
// generic types for comparison
Map<String, Integer> a;
Inner<Float, Double> b;
- List<String[][]> c;
+ List<Set<String>[][]> c;
List<String> d;
Set<String> e;
Outer<String>.Inner f;
private ParameterizedType mapStringInteger;
private ParameterizedType innerFloatDouble;
- private ParameterizedType listStringArray;
+ private ParameterizedType listSetStringArray;
private ParameterizedType listString;
private ParameterizedType setString;
- private GenericArrayType stringArray;
private ParameterizedType outerInner;
-
+ private GenericArrayType setStringArray;
+
+ @Override
protected void setUp() throws Exception {
super.setUp();
mapStringInteger = (ParameterizedType)
getClass().getDeclaredField("a").getGenericType();
innerFloatDouble = (ParameterizedType)
getClass().getDeclaredField("b").getGenericType();
- listStringArray = (ParameterizedType)
getClass().getDeclaredField("c").getGenericType();
+ listSetStringArray = (ParameterizedType)
getClass().getDeclaredField("c").getGenericType();
listString = (ParameterizedType)
getClass().getDeclaredField("d").getGenericType();
setString = (ParameterizedType)
getClass().getDeclaredField("e").getGenericType();
- stringArray = (GenericArrayType)
listStringArray.getActualTypeArguments()[0];
outerInner = (ParameterizedType)
getClass().getDeclaredField("f").getGenericType();
+ setStringArray = (GenericArrayType)
listSetStringArray.getActualTypeArguments()[0];
}
public void testListSetMap() {
@@ -155,19 +156,19 @@
assertEqualsBothWays(mapStringInteger, parameterizedType);
assertEquals(mapStringInteger.toString(),
parameterizedType.toString());
- GenericArrayType genericArrayType = Types.arrayOf(
- Types.arrayOf(String.class));
- assertEqualsBothWays(stringArray, genericArrayType);
- assertEquals(stringArray.toString(), genericArrayType.toString());
+ GenericArrayType genericArrayType = Types.arrayOf(Types.arrayOf(
+ Types.newParameterizedType(Set.class, String.class)));
+ assertEqualsBothWays(setStringArray, genericArrayType);
+ assertEquals(setStringArray.toString(), genericArrayType.toString());
}
public void testToString() {
Assert.assertEquals("java.lang.String",
MoreTypes.typeToString(String.class));
- assertEquals("java.lang.String[][]",
MoreTypes.typeToString(stringArray));
+ assertEquals("java.util.Set<java.lang.String>[][]",
MoreTypes.typeToString(setStringArray));
assertEquals("java.util.Map<java.lang.String, java.lang.Integer>",
MoreTypes.typeToString(mapStringInteger));
- assertEquals("java.util.List<java.lang.String[][]>",
- MoreTypes.typeToString(listStringArray));
+ assertEquals("java.util.List<java.util.Set<java.lang.String>[][]>",
+ MoreTypes.typeToString(listSetStringArray));
assertEquals(innerFloatDouble.toString(),
MoreTypes.typeToString(innerFloatDouble));
}
@@ -178,7 +179,7 @@
* Ensure that owning types are required when necessary, and forbidden
* otherwise.
*/
- public void testCanonicalizeRequiresOwnerTypes() throws
NoSuchFieldException {
+ public void testCanonicalizeRequiresOwnerTypes() {
try {
Types.newParameterizedType(Owning.class, String.class);
fail();
--
You received this message because you are subscribed to the Google Groups
"google-guice-dev" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/google-guice-dev?hl=en.
