diff options
Diffstat (limited to 'jack-tests/tests/com/android/jack/multidex/MultiDexTests.java')
| -rw-r--r-- | jack-tests/tests/com/android/jack/multidex/MultiDexTests.java | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java b/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java index 764448e..a1a641b 100644 --- a/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java +++ b/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java @@ -34,7 +34,7 @@ import com.android.jack.test.helper.SourceToDexComparisonTestHelper; import com.android.jack.test.toolchain.AbstractTestTools; import com.android.jack.test.toolchain.DummyToolchain; import com.android.jack.test.toolchain.IToolchain; -import com.android.jack.test.toolchain.JackApiToolchainBase; +import com.android.jack.test.toolchain.JackApiToolchain; import com.android.jack.test.toolchain.JackBasedToolchain; import com.android.jack.test.toolchain.LegacyJillToolchain; import com.android.sched.util.TextUtils; @@ -94,8 +94,7 @@ public class MultiDexTests { public void versionedTest001a() throws Exception { File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.multidex.test001.jack"); - JackApiToolchainBase toolchain = - AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class); + JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class); addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-001.jpp")); toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "multidex"); @@ -121,8 +120,7 @@ public class MultiDexTests { public void versionedTest001b() throws Exception { File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.multidex.test001.jack"); - JackApiToolchainBase toolchain = - AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class); + JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class); addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-001.jpp")); toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex"); @@ -147,8 +145,7 @@ public class MultiDexTests { public void versionedTest001c() throws Exception { File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.multidex.test001.jack"); - JackApiToolchainBase toolchain = - AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class); + JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class); addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-003.jpp")); toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex"); @@ -173,8 +170,7 @@ public class MultiDexTests { public void versionedTest001a_withoutAnnotations() throws Exception { File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.multidex.test001.jack"); File out = AbstractTestTools.createTempDir(); - JackApiToolchainBase toolchain = - AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class); + JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class); addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-001.jpp")); toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "multidex"); @@ -192,7 +188,7 @@ public class MultiDexTests { public void versionedTest001b_minimal_withoutAnnotations() throws Exception { File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.multidex.test001.jack"); File out = AbstractTestTools.createTempDir(); - JackApiToolchainBase toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class); + JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class); addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-001.jpp")); toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex"); @@ -213,8 +209,7 @@ public class MultiDexTests { File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.multidex.test001.jack"); File out = AbstractTestTools.createTempDir(); - JackApiToolchainBase toolchain = - AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class); + JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class); addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-003.jpp")); toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex"); @@ -323,8 +318,7 @@ public class MultiDexTests { File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.multidex.test002.jack"); File out = AbstractTestTools.createTempDir(); - JackApiToolchainBase toolchain = - AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class); + JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class); addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-001.jpp")); toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "multidex"); @@ -354,8 +348,7 @@ public class MultiDexTests { File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.multidex.test002.jack"); File out = AbstractTestTools.createTempDir(); - JackApiToolchainBase toolchain = - AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class); + JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class); addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-001.jpp")); toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex"); toolchain.addStaticLibs(library); @@ -391,8 +384,7 @@ public class MultiDexTests { Assert.assertTrue(jackInf.mkdir()); Files.copy(new File(testFolder,"config-001.jpp"), new File(jackInf, "config-001.jpp")); - JackApiToolchainBase toolchain = - AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class); + JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class); toolchain.addProperty(MultiDexLegacy.MULTIDEX_LEGACY.getName(), "true"); toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex"); toolchain.addStaticLibs(autoLibrary); |