commit 5a42eac9097c95246edc4e1b7071ccb466b3dabb
author Roberto Lublinerman <rluble@google.com> Mon Nov 09 14:48:13 2015 -0800
committer Roberto Lublinerman <rluble@google.com> Mon Nov 09 14:48:13 2015 -0800
tree 73b60450006265a2a8dddace99ebbeedf8996ef5
parent 3cd96f2e1a7974068da61414b4d21c67ec2f7d59

Fix SourceMapTest.

SourceMapTest assumed that all methods starting with $ where either
$init, $clinit or a devirtualized instance method. This is no longer
true in java.lang.String and other "devirtualized" classes.

Change-Id: Ic22ae52ec577315892de785de110299c296bebac

dev/core/test/com/google/gwt/core/ext/linker/SourceMapTest.java

diff --git a/dev/core/test/com/google/gwt/core/ext/linker/SourceMapTest.java b/dev/core/test/com/google/gwt/core/ext/linker/SourceMapTest.java
index 5fd62f3..4af38e2 100644
--- a/dev/core/test/com/google/gwt/core/ext/linker/SourceMapTest.java
+++ b/dev/core/test/com/google/gwt/core/ext/linker/SourceMapTest.java
@@ -372,23 +372,12 @@
       final Map<String,ClassDescriptor> classDescriptorByName) {
     return new DefaultHandler() {
       Set<Integer> currentDependencies = Sets.newHashSet();
-      // mName is just the method name, not a complete signature
-      String methodName(String mName) {
-        if (mName.startsWith("$") && !mName.equals("$init") && !mName.equals("$clinit")) {
-          return mName.substring(1);
-        }
-        return mName;
-      }
 
-      boolean compareMethodNames(String strictName, String relaxName) {
-        if (strictName.equals(relaxName)) {
-          return true;
-        }
-        // only $init and $clinit will match the below if
-        if (relaxName.startsWith("$") && !relaxName.startsWith("$create")) {
-          return strictName.equals(relaxName.substring(1));
-        }
-        return false;
+      // Compares method names in an "relaxed" manner, to account for the synthetic devirtualized
+      // methods that appear in dependencies.xml but have to match the real methods in the
+      // source map class model.
+      boolean compareMethodNames(String thisName, String thatName) {
+        return (thisName.replaceFirst("\\$*", "").equals(thatName.replaceFirst("\\$*", "")));
       }
 
       @Override
@@ -400,7 +389,7 @@
           currentDependencies.clear();
           String[] fullName = attributes.getValue("name").split("::");
           for (MethodDescriptor method : classDescriptorByName.get(fullName[0]).getMethods()) {
-            if (compareMethodNames(method.getName(), methodName(fullName[1]))) {
+            if (compareMethodNames(method.getName(), fullName[1])) {
               currentDependencies.addAll(Ints.asList(method.getDependentPointers()));
             }
           }
@@ -411,7 +400,7 @@
           String[] fullName = attributes.getValue("by").split("::");
           boolean present = false;
           for (MethodDescriptor method : classDescriptorByName.get(fullName[0]).getMethods()) {
-            if (compareMethodNames(method.getName(), methodName(fullName[1]))) {
+            if (compareMethodNames(method.getName(), fullName[1])) {
               if (currentDependencies.contains(method.getUniqueId())) {
                 present = true;
                 break;