diff options
| author | Jean-Marie Henaff <jmhenaff@google.com> | 2014-12-16 12:57:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-16 12:57:03 +0000 |
| commit | 2795ce10d3fc56365f4d0ac64bdf535416404448 (patch) | |
| tree | bebb32afc4875e529a8785b009d6263e5ff08570 /jack-tests/tests/com/android/jack/shrob | |
| parent | 537fc04b9de3a07bc2fab49ba18bd8286cfbeabe (diff) | |
| parent | 9d8f8efea66cfe7547eef672f14eca971f646b96 (diff) | |
| download | toolchain_jack-2795ce10d3fc56365f4d0ac64bdf535416404448.zip toolchain_jack-2795ce10d3fc56365f4d0ac64bdf535416404448.tar.gz toolchain_jack-2795ce10d3fc56365f4d0ac64bdf535416404448.tar.bz2 | |
Merge "Remove references to TestTools in jack-tests" into ub-jack
Diffstat (limited to 'jack-tests/tests/com/android/jack/shrob')
| -rw-r--r-- | jack-tests/tests/com/android/jack/shrob/AbstractTest.java | 6 | ||||
| -rw-r--r-- | jack-tests/tests/com/android/jack/shrob/AnnotationsTest.java | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/jack-tests/tests/com/android/jack/shrob/AbstractTest.java b/jack-tests/tests/com/android/jack/shrob/AbstractTest.java index 22896b6..07185c4 100644 --- a/jack-tests/tests/com/android/jack/shrob/AbstractTest.java +++ b/jack-tests/tests/com/android/jack/shrob/AbstractTest.java @@ -18,9 +18,9 @@ package com.android.jack.shrob; import com.android.jack.Main; import com.android.jack.ProguardFlags; -import com.android.jack.TestTools; import com.android.jack.test.category.KnownBugs; import com.android.jack.test.category.SlowTests; +import com.android.jack.test.toolchain.AbstractTestTools; import org.junit.BeforeClass; import org.junit.Test; @@ -50,7 +50,7 @@ public abstract class AbstractTest { throws Exception; protected ProguardFlags generateApplyMapping(@Nonnull File mappingFile) throws IOException { - File applyMapping = TestTools.createTempFile("mapping.flags", null); + File applyMapping = AbstractTestTools.createTempFile("mapping.flags", null); BufferedWriter writer = new BufferedWriter(new FileWriter(applyMapping)); writer.append("-applymapping "); writer.append(mappingFile.getAbsolutePath()); @@ -59,7 +59,7 @@ public abstract class AbstractTest { } protected ProguardFlags generateInjars(@Nonnull File injar) throws IOException { - File injarFlags = TestTools.createTempFile("injars", ".flags"); + File injarFlags = AbstractTestTools.createTempFile("injars", ".flags"); BufferedWriter writer = new BufferedWriter(new FileWriter(injarFlags)); writer.append("-injars "); writer.append(injar.getAbsolutePath()); diff --git a/jack-tests/tests/com/android/jack/shrob/AnnotationsTest.java b/jack-tests/tests/com/android/jack/shrob/AnnotationsTest.java index cf81902..e624cf7 100644 --- a/jack-tests/tests/com/android/jack/shrob/AnnotationsTest.java +++ b/jack-tests/tests/com/android/jack/shrob/AnnotationsTest.java @@ -17,7 +17,6 @@ package com.android.jack.shrob; import com.android.jack.ProguardFlags; -import com.android.jack.TestTools; import com.android.jack.test.comparator.ComparatorDexAnnotations; import com.android.jack.test.helper.SourceToDexComparisonTestHelper; import com.android.jack.test.toolchain.AbstractTestTools; @@ -35,7 +34,8 @@ public class AnnotationsTest extends AbstractTest { @Nonnull String flagNumber, @Nonnull String mappingNumber) throws Exception { - File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.shrob.test" + testNumber); + File shrobFolder = AbstractTestTools.getTestRootDir("com.android.jack.shrob"); + File testFolder = new File(shrobFolder, "test" + testNumber); JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class); SourceToDexComparisonTestHelper env = @@ -44,7 +44,7 @@ public class AnnotationsTest extends AbstractTest { env.setProguardFlags( generateApplyMapping(new File(testFolder,"proguard.flags" + flagNumber + ".mapping" + mappingNumber)), // new ProguardFlags(TestTools.getJackTestFolder("shrob"),"keepDebugInfo.flags"), - new ProguardFlags(TestTools.getJackTestFolder("shrob"),"keepAllAttributes.flags"), + new ProguardFlags(shrobFolder,"keepAllAttributes.flags"), new ProguardFlags(testFolder,"proguard.flags" + flagNumber)); env.runTest(new ComparatorDexAnnotations(env.getCandidateDex(), env.getReferenceDex())); } |