diff options
Diffstat (limited to 'jack-tests/src/com/android')
8 files changed, 20 insertions, 18 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 bef67e9..00f47a1 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 adbcae8..30a0bdb 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 a9eff8d..c2ffd0e 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 9bdcc2c..7e6f3db 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 c21fd0e..6b7cc5b 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 1cfe72b..a9ba585 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 3b2dfea..613e188 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 64b6022..15dc16a 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); |