- Renames the abstract JDelegatingClassTypeTest so the build system won't try to run it directly. - Disables EnumMapTest and EnumSetTest for now - Works around some javac compiler errors in ComparingVisitor Patch by: jat Review by: scottb (desk check) git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@1546 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/test/com/google/gwt/core/ext/typeinfo/JDelegatingClassTypeTest.java b/dev/core/test/com/google/gwt/core/ext/typeinfo/JDelegatingClassTypeTestBase.java similarity index 99% rename from dev/core/test/com/google/gwt/core/ext/typeinfo/JDelegatingClassTypeTest.java rename to dev/core/test/com/google/gwt/core/ext/typeinfo/JDelegatingClassTypeTestBase.java index f36935d..d0058f8 100644 --- a/dev/core/test/com/google/gwt/core/ext/typeinfo/JDelegatingClassTypeTest.java +++ b/dev/core/test/com/google/gwt/core/ext/typeinfo/JDelegatingClassTypeTestBase.java
@@ -23,7 +23,7 @@ /** * Base test cases for all {@link JDelegatingClassType}s. */ -public abstract class JDelegatingClassTypeTest extends TestCase { +public abstract class JDelegatingClassTypeTestBase extends TestCase { protected static void assertArraysEqual(Object[] expected, Object[] actual) { assertTrue("Expected: \n" + Arrays.toString(expected) + ",\n Actual: \n" @@ -398,7 +398,7 @@ public void testGetConstructor() throws NotFoundException { JDelegatingClassType testType = getTestType(); JClassType baseType = testType.getBaseType(); - JConstructor[] constructors = baseType.getConstructors(); + baseType.getConstructors(); } /**
diff --git a/dev/core/test/com/google/gwt/core/ext/typeinfo/JGenericTypeTest.java b/dev/core/test/com/google/gwt/core/ext/typeinfo/JGenericTypeTest.java index c054387..373444c 100644 --- a/dev/core/test/com/google/gwt/core/ext/typeinfo/JGenericTypeTest.java +++ b/dev/core/test/com/google/gwt/core/ext/typeinfo/JGenericTypeTest.java
@@ -55,7 +55,7 @@ public void testGetRawType() throws NotFoundException { JGenericType genericClass = getTestType(); - JDelegatingClassTypeTest.validateTypeSubstitution(genericClass, + JDelegatingClassTypeTestBase.validateTypeSubstitution(genericClass, genericClass.getRawType(), new Substitution() { public JType getSubstitution(JType type) { return type.getErasedType();
diff --git a/dev/core/test/com/google/gwt/core/ext/typeinfo/JParameterizedTypeTest.java b/dev/core/test/com/google/gwt/core/ext/typeinfo/JParameterizedTypeTest.java index 50a06c4..466ff74 100644 --- a/dev/core/test/com/google/gwt/core/ext/typeinfo/JParameterizedTypeTest.java +++ b/dev/core/test/com/google/gwt/core/ext/typeinfo/JParameterizedTypeTest.java
@@ -36,7 +36,7 @@ /** * Test for {@link JParameterizedType}. */ -public class JParameterizedTypeTest extends JDelegatingClassTypeTest { +public class JParameterizedTypeTest extends JDelegatingClassTypeTestBase { /** * Helper for verifying parameterized substitutions. */ @@ -208,9 +208,8 @@ oracle.getType(Serializable.class.getName()))), integerType}); JClassType[] expected = { oracle.getType(MyIntegerList.class.getName()), - parameterizedMyCustomList - }; - + parameterizedMyCustomList}; + validateEquals(oracle, expected, actualSubtypes); }
diff --git a/dev/core/test/com/google/gwt/core/ext/typeinfo/JRawTypeTest.java b/dev/core/test/com/google/gwt/core/ext/typeinfo/JRawTypeTest.java index b1f4425..e8027a0 100644 --- a/dev/core/test/com/google/gwt/core/ext/typeinfo/JRawTypeTest.java +++ b/dev/core/test/com/google/gwt/core/ext/typeinfo/JRawTypeTest.java
@@ -27,7 +27,7 @@ /** * Test for {@link JRawType}. */ -public class JRawTypeTest extends JDelegatingClassTypeTest { +public class JRawTypeTest extends JDelegatingClassTypeTestBase { private final boolean logToConsole = false; private final ModuleContext moduleContext = new ModuleContext(logToConsole @@ -41,10 +41,12 @@ public void testFindNestedType() { // TODO Auto-generated method stub } + @Override public void testGetEnclosingType() { // TODO Auto-generated method stub } + @Override public void testGetNestedType() { // TODO Auto-generated method stub @@ -66,14 +68,13 @@ JClassType testType = oracle.getType(MyList.class.getName()); JGenericType genericTestType = testType.isGenericType(); assertNotNull(genericTestType); - + JRawType rawTestType = genericTestType.getRawType(); JClassType[] expectedTypes = new JClassType[] { - oracle.getType(MyCustomList.class.getName()).isGenericType().getRawType(), - oracle.getType(MyIntegerList.class.getName()) - }; + oracle.getType(MyCustomList.class.getName()).isGenericType().getRawType(), + oracle.getType(MyIntegerList.class.getName())}; JClassType[] actualSubtypes = rawTestType.getSubtypes(); - + validateEquals(oracle, expectedTypes, actualSubtypes); }
diff --git a/dev/core/test/com/google/gwt/core/ext/typeinfo/JTypeParameterTest.java b/dev/core/test/com/google/gwt/core/ext/typeinfo/JTypeParameterTest.java index 0fb9438..59e2d5c 100644 --- a/dev/core/test/com/google/gwt/core/ext/typeinfo/JTypeParameterTest.java +++ b/dev/core/test/com/google/gwt/core/ext/typeinfo/JTypeParameterTest.java
@@ -18,7 +18,6 @@ import com.google.gwt.core.ext.TreeLogger; import com.google.gwt.core.ext.UnableToCompleteException; import com.google.gwt.core.ext.typeinfo.test.GenericClass; -import com.google.gwt.core.ext.typeinfo.test.GenericSubclass; import com.google.gwt.core.ext.typeinfo.test.MyCustomList; import com.google.gwt.dev.util.log.PrintWriterTreeLogger; @@ -27,7 +26,7 @@ /** * Tests for {@link JTypeParameter}. */ -public class JTypeParameterTest extends JDelegatingClassTypeTest { +public class JTypeParameterTest extends JDelegatingClassTypeTestBase { private final boolean logToConsole = false; private final ModuleContext moduleContext = new ModuleContext(logToConsole ? new PrintWriterTreeLogger() : TreeLogger.NULL,
diff --git a/dev/core/test/com/google/gwt/core/ext/typeinfo/JWildcardTypeTest.java b/dev/core/test/com/google/gwt/core/ext/typeinfo/JWildcardTypeTest.java index becea26..652e3e1 100644 --- a/dev/core/test/com/google/gwt/core/ext/typeinfo/JWildcardTypeTest.java +++ b/dev/core/test/com/google/gwt/core/ext/typeinfo/JWildcardTypeTest.java
@@ -29,7 +29,7 @@ /** * Test for {@link JWildcardType}. */ -public class JWildcardTypeTest extends JDelegatingClassTypeTest { +public class JWildcardTypeTest extends JDelegatingClassTypeTestBase { private final boolean logToConsole = false; private final ModuleContext moduleContext = new ModuleContext(logToConsole ? new PrintWriterTreeLogger() : TreeLogger.NULL, @@ -84,7 +84,7 @@ oracle.getType(Number.class.getName()))); JClassType[] subtypes = lowerBoundWildcard.getSubtypes(); assertEquals(0, subtypes.length); -// assertEquals(oracle.getJavaLangObject(), subtypes[0]); + // assertEquals(oracle.getJavaLangObject(), subtypes[0]); } public void testGetSubtypes_UpperBound() throws NotFoundException { @@ -97,10 +97,10 @@ oracle.getType(CB.class.getName()), oracle.getType(CC.class.getName())}; Set<JClassType> expectedSet = new HashSet<JClassType>(); expectedSet.addAll(Arrays.asList(expected)); - + JClassType[] actual = upperBoundWildcard.getSubtypes(); assertEquals(expectedSet.size(), actual.length); - + for (int i = 0; i < actual.length; ++i) { expectedSet.remove(actual[i]); } @@ -136,8 +136,7 @@ * Tests that <? extends Number> is assignable from <? extends Integer> and * that the reverse is not <code>true</code>. */ - public void testIsAssignableFrom_Extends_Object_From_Super_Object() - throws NotFoundException { + public void testIsAssignableFrom_Extends_Object_From_Super_Object() { TypeOracle oracle = moduleContext.getOracle(); JClassType javaLangObject = oracle.getJavaLangObject(); @@ -223,12 +222,11 @@ } }; } - + public void testGetMethods() throws NotFoundException { super.testGetMethods(); } - @Override protected JWildcardType getTestType() throws NotFoundException { TypeOracle oracle = moduleContext.getOracle();
diff --git a/dev/core/test/com/google/gwt/dev/js/ComparingVisitor.java b/dev/core/test/com/google/gwt/dev/js/ComparingVisitor.java index 573d436..1921e91 100644 --- a/dev/core/test/com/google/gwt/dev/js/ComparingVisitor.java +++ b/dev/core/test/com/google/gwt/dev/js/ComparingVisitor.java
@@ -99,7 +99,11 @@ } } - private final JsVisitable<?> other; + /** + * We use a raw type here because Sun's javac will barf all over the casts and + * instanceof tests we do all throughout this file. + */ + private final JsVisitable other; private ComparingVisitor(JsVisitable<?> other) { this.other = other;
diff --git a/user/build.xml b/user/build.xml index 95ef016..d4a44d8 100755 --- a/user/build.xml +++ b/user/build.xml
@@ -94,6 +94,12 @@ junit.framework.AssertionFailedError: expected=225 actual=207 --> <exclude name="com/google/gwt/user/client/ui/AbsolutePanelTest.class" /> + + <!-- + No compiler support yet; waiting on Class.getEnumConstants() + --> + <exclude name="com/google/gwt/emultest/java/util/EnumMapTest.class" /> + <exclude name="com/google/gwt/emultest/java/util/EnumSetTest.class" /> </fileset> <!-- Platform shouldn't matter here, just picking one -->