Revision: 5948 Author: [email protected] Date: Tue Aug 11 19:15:27 2009 Log: Build fix: SerializableTypeOracleBuilderTest should use all the standard units.
Also some minor related cleanup. http://code.google.com/p/google-web-toolkit/source/detail?r=5948 Modified: /trunk/dev/core/test/com/google/gwt/dev/javac/MockCompilationUnit.java /trunk/dev/core/test/com/google/gwt/dev/javac/impl/JavaResourceBase.java /trunk/user/test/com/google/gwt/user/rebind/rpc/SerializableTypeOracleBuilderTest.java ======================================= --- /trunk/dev/core/test/com/google/gwt/dev/javac/MockCompilationUnit.java Tue Nov 25 17:05:53 2008 +++ /trunk/dev/core/test/com/google/gwt/dev/javac/MockCompilationUnit.java Tue Aug 11 19:15:27 2009 @@ -15,6 +15,8 @@ */ package com.google.gwt.dev.javac; +import com.google.gwt.dev.util.Name.BinaryName; + public class MockCompilationUnit extends CompilationUnit { private final String typeName; @@ -31,7 +33,7 @@ } public String getDisplayLocation() { - return "/mock/" + getTypeName(); + return "/mock/" + BinaryName.toInternalName(typeName) + ".java"; } @Override ======================================= --- /trunk/dev/core/test/com/google/gwt/dev/javac/impl/JavaResourceBase.java Tue Aug 11 12:45:07 2009 +++ /trunk/dev/core/test/com/google/gwt/dev/javac/impl/JavaResourceBase.java Tue Aug 11 19:15:27 2009 @@ -95,7 +95,7 @@ code.append("public class Object {\n"); code.append(" public String toString() { return \"Object\"; }\n"); code.append(" public Object clone() { return this; } "); - code.append(" public Class getClass() { return Object.class; } "); + code.append(" public Class<?> getClass() { return Object.class; } "); code.append("}\n"); return code; } ======================================= --- /trunk/user/test/com/google/gwt/user/rebind/rpc/SerializableTypeOracleBuilderTest.java Tue Aug 11 19:11:51 2009 +++ /trunk/user/test/com/google/gwt/user/rebind/rpc/SerializableTypeOracleBuilderTest.java Tue Aug 11 19:15:27 2009 @@ -38,6 +38,7 @@ import com.google.gwt.dev.javac.TypeOracleTestingUtils; import com.google.gwt.dev.javac.impl.JavaResourceBase; import com.google.gwt.dev.javac.impl.SourceFileCompilationUnit; +import com.google.gwt.dev.resource.Resource; import com.google.gwt.dev.util.log.PrintWriterTreeLogger; import com.google.gwt.user.rebind.rpc.testcases.client.AbstractSerializableTypes; import com.google.gwt.user.rebind.rpc.testcases.client.ClassWithTypeParameterThatErasesToObject; @@ -131,10 +132,6 @@ units.add(createMockCompilationUnit( "com.google.gwt.user.client.rpc.IsSerializable", code)); } - - private static void addJavaIoSerializable(Set<CompilationUnit> units) { - units.add(new SourceFileCompilationUnit(JavaResourceBase.SERIALIZABLE)); - } private static void addJavaLangException(Set<CompilationUnit> units) { StringBuffer code = new StringBuffer(); @@ -144,14 +141,6 @@ units.add(createMockCompilationUnit("java.lang.Exception", code)); } - - private static void addJavaLangObject(Set<CompilationUnit> units) { - units.add(new SourceFileCompilationUnit(JavaResourceBase.OBJECT)); - } - - private static void addJavaLangString(Set<CompilationUnit> units) { - units.add(new SourceFileCompilationUnit(JavaResourceBase.STRING)); - } private static void addJavaLangThrowable(Set<CompilationUnit> units) { StringBuffer code = new StringBuffer(); @@ -175,10 +164,10 @@ } private static void addStandardClasses(Set<CompilationUnit> units) { + for (Resource resource : JavaResourceBase.getStandardResources()) { + units.add(new SourceFileCompilationUnit(resource)); + } addGwtTransient(units); - addJavaIoSerializable(units); - addJavaLangObject(units); - addJavaLangString(units); addJavaUtilMap(units); addICRSE(units); addJavaLangException(units); --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
