diff options
3 files changed, 9 insertions, 9 deletions
diff --git a/jack-tests/tests/com/android/jack/shrob/FlattenPackageTests.java b/jack-tests/tests/com/android/jack/shrob/FlattenPackageTests.java index 20566d93..077d869f 100644 --- a/jack-tests/tests/com/android/jack/shrob/FlattenPackageTests.java +++ b/jack-tests/tests/com/android/jack/shrob/FlattenPackageTests.java @@ -23,7 +23,7 @@ import com.android.jack.test.comparator.ComparatorMapping; 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.JackBasedToolchain; +import com.android.jack.test.toolchain.JackApiToolchainBase; import org.junit.experimental.categories.Category; @@ -41,8 +41,8 @@ public class FlattenPackageTests extends AbstractTest { @Nonnull String mappingNumber) throws Exception { File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.shrob.test" + testNumber); - JackBasedToolchain toolchain = - AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); + JackApiToolchainBase toolchain = + AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class); File candidateOutputMapping = AbstractTestTools.createTempFile("mapping", ".txt"); File refFolder = new File(testFolder, "refsFlattenPackage"); File refOutputMapping = new File(refFolder, "expected-" + flagNumber + ".txt"); diff --git a/jack-tests/tests/com/android/jack/shrob/ObfuscationWithoutMappingTests.java b/jack-tests/tests/com/android/jack/shrob/ObfuscationWithoutMappingTests.java index 6a782202..436666b6 100644 --- a/jack-tests/tests/com/android/jack/shrob/ObfuscationWithoutMappingTests.java +++ b/jack-tests/tests/com/android/jack/shrob/ObfuscationWithoutMappingTests.java @@ -23,7 +23,7 @@ import com.android.jack.test.comparator.ComparatorMapping; 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.JackBasedToolchain; +import com.android.jack.test.toolchain.JackApiToolchainBase; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -46,8 +46,8 @@ public class ObfuscationWithoutMappingTests extends AbstractTest { String testPackageName = "com.android.jack.shrob.test" + testNumber; File testFolder = AbstractTestTools.getTestRootDir(testPackageName); - JackBasedToolchain toolchain = - AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); + JackApiToolchainBase toolchain = + AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class); File refFolder = new File(testFolder, "refsObfuscationWithoutMapping"); toolchain.addProperty(NameProviderFactory.NAMEPROVIDER.getName(), "rot13"); diff --git a/jack-tests/tests/com/android/jack/shrob/RepackagingTest.java b/jack-tests/tests/com/android/jack/shrob/RepackagingTest.java index 0592546a..1ecc41e6 100644 --- a/jack-tests/tests/com/android/jack/shrob/RepackagingTest.java +++ b/jack-tests/tests/com/android/jack/shrob/RepackagingTest.java @@ -22,7 +22,7 @@ import com.android.jack.test.comparator.ComparatorMapping; 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.JackApiV01Toolchain; +import com.android.jack.test.toolchain.JackApiToolchainBase; import java.io.File; @@ -41,8 +41,8 @@ public class RepackagingTest extends AbstractTest { File refFolder = new File(testFolder, "refsRepackageClasses"); File refOutputMapping = new File(refFolder, "expected-" + flagNumber + ".txt"); - JackApiV01Toolchain toolchain = - AbstractTestTools.getCandidateToolchain(JackApiV01Toolchain.class); + JackApiToolchainBase toolchain = + AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class); toolchain.addProperty(NameProviderFactory.NAMEPROVIDER.getName(), "rot13"); toolchain.addProperty(Options.METHOD_FILTER.getName(), "supported-methods"); |