commit 97109fe51135d351b255d6a1536b1486d8b04da6
author Sudheer Shanka <sudheersai@google.com> Wed Apr 22 18:39:14 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 22 18:39:14 2020 +0000
tree e4c8e3cfc5da1be9db6dd9d53f5234a99e65e3d6
parent 87ce901869c04a6192ceb20546b6162dd967a1f6
parent f80c8e536ceedb9181b825ca312313b6b66b41c7

Merge "Verify that blobstore quota limits are enforced." into rvc-dev

tests/BlobStoreTestUtils/src/com/android/utils/blob/DummyBlobData.java

diff --git a/tests/BlobStoreTestUtils/src/com/android/utils/blob/DummyBlobData.java b/tests/BlobStoreTestUtils/src/com/android/utils/blob/DummyBlobData.java
index 35a6c26..371375c 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 @@
             return mRandomSeed;
         }
 
-        public Builder setFileSize(int fileSize) {
+        public Builder setFileSize(long fileSize) {
             mFileSize = fileSize;
             return this;
         }

tests/BlobStoreTestUtils/src/com/android/utils/blob/Utils.java

diff --git a/tests/BlobStoreTestUtils/src/com/android/utils/blob/Utils.java b/tests/BlobStoreTestUtils/src/com/android/utils/blob/Utils.java
index 482b23f..6927e86 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 @@
 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];