Do not forget to trace implementation methods

- Tracing can forget to keep some methods due to tracing order.
Trace a method that is a seed need also to trace implementation of
this method for all types that are already kept.

Bug: 21023926
Change-Id: I0a0df841b0f7441ddba056ad69a1f506db15afb3
(cherry picked from commit df69c567bb1903bdcf1a39be18a0e52c62709de0)

1 files changed, 41 insertions, 0 deletions

diff --git a/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java b/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java
index 396380e6..d5a04790 100644
--- a/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java
+++ b/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java
@@ -28,6 +28,7 @@ import com.android.jack.test.toolchain.DummyToolchain;
 import com.android.jack.test.toolchain.JackApiToolchainBase;
 import com.android.jack.test.toolchain.JackBasedToolchain;
 import com.android.jack.util.TextUtils;
+import com.android.sched.scheduler.ScheduleInstance;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -87,6 +88,42 @@ public class ShrinkTests extends AbstractTest {
         candidateNodeListing));
   }
 
+  protected void runTestInMonoThreadWithOrderedInput(
+      @Nonnull String testNumber,
+      @Nonnull String flagNumber,
+      @Nonnull String mappingNumber)
+      throws Exception {
+    File testFolder = new File(shrobTestsDir, "test" + testNumber);
+    JackBasedToolchain toolchain =
+        AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class);
+
+    File refFolder = new File(testFolder, "refsShrinking");
+
+    File candidateNodeListing = AbstractTestTools.createTempFile("nodeListing", ".txt");
+    toolchain.addProperty(ShrinkStructurePrinter.STRUCTURE_PRINTING.getName(), "true");
+    toolchain.addProperty(ShrinkStructurePrinter.STRUCTURE_PRINTING_FILE.getName(),
+        candidateNodeListing.getPath());
+    toolchain.addProperty(Options.METHOD_FILTER.getName(), "supported-methods");
+    toolchain.disableDxOptimizations();
+    toolchain.addProperty(ScheduleInstance.DEFAULT_RUNNER.getName(), "single-threaded");
+    toolchain.addProperty(Options.INPUT_FILTER.getName(), "ordered-filter");
+
+    File outFolder = AbstractTestTools.createTempDir();
+
+    SourceToDexComparisonTestHelper env =
+        new SourceToDexComparisonTestHelper(new File(testFolder, "jack"));
+
+    env.setCandidateTestTools(toolchain);
+    env.setReferenceTestTools(new DummyToolchain());
+    env.setProguardFlags(
+        dontObfuscateFlagFile,
+        new ProguardFlags(shrobTestsDir,"keepAllAttributes.flags"),
+        new ProguardFlags(testFolder, "proguard.flags" + flagNumber));
+
+    env.runTest(new ComparatorMapping(new File(refFolder, "expected-" + flagNumber + ".txt"),
+        candidateNodeListing));
+  }
+
   private void runTestWithLib(@Nonnull String testNumber, @Nonnull String flagNumber,
       boolean importLib) throws Exception {
     File testFolder = new File(shrobTestsDir, "test" + testNumber);
@@ -289,6 +326,10 @@ public class ShrinkTests extends AbstractTest {
     runTest("042", "003", "");
   }
 
+  @Test
+  public void test43_001() throws Exception {
+    runTestInMonoThreadWithOrderedInput("043", "001", "");
+  }
 
   @Test
   @Category(SlowTests.class)