summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-04-28 16:49:06 -0700
committerElliott Hughes <enh@google.com>2014-04-28 16:50:00 -0700
commit5dcbf701c9077e62ca8c1ee0079b4cbffaf57d14 (patch)
treeeda9df38ef0d49939587b02236b35b9650ac5acc /tests
parent3a203e4a58bf5ee03c3303df6a04e43a4eefb1eb (diff)
downloadandroid_packages_providers_DownloadProvider-5dcbf701c9077e62ca8c1ee0079b4cbffaf57d14.tar.gz
android_packages_providers_DownloadProvider-5dcbf701c9077e62ca8c1ee0079b4cbffaf57d14.tar.bz2
android_packages_providers_DownloadProvider-5dcbf701c9077e62ca8c1ee0079b4cbffaf57d14.zip
Move internal DownloadProvider code off libcore.os.
(As much as possible. There are no plans to make the mocking API public.) Change-Id: I348877b850d6d34572d5a19e67952254bc4f12ef
Diffstat (limited to 'tests')
-rw-r--r--tests/src/com/android/providers/downloads/StorageTest.java13
1 files changed, 6 insertions, 7 deletions
diff --git a/tests/src/com/android/providers/downloads/StorageTest.java b/tests/src/com/android/providers/downloads/StorageTest.java
index 6a65beb3..8ba3cbce 100644
--- a/tests/src/com/android/providers/downloads/StorageTest.java
+++ b/tests/src/com/android/providers/downloads/StorageTest.java
@@ -29,6 +29,7 @@ import android.os.Environment;
import android.os.StatFs;
import android.provider.Downloads.Impl;
import android.system.ErrnoException;
+import android.system.Os;
import android.system.StructStatVfs;
import android.test.MoreAsserts;
import android.util.Log;
@@ -39,8 +40,6 @@ import com.google.mockwebserver.SocketPolicy;
import libcore.io.ForwardingOs;
import libcore.io.IoUtils;
-import libcore.io.Libcore;
-import libcore.io.Os;
import java.io.File;
import java.io.FileDescriptor;
@@ -61,7 +60,7 @@ public class StorageTest extends AbstractPublicApiTest {
}
}
- private Os mOriginal;
+ private libcore.io.Os mOriginal;
private long mStealBytes;
public StorageTest() {
@@ -75,8 +74,8 @@ public class StorageTest extends AbstractPublicApiTest {
StorageUtils.sForceFullEviction = true;
mStealBytes = 0;
- mOriginal = Libcore.os;
- Libcore.os = new ForwardingOs(mOriginal) {
+ mOriginal = libcore.io.Libcore.os;
+ libcore.io.Libcore.os = new ForwardingOs(mOriginal) {
@Override
public StructStatVfs statvfs(String path) throws ErrnoException {
return stealBytes(os.statvfs(path));
@@ -104,7 +103,7 @@ public class StorageTest extends AbstractPublicApiTest {
mStealBytes = 0;
if (mOriginal != null) {
- Libcore.os = mOriginal;
+ libcore.io.Libcore.os = mOriginal;
}
}
@@ -196,7 +195,7 @@ public class StorageTest extends AbstractPublicApiTest {
assertTrue(dirtyFile.createNewFile());
final FileOutputStream os = new FileOutputStream(dirtyFile);
final int dirtySize = (DOWNLOAD_SIZE * 3) / 2;
- Libcore.os.posix_fallocate(os.getFD(), 0, dirtySize);
+ Os.posix_fallocate(os.getFD(), 0, dirtySize);
IoUtils.closeQuietly(os);
dirtyFile.setLastModified(