From 9d8f8efea66cfe7547eef672f14eca971f646b96 Mon Sep 17 00:00:00 2001
From: Jean-Marie Henaff <jmhenaff@google.com>
Date: Thu, 11 Dec 2014 10:29:03 +0100
Subject: Remove references to TestTools in jack-tests

Remove references on TestTools that can be handled by AbstractTestTools

Change-Id: I3d004df0c6950dee4b3715cd6c88f809efd55b0b
---
 jack-tests/tests/com/android/jack/shrob/AbstractTest.java    | 6 +++---
 jack-tests/tests/com/android/jack/shrob/AnnotationsTest.java | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'jack-tests/tests/com/android/jack/shrob')

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()));
   }
-- 
cgit v1.1