Revision: 5837 Author: j...@google.com Date: Wed Jul 29 14:58:34 2009 Log: Change file reference test to use new API dealing with types rather than file names.
http://code.google.com/p/google-web-toolkit/source/detail?r=5837 Modified: /changes/jat/ihm/dev/core/test/com/google/gwt/dev/javac/CompilationUnitFileReferenceTest.java ======================================= --- /changes/jat/ihm/dev/core/test/com/google/gwt/dev/javac/CompilationUnitFileReferenceTest.java Fri May 8 17:38:40 2009 +++ /changes/jat/ihm/dev/core/test/com/google/gwt/dev/javac/CompilationUnitFileReferenceTest.java Wed Jul 29 14:58:34 2009 @@ -21,11 +21,13 @@ import com.google.gwt.dev.javac.impl.MockResourceOracle; import com.google.gwt.dev.javac.impl.SourceFileCompilationUnit; import com.google.gwt.dev.resource.Resource; +import com.google.gwt.dev.util.Name.BinaryName; import com.google.gwt.dev.util.log.AbstractTreeLogger; import com.google.gwt.dev.util.log.PrintWriterTreeLogger; import junit.framework.TestCase; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -120,21 +122,26 @@ static { // Setup EXPECTED_DEPENDENCIES with hand-computed data. - initializeExpectedDependency(JavaResourceBase.FOO, JavaResourceBase.STRING); - initializeExpectedDependency(JavaResourceBase.BAR, JavaResourceBase.STRING, - JavaResourceBase.FOO); + initializeExpectedDependency("test/Foo", "java/lang/String", + "java/lang/Object"); + initializeExpectedDependency("test/Bar", "java/lang/String", + "test/Foo"); // TOP has a self-reference - initializeExpectedDependency(TOP, JavaResourceBase.STRING, TOP); - initializeExpectedDependency(TOP3, JavaResourceBase.STRING, TOP); - - initializeExpectedDependency(OUTER, JavaResourceBase.STRING); - initializeExpectedDependency(MEMBER_INNER_SUBCLASS, - JavaResourceBase.STRING, OUTER); - - initializeExpectedDependency(OUTER, JavaResourceBase.STRING); - initializeExpectedDependency(STATIC_INNER_SUBCLASS, - JavaResourceBase.STRING, OUTER); + initializeExpectedDependency("test/Top", "java/lang/String", + "java/lang/Object", "test/Top"); + initializeExpectedDependency("test/Top3", "java/lang/String", + "test/Top2"); + + initializeExpectedDependency("test/Outer", "test/Outer", "java/lang/String", + "test/Outer$StaticInner", "java/lang/Object", "test/Outer$MemberInner"); + + initializeExpectedDependency("test/OuterSubclass", + "test/OuterSubclass$MemberInnerSubclass", "test/Outer", + "java/lang/String", "test/OuterSubclass", "test/Outer$MemberInner"); + + initializeExpectedDependency("test/StaticInnerSubclass", + "test/Outer", "java/lang/String", "test/Outer$StaticInner"); } /** @@ -150,13 +157,11 @@ return TreeLogger.NULL; } - private static void initializeExpectedDependency(Resource source, - Resource... targets) { + private static void initializeExpectedDependency(String type, + String... referencedTypes) { Set<String> targetSet = new HashSet<String>(); - for (Resource target : targets) { - targetSet.add(target.getLocation()); - } - EXPECTED_DEPENDENCIES.put(source.getLocation(), targetSet); + Collections.addAll(targetSet, referencedTypes); + EXPECTED_DEPENDENCIES.put(type, targetSet); } private MockResourceOracle oracle = new MockResourceOracle( @@ -212,13 +217,14 @@ } private void assertRefsMatchExpectedRefs(Resource... files) { - // TODO(jat): reimplement with new API -// for (Resource sourceFile : files) { -// Set<String> sourceFileRefs = state.getCompilationUnitMap().get( -// SourceFileCompilationUnit.getTypeName(sourceFile)).getFileNameRefs(); -// Set<String> expectedSourceFileRefs = EXPECTED_DEPENDENCIES.get(sourceFile.getLocation()); -// assertEquals(expectedSourceFileRefs, sourceFileRefs); -// } + for (Resource sourceFile : files) { + String typeName = SourceFileCompilationUnit.getTypeName(sourceFile); + Set<String> sourceFileRefs = state.getCompilationUnitMap().get( + typeName).getReferencedTypes(); + Set<String> expectedSourceFileRefs = EXPECTED_DEPENDENCIES.get( + BinaryName.toInternalName(typeName)); + assertEquals(expectedSourceFileRefs, sourceFileRefs); + } } /** --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
