Tests: use toolchain specific extensions for library names

Change-Id: Ia575e793984349a4e64d2a2bbba6bec5abe6a5be

14 files changed, 68 insertions, 38 deletions

diff --git a/jack-tests/src/com/android/jack/test/toolchain/AndroidToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/AndroidToolchain.java
index 12a1215a..bf7ece74 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/AndroidToolchain.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/AndroidToolchain.java
@@ -29,12 +29,6 @@ public abstract class AndroidToolchain extends Toolchain {
     return ".dex";
   }
 
-  @Override
-  @Nonnull
-  public final String getLibraryExtension() {
-    return ".jar";
-  }
-
   @Nonnull
   public final String getBinaryFileName() {
     return "classes.dex";
diff --git a/jack-tests/src/com/android/jack/test/toolchain/DummyToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/DummyToolchain.java
index f66578fe..09e3f1b4 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/DummyToolchain.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/DummyToolchain.java
@@ -75,4 +75,10 @@ public class DummyToolchain extends AndroidToolchain {
     return this;
   }
 
+  @Override
+  @Nonnull
+  public String getLibraryExtension() {
+    return ".dummy";
+  }
+
 }
diff --git a/jack-tests/src/com/android/jack/test/toolchain/JackBasedToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/JackBasedToolchain.java
index 697adf88..a10d839c 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/JackBasedToolchain.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/JackBasedToolchain.java
@@ -154,4 +154,11 @@ public abstract class JackBasedToolchain extends AndroidToolchain {
         new File(AbstractTestTools.getJackRootDir(),
             "jack-tests/prebuilts/junit4-targetdex-jack.zip")};
   }
+
+  @Override
+  @Nonnull
+  public String getLibraryExtension() {
+    return ".jack";
+  }
+
 }
diff --git a/jack-tests/src/com/android/jack/test/toolchain/LegacyJillToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/LegacyJillToolchain.java
index 2c4f1d52..11508305 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/LegacyJillToolchain.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/LegacyJillToolchain.java
@@ -122,6 +122,12 @@ public class LegacyJillToolchain extends JillBasedToolchain {
     throw new AssertionError("Not applicable");
   }
 
+  @Override
+  @Nonnull
+  public String getLibraryExtension() {
+    return ".jar";
+  }
+
   private void compileWithExternalRefCompiler(@Nonnull File[] sources,
       @Nonnull String classpath, @Nonnull File out) {
 
diff --git a/jack-tests/src/com/android/jack/test/toolchain/LegacyToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/LegacyToolchain.java
index fe2e5354..42e816b6 100644
--- a/jack-tests/src/com/android/jack/test/toolchain/LegacyToolchain.java
+++ b/jack-tests/src/com/android/jack/test/toolchain/LegacyToolchain.java
@@ -138,6 +138,12 @@ public class LegacyToolchain extends AndroidToolchain {
     };
   }
 
+  @Override
+  @Nonnull
+  public final String getLibraryExtension() {
+    return ".jar";
+  }
+
   private void processWithJarJar(@Nonnull File jarjarRules,
       @Nonnull File inJar, @Nonnull File outJar) {
     String[] args = new String[]{"java", "-Dverbose=" + String.valueOf(isVerbose), "-jar",
diff --git a/jack-tests/tests/com/android/jack/bridge/BridgeTests.java b/jack-tests/tests/com/android/jack/bridge/BridgeTests.java
index 0b4eab9c..f7e543b1 100644
--- a/jack-tests/tests/com/android/jack/bridge/BridgeTests.java
+++ b/jack-tests/tests/com/android/jack/bridge/BridgeTests.java
@@ -111,7 +111,7 @@ public class BridgeTests extends RuntimeTest {
 
     IToolchain toolchain = AbstractTestTools.getCandidateToolchain();
     File srcFolder = AbstractTestTools.getTestRootDir("com.android.jack.bridge.test008.jack");
-    File jackZipOfGenericPackageProtected = AbstractTestTools.createTempFile("tmpBridge", ".zip");
+    File jackZipOfGenericPackageProtected = AbstractTestTools.createTempFile("tmpBridge", toolchain.getLibraryExtension());
     toolchain.srcToLib(
         AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()),
         jackZipOfGenericPackageProtected,
@@ -120,7 +120,7 @@ public class BridgeTests extends RuntimeTest {
 
     // Build jack file from PublicExtendsGeneric.java
     toolchain = AbstractTestTools.getCandidateToolchain();
-    File jackZipOfPublicExtendsGeneric = AbstractTestTools.createTempFile("tmpBridge", ".zip");
+    File jackZipOfPublicExtendsGeneric = AbstractTestTools.createTempFile("tmpBridge", toolchain.getLibraryExtension());
     toolchain.srcToLib(
         AbstractTestTools.getClasspathsAsString(toolchain.getDefaultBootClasspath(), new File [] {jackZipOfGenericPackageProtected}),
         jackZipOfPublicExtendsGeneric,
diff --git a/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java b/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java
index 5111fa04..d563d35e 100644
--- a/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java
+++ b/jack-tests/tests/com/android/jack/classpath/ClasspathTests.java
@@ -129,18 +129,18 @@ public class ClasspathTests {
     IToolchain toolchain = AbstractTestTools.getCandidateToolchain();
     String defaultClasspath =
         AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath());
-    File libOfLibOut = AbstractTestTools.createTempFile("libOfLibOut", ".zip");
+    File libOfLibOut = AbstractTestTools.createTempFile("libOfLibOut", toolchain.getLibraryExtension());
     File sourceDir = AbstractTestTools.getTestRootDir("com.android.jack.liboflib.lib2");
     toolchain.srcToLib(defaultClasspath, libOfLibOut, /* zipFiles = */ true, sourceDir);
 
     toolchain = AbstractTestTools.getCandidateToolchain();
-    File libOut = AbstractTestTools.createTempFile("libOut", ".zip");
+    File libOut = AbstractTestTools.createTempFile("libOut", toolchain.getLibraryExtension());
     sourceDir = AbstractTestTools.getTestRootDir("com.android.jack.liboflib.lib");
     toolchain.srcToLib(defaultClasspath + File.pathSeparatorChar + libOfLibOut.getAbsolutePath(),
         libOut, /* zipFiles = */ true, sourceDir);
 
     toolchain = AbstractTestTools.getCandidateToolchain();
-    File mainOut = AbstractTestTools.createTempFile("mainOut", ".zip");
+    File mainOut = AbstractTestTools.createTempFile("mainOut", toolchain.getLibraryExtension());
     sourceDir = AbstractTestTools.getTestRootDir("com.android.jack.liboflib.main");
     toolchain.srcToLib(defaultClasspath + File.pathSeparatorChar + libOut.getAbsolutePath(),
         mainOut, /* zipFiles = */ true, sourceDir);
diff --git a/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java b/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java
index 7d7c5335..98712518 100644
--- a/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java
+++ b/jack-tests/tests/com/android/jack/fileconflict/FileConflictTests.java
@@ -166,9 +166,9 @@ public class FileConflictTests {
    */
   @Test
   public void test002a() throws Exception {
-    File jackOutput = AbstractTestTools.createTempDir();
+    File jackOutput;
     try {
-      runTest002(jackOutput, false /* non-zipped */, null);
+      jackOutput = runTest002(false /* non-zipped */, null);
       Assert.fail();
     } catch (ResourceImportConflictException e) {
     }
@@ -181,9 +181,9 @@ public class FileConflictTests {
    */
   @Test
   public void test002b() throws Exception {
-    File jackOutput = AbstractTestTools.createTempDir();
+    File jackOutput;
     try {
-      runTest002(jackOutput, false /* non-zipped */, "fail");
+      jackOutput = runTest002(false /* non-zipped */, "fail");
       Assert.fail();
     } catch (ResourceImportConflictException e) {
     }
@@ -196,8 +196,8 @@ public class FileConflictTests {
    */
   @Test
   public void test002c() throws Exception {
-    File jackOutput = AbstractTestTools.createTempDir();
-    runTest002(jackOutput, false /* non-zipped */, "keep-first");
+    File jackOutput;
+    jackOutput = runTest002(false /* non-zipped */, "keep-first");
     checkResourceContent(jackOutput, RESOURCE1_LONGPATH, "Res1");
     checkResourceContent(jackOutput, RESOURCE2_LONGPATH, "Res2");
     checkResourceContent(jackOutput, RESOURCE3_LONGPATH, "Res3");
@@ -210,9 +210,9 @@ public class FileConflictTests {
    */
   @Test
   public void test002d() throws Exception {
-    File jackOutput = AbstractTestTools.createTempFile("jackoutput", ".zip");
+    File jackOutput;
     try {
-      runTest002(jackOutput, true /* zipped */, null);
+      jackOutput = runTest002(true /* zipped */, null);
       Assert.fail();
     } catch (ResourceImportConflictException e) {
     }
@@ -225,9 +225,9 @@ public class FileConflictTests {
    */
   @Test
   public void test002e() throws Exception {
-    File jackOutput = AbstractTestTools.createTempFile("jackoutput", ".zip");
+    File jackOutput;
     try {
-      runTest002(jackOutput, true /* zipped */, "fail");
+      jackOutput = runTest002(true /* zipped */, "fail");
       Assert.fail();
     } catch (ResourceImportConflictException e) {
     }
@@ -240,8 +240,8 @@ public class FileConflictTests {
    */
   @Test
   public void test002f() throws Exception {
-    File jackOutput = AbstractTestTools.createTempFile("jackoutput", ".zip");
-    runTest002(jackOutput, true /* zipped */, "keep-first");
+    File jackOutput;
+    jackOutput = runTest002(true /* zipped */, "keep-first");
     ZipFile zipFile = new ZipFile(jackOutput);
     checkResourceContent(zipFile, RESOURCE1_LONGPATH, "Res1");
     checkResourceContent(zipFile, RESOURCE2_LONGPATH, "Res2");
@@ -443,8 +443,8 @@ public class FileConflictTests {
     toolchain.libToLib(new File [] {jackImport1, jackImport2}, jackOutput, /* zipFiles = */ false);
   }
 
-  private void runTest002(@Nonnull File jackOutput, boolean zip,
-      @CheckForNull String collisionPolicy) throws Exception {
+  @Nonnull
+  private File runTest002(boolean zip, @CheckForNull String collisionPolicy) throws Exception {
     // compile source files to a Jack dir
     File jackImport1 = AbstractTestTools.createTempDir();
     File lib1 = new File(TEST002_DIR, "lib1");
@@ -472,7 +472,15 @@ public class FileConflictTests {
     if (collisionPolicy != null) {
       toolchain.addProperty(ResourceImporter.RESOURCE_COLLISION_POLICY.getName(), collisionPolicy);
     }
+    File jackOutput;
+    if (zip) {
+      jackOutput = AbstractTestTools.createTempFile("jackOutput", toolchain.getLibraryExtension());
+    } else {
+      jackOutput = AbstractTestTools.createTempDir();
+    }
     toolchain.libToLib(new File[] {jackImport1,jackImport2}, jackOutput, /* zipFiles = */ zip);
+
+    return jackOutput;
   }
 
   private void copyFileToDir(@Nonnull File fileToCopy, @Nonnull String relativePath,
diff --git a/jack-tests/tests/com/android/jack/jarjar/JarjarTests.java b/jack-tests/tests/com/android/jack/jarjar/JarjarTests.java
index 4d268a1d..bb2f14c4 100644
--- a/jack-tests/tests/com/android/jack/jarjar/JarjarTests.java
+++ b/jack-tests/tests/com/android/jack/jarjar/JarjarTests.java
@@ -68,7 +68,7 @@ public class JarjarTests {
   public void jarjar003_1() throws Exception {
     IToolchain toolchain = AbstractTestTools.getCandidateToolchain();
     toolchain.setJarjarRules(new File(JARJAR003.directory, "jarjar-rules.txt"));
-    File lib = AbstractTestTools.createTempFile("jarjarTest003Jack", ".zip");
+    File lib = AbstractTestTools.createTempFile("jarjarTest003Jack", toolchain.getLibraryExtension());
     toolchain.srcToLib(
         AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()),
         lib,
@@ -79,7 +79,7 @@ public class JarjarTests {
     toolchain.srcToLib(
         AbstractTestTools.getClasspathsAsString(toolchain.getDefaultBootClasspath(),
             new File [] {lib}),
-        AbstractTestTools.createTempFile("jarjarTest003dx", ".zip"),
+        AbstractTestTools.createTempFile("jarjarTest003dx", toolchain.getLibraryExtension()),
         /* zipFiles = */ true,
         new File(JARJAR003.directory, "dontcompile/TestWithRelocatedReference.java"));
   }
diff --git a/jack-tests/tests/com/android/jack/java7/SwitchesTest.java b/jack-tests/tests/com/android/jack/java7/SwitchesTest.java
index 3fb13d3e..021652f7 100644
--- a/jack-tests/tests/com/android/jack/java7/SwitchesTest.java
+++ b/jack-tests/tests/com/android/jack/java7/SwitchesTest.java
@@ -56,10 +56,11 @@ public class SwitchesTest {
   @Test
   public void java7Switches004() throws Exception {
 
-    File jackZipFile = AbstractTestTools.createTempFile("tmp", ".zip");
-
     IToolchain toolchain =
         AbstractTestTools.getCandidateToolchain();
+
+    File jackZipFile = AbstractTestTools.createTempFile("tmp", toolchain.getLibraryExtension());
+
     toolchain.setSourceLevel(SourceLevel.JAVA_7).srcToLib(
         AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()),
         jackZipFile,
diff --git a/jack-tests/tests/com/android/jack/lookup/LookupTests.java b/jack-tests/tests/com/android/jack/lookup/LookupTests.java
index a51615e9..65c15e02 100644
--- a/jack-tests/tests/com/android/jack/lookup/LookupTests.java
+++ b/jack-tests/tests/com/android/jack/lookup/LookupTests.java
@@ -55,7 +55,7 @@ public class LookupTests {
     toolchain = AbstractTestTools.getCandidateToolchain();
     toolchain.libToLib(
         new File [] {jacks, libOverride},
-        AbstractTestTools.createTempFile("Lookup001", ".zip"),
+        AbstractTestTools.createTempFile("Lookup001", toolchain.getLibraryExtension()),
         /* zipFiles = */ true);
   }
 
diff --git a/jack-tests/tests/com/android/jack/resource/ResourceTests.java b/jack-tests/tests/com/android/jack/resource/ResourceTests.java
index f7bcf913..fa31289c 100644
--- a/jack-tests/tests/com/android/jack/resource/ResourceTests.java
+++ b/jack-tests/tests/com/android/jack/resource/ResourceTests.java
@@ -139,8 +139,9 @@ public class ResourceTests {
     File jackAr = createJackArchiveWithResources();
 
     // run shrobbing from Jack archive to Jack archive
-    File shrobbedJackAr = AbstractTestTools.createTempFile("shrobbedJackAr", ".zip");
     JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class);
+    File shrobbedJackAr =
+        AbstractTestTools.createTempFile("shrobbedJackAr", toolchain.getLibraryExtension());
     toolchain.addProguardFlags(new File(FILE, "proguard.flags"));
     toolchain.libToLib(jackAr, shrobbedJackAr, /* zipFiles = */ true);
 
@@ -165,8 +166,9 @@ public class ResourceTests {
         FILE);
 
     // run shrobbing from Jack dir to Jack archive
-    File shrobbedJackAr = AbstractTestTools.createTempFile("shrobbedJackAr", ".zip");
     toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class);
+    File shrobbedJackAr =
+        AbstractTestTools.createTempFile("shrobbedJackAr", toolchain.getLibraryExtension());
     toolchain.addProguardFlags(new File(FILE, "proguard.flags"));
     toolchain.libToLib(jackFolder, shrobbedJackAr, /* zipFiles = */ true);
 
@@ -309,8 +311,8 @@ public class ResourceTests {
   @Nonnull
   private File createJackArchiveWithResources() throws Exception {
     // compile source file to a Jack file
-    File jackAr = AbstractTestTools.createTempFile("resourcetestjack", ".zip");
     JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class);
+    File jackAr = AbstractTestTools.createTempFile("resourcetestjack", toolchain.getLibraryExtension());
     toolchain.addResource(new File(FILE, "rsc"));
     toolchain.srcToLib(
         AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath()),
diff --git a/jack-tests/tests/com/android/jack/shrob/ShrinkMultiDexTests.java b/jack-tests/tests/com/android/jack/shrob/ShrinkMultiDexTests.java
index 7e98f397..901e444f 100644
--- a/jack-tests/tests/com/android/jack/shrob/ShrinkMultiDexTests.java
+++ b/jack-tests/tests/com/android/jack/shrob/ShrinkMultiDexTests.java
@@ -75,8 +75,6 @@ public class ShrinkMultiDexTests extends AbstractTest {
     toolchain.addProperty(Options.METHOD_FILTER.getName(), "supported-methods");
     toolchain.disableDxOptimizations();
 
-    File out = AbstractTestTools.createTempFile("checklisting", ".zip");
-
     SourceToDexComparisonTestHelper env =
         new SourceToDexComparisonTestHelper(new File(testFolder, "jack"));
     env.setCandidateTestTools(toolchain);
diff --git a/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java b/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java
index 175427c7..acde55f8 100644
--- a/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java
+++ b/jack-tests/tests/com/android/jack/shrob/ShrinkTests.java
@@ -185,11 +185,13 @@ public class ShrinkTests extends AbstractTest {
     File testFolder = new File(shrobTestsDir, "test028");
     File jackar = null;
     File shrinkedjackar = null;
-    jackar = AbstractTestTools.createTempFile("jackar", ".zip");
-    shrinkedjackar = AbstractTestTools.createTempFile("shrinkedjackar", ".zip");
-    ProguardFlags flags = new ProguardFlags(testFolder, "proguard.flags001");
 
     JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackBasedToolchain.class);
+
+    jackar = AbstractTestTools.createTempFile("jackar", toolchain.getLibraryExtension());
+    shrinkedjackar = AbstractTestTools.createTempFile("shrinkedjackar", toolchain.getLibraryExtension());
+    ProguardFlags flags = new ProguardFlags(testFolder, "proguard.flags001");
+
     String classpath = AbstractTestTools.getClasspathAsString(toolchain.getDefaultBootClasspath());
     toolchain.srcToLib(
         classpath,