commit e09561d8223ce8c6f19a10b352a3bdf19c733e85
author Nicolas Geoffray <ngeoffray@google.com> Wed Jul 12 08:06:48 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 12 08:06:48 2017 +0000
tree e2df44bc5aa8f68a3e8a307b2444eaf84771c774
parent d8b60a000a47306e72af127ed728ec92a845dee5
parent feda69d88f642d9580050fc6d54d8e23aecf2279

Merge "Revert "Remove File.deleteOnExit in ZipEntryTest""

luni/src/test/java/libcore/java/util/zip/ZipEntryTest.java

diff --git a/luni/src/test/java/libcore/java/util/zip/ZipEntryTest.java b/luni/src/test/java/libcore/java/util/zip/ZipEntryTest.java
index 4e2df69..f58c8aa 100644
--- a/luni/src/test/java/libcore/java/util/zip/ZipEntryTest.java
+++ b/luni/src/test/java/libcore/java/util/zip/ZipEntryTest.java
@@ -24,7 +24,6 @@
 import java.time.LocalDate;
 import java.time.ZoneId;
 import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.jar.JarEntry;
@@ -40,6 +39,12 @@
   // tests is independent of the system clock.
   private static final long ENTRY_TIME = 1262304000000L; //  January 1, 2010 12:00:00 AM GMT
 
+  private static File createTemporaryZipFile() throws IOException {
+    File result = File.createTempFile("ZipFileTest", "zip");
+    result.deleteOnExit();
+    return result;
+  }
+
   private static ZipOutputStream createZipOutputStream(File f) throws IOException {
     return new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(f)));
   }
@@ -52,23 +57,6 @@
     return sb.toString();
   }
 
-  private List<File> temporaryFiles = new ArrayList<>();
-
-  private File createTemporaryZipFile() throws IOException {
-    File result = File.createTempFile("ZipFileTest", "zip");
-    temporaryFiles.add(result);
-    return result;
-  }
-
-  @Override
-  public void tearDown() throws Exception {
-    for (File file : temporaryFiles) {
-      file.delete();
-    }
-    temporaryFiles.clear();
-    super.tearDown();
-  }
-
   // http://code.google.com/p/android/issues/detail?id=4690
   public void test_utf8FileNames() throws Exception {
     // Create a zip file containing non-ASCII filenames.
@@ -186,7 +174,7 @@
     checkSetTime(4134153600000L); // January 3, 2101 12:00:00 AM GMT
   }
 
-  private void checkSetTime(long time) throws IOException {
+  private static void checkSetTime(long time) throws IOException {
     File f = createTemporaryZipFile();
     ZipOutputStream out = createZipOutputStream(f);
     ZipEntry ze = new ZipEntry("x");