From f80c8e536ceedb9181b825ca312313b6b66b41c7 Mon Sep 17 00:00:00 2001 From: Sudheer Shanka Date: Wed, 22 Apr 2020 03:36:18 -0700 Subject: [PATCH] Verify that blobstore quota limits are enforced. Bug: 153488316 Bug: 150619869 Test: atest --test-mapping apex/blobstore Change-Id: I6b6cc1f57aaca96ee1d1a3d1d819cff5594e428d --- .../src/com/android/utils/blob/DummyBlobData.java | 2 +- tests/BlobStoreTestUtils/src/com/android/utils/blob/Utils.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/BlobStoreTestUtils/src/com/android/utils/blob/DummyBlobData.java b/tests/BlobStoreTestUtils/src/com/android/utils/blob/DummyBlobData.java index 35a6c26ec73fc..371375c0d9324 100644 --- a/tests/BlobStoreTestUtils/src/com/android/utils/blob/DummyBlobData.java +++ b/tests/BlobStoreTestUtils/src/com/android/utils/blob/DummyBlobData.java @@ -77,7 +77,7 @@ public class DummyBlobData { return mRandomSeed; } - public Builder setFileSize(int fileSize) { + public Builder setFileSize(long fileSize) { mFileSize = fileSize; return this; } diff --git a/tests/BlobStoreTestUtils/src/com/android/utils/blob/Utils.java b/tests/BlobStoreTestUtils/src/com/android/utils/blob/Utils.java index 482b23f129fdb..6927e86213d82 100644 --- a/tests/BlobStoreTestUtils/src/com/android/utils/blob/Utils.java +++ b/tests/BlobStoreTestUtils/src/com/android/utils/blob/Utils.java @@ -34,6 +34,9 @@ import java.io.OutputStream; public class Utils { public static final int BUFFER_SIZE_BYTES = 16 * 1024; + public static final long KB_IN_BYTES = 1000; + public static final long MB_IN_BYTES = KB_IN_BYTES * 1000; + public static void copy(InputStream in, OutputStream out, long lengthBytes) throws IOException { final byte[] buffer = new byte[BUFFER_SIZE_BYTES];