Add testing support code: TestIoUtils

Add testing support code that CTS can use instead of
private platform APIs.

Bug: 117535564
Bug: 113148576
Test: Run cts
Change-Id: I63ad197744075c14886a639bfba83392ac39854f

3 files changed, 9 insertions, 8 deletions

diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/prefs/AbstractPreferencesTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/prefs/AbstractPreferencesTest.java
index 49510e39f1..c107023895 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/prefs/AbstractPreferencesTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/prefs/AbstractPreferencesTest.java
@@ -38,7 +38,7 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import junit.framework.TestCase;
-import libcore.io.IoUtils;
+import libcore.testing.io.TestIoUtils;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
@@ -88,7 +88,7 @@ public class AbstractPreferencesTest extends TestCase {
 
     @Override
     protected void setUp() throws Exception {
-        File tmpDir = IoUtils.createTemporaryDirectory("OldAbstractPreferencesTest");
+        File tmpDir = TestIoUtils.createTemporaryDirectory("OldAbstractPreferencesTest");
         defaultFactory = Preferences.setPreferencesFactory(
                 new TestPreferencesFactory(tmpDir.getAbsolutePath()));
         root = (AbstractPreferences) Preferences.userRoot();
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/prefs/FilePreferencesImplTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/prefs/FilePreferencesImplTest.java
index 352603cf44..abcf9c9365 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/prefs/FilePreferencesImplTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/prefs/FilePreferencesImplTest.java
@@ -20,9 +20,10 @@ import java.io.File;
 import java.io.IOException;
 import java.util.prefs.BackingStoreException;
 import java.util.prefs.Preferences;
-import java.util.prefs.PreferencesFactory;
+
 import junit.framework.TestCase;
-import libcore.io.IoUtils;
+
+import libcore.testing.io.TestIoUtils;
 
 public class FilePreferencesImplTest extends TestCase {
 
@@ -31,7 +32,7 @@ public class FilePreferencesImplTest extends TestCase {
 
     @Override
     protected void setUp() throws Exception {
-        File tmpDir = IoUtils.createTemporaryDirectory("FilePreferencesImplTest");
+        File tmpDir = TestIoUtils.createTemporaryDirectory("FilePreferencesImplTest");
         AbstractPreferencesTest.TestPreferencesFactory factory
                 = new AbstractPreferencesTest.TestPreferencesFactory(tmpDir.getAbsolutePath());
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/prefs/PreferencesTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/prefs/PreferencesTest.java
index 69392486db..16bf3ead75 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/prefs/PreferencesTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/prefs/PreferencesTest.java
@@ -22,7 +22,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.FileOutputStream;
-import java.net.MalformedURLException;
 import java.nio.charset.StandardCharsets;
 import java.util.prefs.AbstractPreferences;
 import java.util.prefs.BackingStoreException;
@@ -32,7 +31,8 @@ import java.util.prefs.PreferenceChangeListener;
 import java.util.prefs.Preferences;
 import java.util.prefs.PreferencesFactory;
 import junit.framework.TestCase;
-import libcore.io.IoUtils;
+
+import libcore.testing.io.TestIoUtils;
 
 /**
  *
@@ -55,7 +55,7 @@ public class PreferencesTest extends TestCase {
 
     @Override
     protected void setUp() throws Exception {
-        backendDir = IoUtils.createTemporaryDirectory("OldAbstractPreferencesTest");
+        backendDir = TestIoUtils.createTemporaryDirectory("OldAbstractPreferencesTest");
         defaultFactory = Preferences.setPreferencesFactory(
                 new AbstractPreferencesTest.TestPreferencesFactory(backendDir.getAbsolutePath()));