Fix mapping comparison order in shrob tests

- Some files to be comapred were passed in the wrong order.
- Changed order in test framework API to match
how it's been done in other Comparators.

Bug: 20150139

Change-Id: I999886b15781c1a170d578c1d8b31b6325c783af

19 files changed, 46 insertions, 38 deletions

diff --git a/jack-tests/src/com/android/jack/test/comparator/ComparatorDex.java b/jack-tests/src/com/android/jack/test/comparator/ComparatorDex.java
index bef67e92..00f47a1c 100644
--- a/jack-tests/src/com/android/jack/test/comparator/ComparatorDex.java
+++ b/jack-tests/src/com/android/jack/test/comparator/ComparatorDex.java
@@ -35,8 +35,8 @@ public class ComparatorDex extends ComparatorFile {
   private boolean compareInstructionNumber = false;
   private float instructionNumberTolerance = 0f;
 
-  public ComparatorDex(@Nonnull File candidate, @Nonnull File reference) {
-    super(candidate, reference);
+  public ComparatorDex(@Nonnull File reference, @Nonnull File candidate) {
+    super(reference, candidate);
   }
 
   @Nonnull
diff --git a/jack-tests/src/com/android/jack/test/comparator/ComparatorDexAnnotations.java b/jack-tests/src/com/android/jack/test/comparator/ComparatorDexAnnotations.java
index adbcae88..30a0bdbc 100644
--- a/jack-tests/src/com/android/jack/test/comparator/ComparatorDexAnnotations.java
+++ b/jack-tests/src/com/android/jack/test/comparator/ComparatorDexAnnotations.java
@@ -29,8 +29,8 @@ import javax.annotation.Nonnull;
  */
 public class ComparatorDexAnnotations extends ComparatorFile {
 
-  public ComparatorDexAnnotations(@Nonnull File candidate, @Nonnull File reference) {
-    super(candidate, reference);
+  public ComparatorDexAnnotations(@Nonnull File reference, @Nonnull File candidate) {
+    super(reference, candidate);
   }
 
   @Override
diff --git a/jack-tests/src/com/android/jack/test/comparator/ComparatorDiff.java b/jack-tests/src/com/android/jack/test/comparator/ComparatorDiff.java
index a9eff8d7..c2ffd0e9 100644
--- a/jack-tests/src/com/android/jack/test/comparator/ComparatorDiff.java
+++ b/jack-tests/src/com/android/jack/test/comparator/ComparatorDiff.java
@@ -30,8 +30,8 @@ import javax.annotation.Nonnull;
  */
 public class ComparatorDiff extends ComparatorFile {
 
-  public ComparatorDiff(@Nonnull File candidate, @Nonnull File reference) {
-    super(candidate, reference);
+  public ComparatorDiff(@Nonnull File reference, @Nonnull File candidate) {
+    super(reference, candidate);
   }
 
   @Override
diff --git a/jack-tests/src/com/android/jack/test/comparator/ComparatorFile.java b/jack-tests/src/com/android/jack/test/comparator/ComparatorFile.java
index 9bdcc2c7..7e6f3db7 100644
--- a/jack-tests/src/com/android/jack/test/comparator/ComparatorFile.java
+++ b/jack-tests/src/com/android/jack/test/comparator/ComparatorFile.java
@@ -26,12 +26,12 @@ import javax.annotation.Nonnull;
 public abstract class ComparatorFile implements Comparator {
 
   @Nonnull
-  protected File candidate;
-  @Nonnull
   protected File reference;
+  @Nonnull
+  protected File candidate;
 
-  protected ComparatorFile(@Nonnull File candidate, @Nonnull File reference) {
-    this.candidate = candidate;
+  protected ComparatorFile(@Nonnull File reference, @Nonnull File candidate) {
     this.reference = reference;
+    this.candidate = candidate;
   }
 }
diff --git a/jack-tests/src/com/android/jack/test/comparator/ComparatorMapping.java b/jack-tests/src/com/android/jack/test/comparator/ComparatorMapping.java
index c21fd0e7..6b7cc5b1 100644
--- a/jack-tests/src/com/android/jack/test/comparator/ComparatorMapping.java
+++ b/jack-tests/src/com/android/jack/test/comparator/ComparatorMapping.java
@@ -29,8 +29,8 @@ import javax.annotation.Nonnull;
  */
 public class ComparatorMapping extends ComparatorFile {
 
-  public ComparatorMapping(@Nonnull File candidate, @Nonnull File reference) {
-    super(candidate, reference);
+  public ComparatorMapping(@Nonnull File reference, @Nonnull File candidate) {
+    super(reference, candidate);
   }
 
   @Override
diff --git a/jack-tests/src/com/android/jack/test/comparator/ComparatorSeeds.java b/jack-tests/src/com/android/jack/test/comparator/ComparatorSeeds.java
index 1cfe72b7..a9ba5855 100644
--- a/jack-tests/src/com/android/jack/test/comparator/ComparatorSeeds.java
+++ b/jack-tests/src/com/android/jack/test/comparator/ComparatorSeeds.java
@@ -22,13 +22,15 @@ import com.android.jack.shrob.SeedsComparator;
 import java.io.File;
 import java.io.IOException;
 
+import javax.annotation.Nonnull;
+
 /**
  * This {@link Comparator} is used to compare shrob seeds.
  */
 public class ComparatorSeeds extends ComparatorFile {
 
-  public ComparatorSeeds(File candidate, File reference) {
-    super(candidate, reference);
+  public ComparatorSeeds(@Nonnull File reference, @Nonnull File candidate) {
+    super(reference, candidate);
   }
 
   @Override
diff --git a/jack-tests/src/com/android/jack/test/helper/JackDexMergerTestHelper.java b/jack-tests/src/com/android/jack/test/helper/JackDexMergerTestHelper.java
index 3b2dfea6..613e1884 100644
--- a/jack-tests/src/com/android/jack/test/helper/JackDexMergerTestHelper.java
+++ b/jack-tests/src/com/android/jack/test/helper/JackDexMergerTestHelper.java
@@ -75,15 +75,15 @@ public class JackDexMergerTestHelper extends SourceToDexComparisonTestHelper {
   }
 
   public void compare() throws Exception {
-    ComparatorDex comparatorDex = new ComparatorDex(candidateDex, refDex);
+    ComparatorDex comparatorDex = new ComparatorDex(refDex, candidateDex);
     comparatorDex.setWithDebugInfo(false);
     comparatorDex.setStrict(true);
     comparatorDex.setCompareDebugInfoBinary(false);
     comparatorDex.setCompareInstructionNumber(true);
     comparatorDex.setInstructionNumberTolerance(0);
     ComparatorDexAnnotations comparatorAnnotations =
-        new ComparatorDexAnnotations(candidateDex, refDex);
-    ComparatorDiff comparatorDiff = new ComparatorDiff(candidateDex, refDex);
+        new ComparatorDexAnnotations(refDex, candidateDex);
+    ComparatorDiff comparatorDiff = new ComparatorDiff(refDex, candidateDex);
     runTest(new ComparatorComposite(comparatorDex, comparatorAnnotations, comparatorDiff));
   }
 }
diff --git a/jack-tests/src/com/android/jack/test/helper/SourceToDexComparisonTestHelper.java b/jack-tests/src/com/android/jack/test/helper/SourceToDexComparisonTestHelper.java
index 64b60223..15dc16aa 100644
--- a/jack-tests/src/com/android/jack/test/helper/SourceToDexComparisonTestHelper.java
+++ b/jack-tests/src/com/android/jack/test/helper/SourceToDexComparisonTestHelper.java
@@ -145,7 +145,7 @@ public class SourceToDexComparisonTestHelper extends GenericComparisonTestHelper
 
   @Nonnull
   public ComparatorDex createDexFileComparator() {
-    ComparatorDex comparator = new ComparatorDex(candidateDex, refDex);
+    ComparatorDex comparator = new ComparatorDex(refDex, candidateDex);
     comparator.setWithDebugInfo(withDebugInfos);
     comparator.setStrict(false);
     comparator.setCompareDebugInfoBinary(false);
diff --git a/jack-tests/tests/com/android/jack/fibonacci/FibonacciTests.java b/jack-tests/tests/com/android/jack/fibonacci/FibonacciTests.java
index a0d687e3..507ba3dc 100644
--- a/jack-tests/tests/com/android/jack/fibonacci/FibonacciTests.java
+++ b/jack-tests/tests/com/android/jack/fibonacci/FibonacciTests.java
@@ -57,7 +57,7 @@ public class FibonacciTests extends RuntimeTest {
   public void testCompareFiboDexFile() throws Exception {
     SourceToDexComparisonTestHelper helper =
         new CheckDexStructureTestHelper(new File(TEST001.directory, "jack"));
-    helper.runTest(new ComparatorDex(helper.getCandidateDex(), helper.getReferenceDex()));
+    helper.runTest(new ComparatorDex(helper.getReferenceDex(), helper.getCandidateDex()));
   }
 
   @Override
diff --git a/jack-tests/tests/com/android/jack/field/FieldTests.java b/jack-tests/tests/com/android/jack/field/FieldTests.java
index 6cd1be05..4a2bfa17 100644
--- a/jack-tests/tests/com/android/jack/field/FieldTests.java
+++ b/jack-tests/tests/com/android/jack/field/FieldTests.java
@@ -158,7 +158,7 @@ public class FieldTests extends RuntimeTest {
   private void checkStructure(@Nonnull String test) throws Exception {
     SourceToDexComparisonTestHelper helper = new CheckDexStructureTestHelper(
         AbstractTestTools.getTestRootDir("com.android.jack.field." + test + ".jack"));
-    helper.runTest(new ComparatorDex(helper.getCandidateDex(), helper.getReferenceDex()));
+    helper.runTest(new ComparatorDex(helper.getReferenceDex(), helper.getCandidateDex()));
   }
 
   @Override
diff --git a/jack-tests/tests/com/android/jack/inner/InnerTests.java b/jack-tests/tests/com/android/jack/inner/InnerTests.java
index 336aec1f..82302322 100644
--- a/jack-tests/tests/com/android/jack/inner/InnerTests.java
+++ b/jack-tests/tests/com/android/jack/inner/InnerTests.java
@@ -314,7 +314,7 @@ public class InnerTests extends RuntimeTest {
   private void checkStructure(@Nonnull String test) throws Exception {
     SourceToDexComparisonTestHelper helper = new CheckDexStructureTestHelper(
         AbstractTestTools.getTestRootDir("com.android.jack.inner." + test + ".jack"));
-    helper.runTest(new ComparatorDex(helper.getCandidateDex(), helper.getReferenceDex()));
+    helper.runTest(new ComparatorDex(helper.getReferenceDex(), helper.getCandidateDex()));
   }
 
   @Override
diff --git a/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java b/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java
index c7512ba6..28d2e3a1 100644
--- a/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java
+++ b/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java
@@ -67,8 +67,8 @@ public class MultiDexTests {
 
   private class ComparatorMultiDexListing extends ComparatorFile {
 
-    protected ComparatorMultiDexListing(File candidate, File reference) {
-      super(candidate, reference);
+    protected ComparatorMultiDexListing(@Nonnull File reference, @Nonnull File candidate) {
+      super(reference, candidate);
     }
 
     @Override
@@ -115,7 +115,8 @@ public class MultiDexTests {
     env.setCandidateClasspath(cp.toArray(new File[cp.size()]));
     env.setReferenceTestTools(new DummyToolchain());
 
-    env.runTest(new ComparatorMultiDexListing(env.getCandidateDex(), new File(testFolder, "ref-list-001.txt")));
+    env.runTest(new ComparatorMultiDexListing(new File(testFolder, "ref-list-001.txt"),
+        env.getCandidateDex()));
 
     Assert.assertFalse(new File(env.getCandidateDexDir(), "classes2.dex").exists());
   }
@@ -140,8 +141,10 @@ public class MultiDexTests {
     env.setCandidateClasspath(cp.toArray(new File[cp.size()]));
     env.setReferenceTestTools(new DummyToolchain());
 
-    Comparator c1 = new ComparatorMultiDexListing(env.getCandidateDex(), new File(testFolder, "ref-list-002-1.txt"));
-    Comparator c2 = new ComparatorMultiDexListing(new File(env.getCandidateDexDir(), "classes2.dex"), new File(testFolder, "ref-list-002-2.txt"));
+    Comparator c1 = new ComparatorMultiDexListing(new File(testFolder, "ref-list-002-1.txt"),
+        env.getCandidateDex());
+    Comparator c2 = new ComparatorMultiDexListing(new File(testFolder, "ref-list-002-2.txt"),
+        new File(env.getCandidateDexDir(), "classes2.dex"));
     env.runTest(c1, c2);
 
     Assert.assertFalse(new File(env.getCandidateDexDir(), "classes3.dex").exists());
@@ -167,8 +170,10 @@ public class MultiDexTests {
     env.setCandidateClasspath(cp.toArray(new File[cp.size()]));
     env.setReferenceTestTools(new DummyToolchain());
 
-    Comparator c1 = new ComparatorMultiDexListing(env.getCandidateDex(), new File(testFolder, "ref-list-003-1.txt"));
-    Comparator c2 = new ComparatorMultiDexListing(new File(env.getCandidateDexDir(), "classes2.dex"), new File(testFolder, "ref-list-003-2.txt"));
+    Comparator c1 = new ComparatorMultiDexListing(new File(testFolder, "ref-list-003-1.txt"),
+        env.getCandidateDex());
+    Comparator c2 = new ComparatorMultiDexListing(new File(testFolder, "ref-list-003-2.txt"),
+        new File(env.getCandidateDexDir(), "classes2.dex"));
     env.runTest(c1, c2);
 
     Assert.assertFalse(new File(env.getCandidateDexDir(), "classes3.dex").exists());
@@ -415,8 +420,10 @@ public class MultiDexTests {
     env.setCandidateClasspath(cp.toArray(new File[cp.size()]));
     env.setReferenceTestTools(new DummyToolchain());
 
-    Comparator c1 = new ComparatorMultiDexListing(env.getCandidateDex(), new File(testFolder, "ref-list-002-1.txt"));
-    Comparator c2 = new ComparatorMultiDexListing(new File(env.getCandidateDexDir(), "classes2.dex"), new File(testFolder, "ref-list-002-2.txt"));
+    Comparator c1 = new ComparatorMultiDexListing(new File(testFolder, "ref-list-002-1.txt"),
+        env.getCandidateDex());
+    Comparator c2 = new ComparatorMultiDexListing(new File(testFolder, "ref-list-002-2.txt"),
+        new File(env.getCandidateDexDir(), "classes2.dex"));
     env.runTest(c1, c2);
 
     Assert.assertFalse(new File(env.getCandidateDexDir(), "classes3.dex").exists());
diff --git a/jack-tests/tests/com/android/jack/shrob/AnnotationsTest.java b/jack-tests/tests/com/android/jack/shrob/AnnotationsTest.java
index e624cf7f..228146ff 100644
--- a/jack-tests/tests/com/android/jack/shrob/AnnotationsTest.java
+++ b/jack-tests/tests/com/android/jack/shrob/AnnotationsTest.java
@@ -46,6 +46,6 @@ public class AnnotationsTest extends AbstractTest {
 //      new ProguardFlags(TestTools.getJackTestFolder("shrob"),"keepDebugInfo.flags"),
       new ProguardFlags(shrobFolder,"keepAllAttributes.flags"),
       new ProguardFlags(testFolder,"proguard.flags" + flagNumber));
-    env.runTest(new ComparatorDexAnnotations(env.getCandidateDex(), env.getReferenceDex()));
+    env.runTest(new ComparatorDexAnnotations(env.getReferenceDex(), env.getCandidateDex()));
   }
 }
diff --git a/jack-tests/tests/com/android/jack/shrob/ObfuscationWithAttributesTests.java b/jack-tests/tests/com/android/jack/shrob/ObfuscationWithAttributesTests.java
index 5a1feaf7..81fbc7aa 100644
--- a/jack-tests/tests/com/android/jack/shrob/ObfuscationWithAttributesTests.java
+++ b/jack-tests/tests/com/android/jack/shrob/ObfuscationWithAttributesTests.java
@@ -60,6 +60,6 @@ public class ObfuscationWithAttributesTests extends AbstractTest {
     env.setCandidateTestTools(toolchain);
     env.setReferenceTestTools(refToolchain);
     env.setWithDebugInfo(true);
-    env.runTest(new ComparatorDex(env.getCandidateDex(), env.getReferenceDex()));
+    env.runTest(new ComparatorDex(env.getReferenceDex(), env.getCandidateDex()));
   }
 }
diff --git a/jack-tests/tests/com/android/jack/shrob/ObfuscationWithDebugInfoTests.java b/jack-tests/tests/com/android/jack/shrob/ObfuscationWithDebugInfoTests.java
index 80eac52d..f722291b 100644
--- a/jack-tests/tests/com/android/jack/shrob/ObfuscationWithDebugInfoTests.java
+++ b/jack-tests/tests/com/android/jack/shrob/ObfuscationWithDebugInfoTests.java
@@ -45,6 +45,6 @@ public class ObfuscationWithDebugInfoTests extends AbstractTest {
         new ProguardFlags(AbstractTestTools.getTestRootDir("com.android.jack.shrob"),
             "keepDebugInfo.flags"), new ProguardFlags(testFolder, "proguard.flags" + flagNumber));
 
-    env.runTest(new ComparatorDex(env.getCandidateDex(), env.getReferenceDex()));
+    env.runTest(new ComparatorDex(env.getReferenceDex(), env.getCandidateDex()));
   }
 }
diff --git a/jack-tests/tests/com/android/jack/shrob/ObfuscationWithMappingTests.java b/jack-tests/tests/com/android/jack/shrob/ObfuscationWithMappingTests.java
index 6104b609..fc474852 100644
--- a/jack-tests/tests/com/android/jack/shrob/ObfuscationWithMappingTests.java
+++ b/jack-tests/tests/com/android/jack/shrob/ObfuscationWithMappingTests.java
@@ -64,7 +64,7 @@ public class ObfuscationWithMappingTests extends AbstractTest {
     env.setCandidateTestTools(toolchain);
     env.setReferenceTestTools(new DummyToolchain());
 
-    env.runTest(new ComparatorMapping(candidateOutputMapping, refOutputMapping));
+    env.runTest(new ComparatorMapping(refOutputMapping, candidateOutputMapping));
   }
 
   @Override
diff --git a/jack-tests/tests/com/android/jack/shrob/ObfuscationWithoutMappingTests.java b/jack-tests/tests/com/android/jack/shrob/ObfuscationWithoutMappingTests.java
index 436666b6..fb170c58 100644
--- a/jack-tests/tests/com/android/jack/shrob/ObfuscationWithoutMappingTests.java
+++ b/jack-tests/tests/com/android/jack/shrob/ObfuscationWithoutMappingTests.java
@@ -69,7 +69,7 @@ public class ObfuscationWithoutMappingTests extends AbstractTest {
     env.setCandidateTestTools(toolchain);
     env.setReferenceTestTools(new DummyToolchain());
 
-    env.runTest(new ComparatorMapping(candidateOutputMapping, refOutputMapping));
+    env.runTest(new ComparatorMapping(refOutputMapping, candidateOutputMapping));
   }
 
   @Override
diff --git a/jack-tests/tests/com/android/jack/shrob/RepackagingTest.java b/jack-tests/tests/com/android/jack/shrob/RepackagingTest.java
index f9253bdd..0ccf2785 100644
--- a/jack-tests/tests/com/android/jack/shrob/RepackagingTest.java
+++ b/jack-tests/tests/com/android/jack/shrob/RepackagingTest.java
@@ -67,7 +67,7 @@ public class RepackagingTest extends AbstractTest {
     env.setCandidateTestTools(toolchain);
     env.setReferenceTestTools(new DummyToolchain());
 
-    env.runTest(new ComparatorMapping(candidateOutputMapping, refOutputMapping));
+    env.runTest(new ComparatorMapping(refOutputMapping, candidateOutputMapping));
   }
 
   @Nonnull
diff --git a/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java b/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java
index eef337d0..6ffa637c 100644
--- a/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java
+++ b/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java
@@ -81,8 +81,7 @@ public class ShrinkTests extends AbstractTest {
         new ProguardFlags(shrobTestsDir,"keepAllAttributes.flags"),
         new ProguardFlags(testFolder, "proguard.flags" + flagNumber));
 
-    env.runTest(new ComparatorMapping(
-        new File(refFolder, "expected-" + flagNumber + ".txt"),
+    env.runTest(new ComparatorMapping(new File(refFolder, "expected-" + flagNumber + ".txt"),
         candidateNodeListing));
   }