1 files changed, 3 insertions, 27 deletions
diff --git a/dexcomparator/testing/com/android/jack/dexcomparator/test/BinaryCodeComparisonTest.java b/dexcomparator/testing/com/android/jack/dexcomparator/test/BinaryCodeComparisonTest.java
index 863d291..3441168 100644
--- a/dexcomparator/testing/com/android/jack/dexcomparator/test/BinaryCodeComparisonTest.java
+++ b/dexcomparator/testing/com/android/jack/dexcomparator/test/BinaryCodeComparisonTest.java
@@ -18,10 +18,8 @@ package com.android.jack.dexcomparator.test;
 
 import com.android.jack.DexComparator;
 import com.android.jack.DifferenceFoundException;
-import com.android.jack.util.ExecuteFile;
 
 import org.junit.Assert;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 import java.io.File;
@@ -36,15 +34,6 @@ public class BinaryCodeComparisonTest {
   private static final File testSource1 = new File("testsource1");
   @Nonnull
   private static final File testSource2 = new File("testsource2");
-  @Nonnull
-  private static final File jackJar = new File("../jack/dist/jack.jar");
-  @Nonnull
-  private static final File coreStubsMini = new File("../jack/libs/core-stubs-mini.jar");
-
-  @BeforeClass
-  public static void setUpClass() {
-    BinaryCodeComparisonTest.class.getClassLoader().setDefaultAssertionStatus(true);
-  }
 
   @Test
   public void testDifferentBinaryCodeComparison() throws IOException {
@@ -53,10 +42,10 @@ public class BinaryCodeComparisonTest {
     File a2 = new File(testSource2, sourcePath);
     File dex1 = File.createTempFile("dex1", ".dex");
     dex1.deleteOnExit();
-    compileToDexWithJack(a1, dex1);
+    TestTools.compileToDexWithJack(a1, dex1);
     File dex2 = File.createTempFile("dex2", ".dex");
     dex2.deleteOnExit();
-    compileToDexWithJack(a2, dex2);
+    TestTools.compileToDexWithJack(a2, dex2);
     try {
       new DexComparator().compare(dex1, dex2, false /* compareDebugInfo */, true /* strict */,
           false /* compareDebugInfoBinarily */, true /* compareCodeBinarily */);
@@ -77,7 +66,7 @@ public class BinaryCodeComparisonTest {
     File a1 = new File(testSource1, sourcePath);
     File dex1 = File.createTempFile("dex1", ".dex");
     dex1.deleteOnExit();
-    compileToDexWithJack(a1, dex1);
+    TestTools.compileToDexWithJack(a1, dex1);
     try {
       new DexComparator().compare(dex1, dex1, false /* compareDebugInfo */, true /* strict */,
           false /* compareDebugInfoBinarily */, true /* compareCodeBinarily */);
@@ -85,17 +74,4 @@ public class BinaryCodeComparisonTest {
       Assert.fail(e.getMessage());
     }
   }
-
-  private void compileToDexWithJack(File source, File dex) {
-    String[] args = new String[]{"java", "-jar", jackJar.getAbsolutePath(),
-        "-cp", coreStubsMini.getAbsolutePath(),
-        "-o", dex.getAbsolutePath(), "--ecj", source.getAbsolutePath()};
-
-    ExecuteFile execFile = new ExecuteFile(args);
-    if (!execFile.run()) {
-      throw new RuntimeException("Jack exited with an error");
-    }
-
-  }
-
 }