commit 06ceead1042c88dc9ca72e119ca4d0b3363d78f0
author Neil Fuller <nfuller@google.com> Tue Oct 02 17:29:09 2018 +0100
committer Neil Fuller <nfuller@google.com> Wed Oct 03 15:18:02 2018 +0100
tree 14e391b5e38ec1941dc170e5e5caf424091c8436
parent 2812393bb5fa48f34764939bcda4756dc4731b7e

Switch test code away from libcore internals

The test code here was using libcore platform internals which
can be replaced by test support code instead.

Bug: 113148576
Test: Run CTS
Change-Id: I51041f400e93bfe0dda0cd822915f1d29e8248c7

distro/core/Android.bp

diff --git a/distro/core/Android.bp b/distro/core/Android.bp
index 2adff01..96cdc42 100644
--- a/distro/core/Android.bp
+++ b/distro/core/Android.bp
@@ -42,6 +42,7 @@
     srcs: ["src/test/**/*.java"],
     static_libs: [
         "time_zone_distro",
+        "core-tests-support",
         "junit",
     ],
 }

distro/core/src/test/com/android/timezone/distro/FileUtilsTest.java

diff --git a/distro/core/src/test/com/android/timezone/distro/FileUtilsTest.java b/distro/core/src/test/com/android/timezone/distro/FileUtilsTest.java
index 8606009..6b51a4d 100644
--- a/distro/core/src/test/com/android/timezone/distro/FileUtilsTest.java
+++ b/distro/core/src/test/com/android/timezone/distro/FileUtilsTest.java
@@ -21,6 +21,8 @@
 import android.system.OsConstants;
 import android.system.StructStat;
 
+import libcore.testing.io.TestIoUtils;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -30,7 +32,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import libcore.io.IoUtils;
 
 /**
  * Tests for {@link FileUtils}.
@@ -344,7 +345,7 @@
 
     private File createTempDir() {
         final String tempPrefix = getClass().getSimpleName();
-        File tempDir = IoUtils.createTemporaryDirectory(tempPrefix);
+        File tempDir = TestIoUtils.createTemporaryDirectory(tempPrefix);
         testFiles.add(tempDir);
         return tempDir;
     }

distro/core/src/test/com/android/timezone/distro/TimeZoneDistroTest.java

diff --git a/distro/core/src/test/com/android/timezone/distro/TimeZoneDistroTest.java b/distro/core/src/test/com/android/timezone/distro/TimeZoneDistroTest.java
index ce3669e..0d5b474 100644
--- a/distro/core/src/test/com/android/timezone/distro/TimeZoneDistroTest.java
+++ b/distro/core/src/test/com/android/timezone/distro/TimeZoneDistroTest.java
@@ -17,6 +17,8 @@
 
 import junit.framework.TestCase;
 
+import libcore.testing.io.TestIoUtils;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -27,10 +29,8 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.function.Supplier;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-import libcore.io.IoUtils;
 
 /**
  * Tests for {@link TimeZoneDistro}.
@@ -166,7 +166,7 @@
 
     private File createTempDir() {
         final String tempPrefix = getClass().getSimpleName();
-        File tempDir = IoUtils.createTemporaryDirectory(tempPrefix);
+        File tempDir = TestIoUtils.createTemporaryDirectory(tempPrefix);
         testFiles.add(tempDir);
         return tempDir;
     }