diff options
Diffstat (limited to 'jack-tests/src')
4 files changed, 24 insertions, 15 deletions
diff --git a/jack-tests/src/com/android/jack/test/helper/CheckDexStructureTestHelper.java b/jack-tests/src/com/android/jack/test/helper/CheckDexStructureTestHelper.java index d00d367..296f371 100644 --- a/jack-tests/src/com/android/jack/test/helper/CheckDexStructureTestHelper.java +++ b/jack-tests/src/com/android/jack/test/helper/CheckDexStructureTestHelper.java @@ -48,13 +48,13 @@ public class CheckDexStructureTestHelper extends SourceToDexComparisonTestHelper @Override @Nonnull - public CheckDexStructureTestHelper setCandidateClasspath(@Nonnull File[] classpath) { + public CheckDexStructureTestHelper setCandidateClasspath(@Nonnull File... classpath) { return (CheckDexStructureTestHelper) super.setCandidateClasspath(classpath); } @Override @Nonnull - public CheckDexStructureTestHelper setReferenceClasspath(@Nonnull File[] classpath) { + public CheckDexStructureTestHelper setReferenceClasspath(@Nonnull File... classpath) { return (CheckDexStructureTestHelper) super.setReferenceClasspath(classpath); } 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 5c2b17c..3b2dfea 100644 --- a/jack-tests/src/com/android/jack/test/helper/JackDexMergerTestHelper.java +++ b/jack-tests/src/com/android/jack/test/helper/JackDexMergerTestHelper.java @@ -18,7 +18,6 @@ package com.android.jack.test.helper; import com.android.jack.Options; import com.android.jack.backend.dex.rop.CodeItemBuilder; -import com.android.jack.test.comparator.Comparator; import com.android.jack.test.comparator.ComparatorComposite; import com.android.jack.test.comparator.ComparatorDex; import com.android.jack.test.comparator.ComparatorDexAnnotations; @@ -75,9 +74,7 @@ public class JackDexMergerTestHelper extends SourceToDexComparisonTestHelper { return toolchain; } - @Override - @Nonnull - public Comparator createDexFileComparator() { + public void compare() throws Exception { ComparatorDex comparatorDex = new ComparatorDex(candidateDex, refDex); comparatorDex.setWithDebugInfo(false); comparatorDex.setStrict(true); @@ -87,10 +84,6 @@ public class JackDexMergerTestHelper extends SourceToDexComparisonTestHelper { ComparatorDexAnnotations comparatorAnnotations = new ComparatorDexAnnotations(candidateDex, refDex); ComparatorDiff comparatorDiff = new ComparatorDiff(candidateDex, refDex); - return new ComparatorComposite(comparatorDex, comparatorAnnotations, comparatorDiff); - } - - public void compare() throws Exception { - runTest(createDexFileComparator()); + 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 87db1be..2f78c17 100644 --- a/jack-tests/src/com/android/jack/test/helper/SourceToDexComparisonTestHelper.java +++ b/jack-tests/src/com/android/jack/test/helper/SourceToDexComparisonTestHelper.java @@ -16,10 +16,10 @@ package com.android.jack.test.helper; -import com.android.jack.test.comparator.Comparator; import com.android.jack.test.comparator.ComparatorDex; import com.android.jack.test.toolchain.AbstractTestTools; import com.android.jack.test.toolchain.AndroidToolchain; +import com.android.jack.test.toolchain.Toolchain.SourceLevel; import java.io.File; @@ -55,6 +55,9 @@ public class SourceToDexComparisonTestHelper extends GenericComparisonTestHelper private File[] proguardFlagFiles = new File[0]; @Nonnull + private SourceLevel sourceLevel = SourceLevel.JAVA_6; + + @Nonnull private AndroidToolchain candidateTestTools; @Nonnull private AndroidToolchain referenceTestTools; @@ -103,13 +106,13 @@ public class SourceToDexComparisonTestHelper extends GenericComparisonTestHelper } @Nonnull - public SourceToDexComparisonTestHelper setCandidateClasspath(@Nonnull File[] classpath) { + public SourceToDexComparisonTestHelper setCandidateClasspath(@Nonnull File... classpath) { candidateClasspath = classpath; return this; } @Nonnull - public SourceToDexComparisonTestHelper setReferenceClasspath(@Nonnull File[] classpath) { + public SourceToDexComparisonTestHelper setReferenceClasspath(@Nonnull File... classpath) { referenceClasspath = classpath; return this; } @@ -120,6 +123,10 @@ public class SourceToDexComparisonTestHelper extends GenericComparisonTestHelper return this; } + public void setSourceLevel(SourceLevel sourceLevel) { + this.sourceLevel = sourceLevel; + } + public File getCandidateDex() { return candidateDex; } @@ -137,7 +144,7 @@ public class SourceToDexComparisonTestHelper extends GenericComparisonTestHelper } @Nonnull - public Comparator createDexFileComparator() { + public ComparatorDex createDexFileComparator() { ComparatorDex comparator = new ComparatorDex(candidateDex, refDex); comparator.setWithDebugInfo(withDebugInfos); comparator.setStrict(false); @@ -166,6 +173,7 @@ public class SourceToDexComparisonTestHelper extends GenericComparisonTestHelper candidateTestTools.setJarjarRules(jarjarRulesFile); } candidateTestTools.setWithDebugInfos(withDebugInfos); + candidateTestTools.setSourceLevel(sourceLevel); candidateTestTools.addProguardFlags(proguardFlagFiles).srcToExe( AbstractTestTools.getClasspathAsString(candidateClasspath), candidateDexDir, /* zipFile = */ false, filesOrSourceList); @@ -178,6 +186,7 @@ public class SourceToDexComparisonTestHelper extends GenericComparisonTestHelper referenceTestTools.setJarjarRules(jarjarRulesFile); } referenceTestTools.setWithDebugInfos(withDebugInfos); + referenceTestTools.setSourceLevel(sourceLevel); referenceTestTools.addProguardFlags(proguardFlagFiles).srcToExe( AbstractTestTools.getClasspathAsString(referenceClasspath), refDexDir, /* zipFile = */ false, filesOrSourceList); diff --git a/jack-tests/src/com/android/jack/test/toolchain/LegacyToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/LegacyToolchain.java index 42e816b..289412a 100644 --- a/jack-tests/src/com/android/jack/test/toolchain/LegacyToolchain.java +++ b/jack-tests/src/com/android/jack/test/toolchain/LegacyToolchain.java @@ -212,6 +212,10 @@ public class LegacyToolchain extends AndroidToolchain { args.add("-verbose"); } addSourceLevel(sourceLevel, args); + + args.add("-encoding"); + args.add("utf8"); + args.add("-noExit"); args.add("-preserveAllLocals"); args.add("-d"); @@ -263,6 +267,9 @@ public class LegacyToolchain extends AndroidToolchain { addSourceLevel(sourceLevel, arguments); + arguments.add("-encoding"); + arguments.add("utf8"); + if (annotationProcessorClass != null) { arguments.add("-processor"); arguments.add(annotationProcessorClass.getName()); |