Fix wrong formatter in MappingApplier

Bug: 25385066

Change-Id: I6fc236b2b598ed6b162338c0be934a2b97340b0e

12 files changed, 58 insertions, 4 deletions

diff --git a/jack-tests/tests/com/android/jack/shrob/AbstractTest.java b/jack-tests/tests/com/android/jack/shrob/AbstractTest.java
index 0bab37c..3603587 100644
--- a/jack-tests/tests/com/android/jack/shrob/AbstractTest.java
+++ b/jack-tests/tests/com/android/jack/shrob/AbstractTest.java
@@ -18,7 +18,6 @@ package com.android.jack.shrob;
 
 import com.google.common.io.Files;
 
-import com.android.jack.Main;
 import com.android.jack.ProguardFlags;
 import com.android.jack.test.category.KnownBugs;
 import com.android.jack.test.category.SlowTests;
@@ -26,7 +25,6 @@ import com.android.jack.test.toolchain.AbstractTestTools;
 import com.android.jack.test.toolchain.IToolchain;
 import com.android.jack.test.toolchain.LegacyJillToolchain;
 
-import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -597,6 +595,11 @@ public abstract class AbstractTest {
     runTest("041", "001", "");
   }
 
+  @Test
+  public void test50_001() throws Exception {
+    runTest("050", "001", "");
+  }
+
   protected void checkToolchainIsNotJillBased() {
     List<Class<? extends IToolchain>> excludeList = new ArrayList<Class<? extends IToolchain>>(1);
     excludeList.add(LegacyJillToolchain.class);
diff --git a/jack-tests/tests/com/android/jack/shrob/test050/info.txt b/jack-tests/tests/com/android/jack/shrob/test050/info.txt
new file mode 100644
index 0000000..3c9be80
--- /dev/null
+++ b/jack-tests/tests/com/android/jack/shrob/test050/info.txt
@@ -0,0 +1,2 @@
+This test contains a obfuscated method with a mapping indicating to leave
+its name unchanged.
\ No newline at end of file
diff --git a/jack-tests/tests/com/android/jack/shrob/test050/jack/Kept.java b/jack-tests/tests/com/android/jack/shrob/test050/jack/Kept.java
new file mode 100644
index 0000000..0a266c2
--- /dev/null
+++ b/jack-tests/tests/com/android/jack/shrob/test050/jack/Kept.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.jack.shrob.test050.jack;
+
+public class Kept {
+  public void kept(String s) {
+  }
+}
diff --git a/jack-tests/tests/com/android/jack/shrob/test050/mapping.txt b/jack-tests/tests/com/android/jack/shrob/test050/mapping.txt
new file mode 100644
index 0000000..d3b2395
--- /dev/null
+++ b/jack-tests/tests/com/android/jack/shrob/test050/mapping.txt
@@ -0,0 +1,2 @@
+com.android.jack.shrob.test050.jack.Kept -> renamedKept:
+    void kept(java.lang.String) -> kept
\ No newline at end of file
diff --git a/jack-tests/tests/com/android/jack/shrob/test050/proguard.flags001 b/jack-tests/tests/com/android/jack/shrob/test050/proguard.flags001
new file mode 100644
index 0000000..4e75a0e
--- /dev/null
+++ b/jack-tests/tests/com/android/jack/shrob/test050/proguard.flags001
@@ -0,0 +1,5 @@
+-keep class **.Kept {
+  *;
+}
+
+-applymapping mapping.txt
\ No newline at end of file
diff --git a/jack-tests/tests/com/android/jack/shrob/test050/refsFlattenPackage/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test050/refsFlattenPackage/expected-001.txt
new file mode 100644
index 0000000..7517de8
--- /dev/null
+++ b/jack-tests/tests/com/android/jack/shrob/test050/refsFlattenPackage/expected-001.txt
@@ -0,0 +1,3 @@
+com.android.jack.shrob.test050.jack.Kept -> renamedKept:
+    void <init>() -> <init>
+    void kept(java.lang.String) -> kept
\ No newline at end of file
diff --git a/jack-tests/tests/com/android/jack/shrob/test050/refsObfuscationWithMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test050/refsObfuscationWithMapping/expected-001.txt
new file mode 100644
index 0000000..7517de8
--- /dev/null
+++ b/jack-tests/tests/com/android/jack/shrob/test050/refsObfuscationWithMapping/expected-001.txt
@@ -0,0 +1,3 @@
+com.android.jack.shrob.test050.jack.Kept -> renamedKept:
+    void <init>() -> <init>
+    void kept(java.lang.String) -> kept
\ No newline at end of file
diff --git a/jack-tests/tests/com/android/jack/shrob/test050/refsObfuscationWithoutMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test050/refsObfuscationWithoutMapping/expected-001.txt
new file mode 100644
index 0000000..7517de8
--- /dev/null
+++ b/jack-tests/tests/com/android/jack/shrob/test050/refsObfuscationWithoutMapping/expected-001.txt
@@ -0,0 +1,3 @@
+com.android.jack.shrob.test050.jack.Kept -> renamedKept:
+    void <init>() -> <init>
+    void kept(java.lang.String) -> kept
\ No newline at end of file
diff --git a/jack-tests/tests/com/android/jack/shrob/test050/refsRepackageClasses/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test050/refsRepackageClasses/expected-001.txt
new file mode 100644
index 0000000..7517de8
--- /dev/null
+++ b/jack-tests/tests/com/android/jack/shrob/test050/refsRepackageClasses/expected-001.txt
@@ -0,0 +1,3 @@
+com.android.jack.shrob.test050.jack.Kept -> renamedKept:
+    void <init>() -> <init>
+    void kept(java.lang.String) -> kept
\ No newline at end of file
diff --git a/jack-tests/tests/com/android/jack/shrob/test050/refsSeed/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test050/refsSeed/expected-001.txt
new file mode 100644
index 0000000..24e33fc
--- /dev/null
+++ b/jack-tests/tests/com/android/jack/shrob/test050/refsSeed/expected-001.txt
@@ -0,0 +1,5 @@
+com.android.jack.shrob.test050.jack.Kept
+com.android.jack.shrob.test050.jack.Kept: Kept()
+com.android.jack.shrob.test050.jack.Kept: void kept(java.lang.String)
+com.android.jack.shrob.test050.jack.Kept: void <clinit>()
+com.android.jack.shrob.test050.jack.Kept: void $init()
\ No newline at end of file
diff --git a/jack-tests/tests/com/android/jack/shrob/test050/refsShrinking/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test050/refsShrinking/expected-001.txt
new file mode 100644
index 0000000..7f5dff0
--- /dev/null
+++ b/jack-tests/tests/com/android/jack/shrob/test050/refsShrinking/expected-001.txt
@@ -0,0 +1,3 @@
+Lcom/android/jack/shrob/test050/jack/Kept;:
+<init>()V
+kept(Ljava/lang/String;)V
\ No newline at end of file
diff --git a/jack/src/com/android/jack/shrob/obfuscation/MappingApplier.java b/jack/src/com/android/jack/shrob/obfuscation/MappingApplier.java
index 8f6addb..d9a034b 100644
--- a/jack/src/com/android/jack/shrob/obfuscation/MappingApplier.java
+++ b/jack/src/com/android/jack/shrob/obfuscation/MappingApplier.java
@@ -402,8 +402,8 @@ public class MappingApplier {
         String newSignature =
             GrammarActions.getSignatureFormatter().getNameWithoutReturnType(newName, args);
         if (!existingMethodNames.contains(newSignature)
-            || newSignature.equals(
-                Jack.getUserFriendlyFormatter().getNameWithoutReturnType(method.getMethodId()))) {
+            || newSignature.equals(GrammarActions.getSignatureFormatter().getNameWithoutReturnType(
+                method.getMethodId()))) {
           // No collision was found
           // (the name was not used or the method is renamed with its own name)
           renameMethod(method, mappingFile, lineNumber, newName, memberTransformationRequest);