diff options
author | Jean-Marie Henaff <jmhenaff@google.com> | 2015-03-02 14:50:31 +0100 |
---|---|---|
committer | Jean-Marie Henaff <jmhenaff@google.com> | 2015-03-06 14:12:20 +0100 |
commit | d235ed6f21b7b21aefb4b066b0c64acfa2bbb229 (patch) | |
tree | e2a963acc70ba664991df32bf3f64176cbcc6a82 /jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java | |
parent | d6059b4371b3039f5e6e473664302b4c6cada7dc (diff) | |
download | toolchain_jack-d235ed6f21b7b21aefb4b066b0c64acfa2bbb229.tar.gz toolchain_jack-d235ed6f21b7b21aefb4b066b0c64acfa2bbb229.tar.bz2 toolchain_jack-d235ed6f21b7b21aefb4b066b0c64acfa2bbb229.zip |
Start using jack-api for jack API based test toolchains
Implementation is still to be done.
Change-Id: I010ab9f00f4c00275982d4abfcbf6c94248f3fb4
Diffstat (limited to 'jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java')
-rw-r--r-- | jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java b/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java index 0b0b34ab..0302d497 100644 --- a/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java +++ b/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java @@ -30,7 +30,7 @@ import com.android.jack.shrob.obfuscation.NameProviderFactory; import com.android.jack.test.category.KnownBugs; import com.android.jack.test.toolchain.AbstractTestTools; import com.android.jack.test.toolchain.IToolchain; -import com.android.jack.test.toolchain.JackApiToolchain; +import com.android.jack.test.toolchain.JackApiToolchainBase; import com.android.jack.test.toolchain.JackBasedToolchain; import com.android.jack.test.toolchain.JackCliToolchain; import com.android.jack.test.toolchain.LegacyJillToolchain; @@ -51,9 +51,9 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.io.OutputStream; import java.util.ArrayList; import java.util.List; -import java.io.OutputStream; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; @@ -485,7 +485,8 @@ public class FileConflictTests { File testSrcDir = AbstractTestTools.getTestRootDir("com.android.jack.fileconflict.test004.jack"); File tempJackFolder = AbstractTestTools.createTempDir(); - JackApiToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class); + JackApiToolchainBase toolchain = + AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class); toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) .srcToLib( tempJackFolder, @@ -512,7 +513,7 @@ public class FileConflictTests { copyFileToDir(resource2, "pcz/nbqfcvq/wnpx/svyrpcbsyvph/hrgh004/wnpx/ZmPyngg.txt", jackOutput); // run Jack on Jack dir - toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchain.class); + toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class); toolchain.addProguardFlags(new File(testSrcDir, "proguard.flags")); toolchain.addProperty(NameProviderFactory.NAMEPROVIDER.getName(), "rot13"); toolchain.libToLib(jackImport1, jackOutput, /* zipFiles = */ false); @@ -528,7 +529,7 @@ public class FileConflictTests { if (isApiTest) { excludeList.add(JackCliToolchain.class); } - return AbstractTestTools.getCandidateToolchain(JackApiToolchain.class, excludeList); + return AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class, excludeList); } private void runTest001(@Nonnull File jackOutput, @CheckForNull String collisionPolicy, |