commit 3802cfa5b4875926727e7d57af69dc08e3b28805
author Ashish Kumar <akgaurav@google.com> Fri Mar 24 10:09:49 2023 +0000
committer Ashish Kumar Gaurav <akgaurav@google.com> Fri Mar 24 15:25:26 2023 +0000
tree 1426d7697f8c51913dca92606d4e3f3da68682fa
parent 6782f04b2e703cfa1f5294e8e52519f686f7cf00

Fixed ContentProviderClient Tests

 - AttributionSource is now passed in IContentProvider#getStreamType and getType
 - Reference Change: I31d6c7e9786ad187a92a02e707180410a3c875d6

Test: ContentProviderClientTest

Bug: b/274845370
Change-Id: I646b74bdb6f4ad145ce5c38baaefa6c9b197b1a2

tests/tests/content/src/android/content/cts/ContentProviderClientTest.java

diff --git a/tests/tests/content/src/android/content/cts/ContentProviderClientTest.java b/tests/tests/content/src/android/content/cts/ContentProviderClientTest.java
index c2d4ae5..a6218b1 100644
--- a/tests/tests/content/src/android/content/cts/ContentProviderClientTest.java
+++ b/tests/tests/content/src/android/content/cts/ContentProviderClientTest.java
@@ -16,13 +16,13 @@
 
 package android.content.cts;
 
+import static org.mockito.Mockito.RETURNS_DEFAULTS;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.RETURNS_DEFAULTS;
 
 import android.content.AttributionSource;
 import android.content.ContentProvider;
@@ -39,7 +39,6 @@
 import android.os.CancellationSignal;
 import android.os.ICancellationSignal;
 import android.os.OperationCanceledException;
-import android.os.Process;
 import android.os.RemoteException;
 import android.test.AndroidTestCase;
 import android.test.mock.MockContentResolver;
@@ -142,28 +141,29 @@
 
     public void testGetType() throws RemoteException {
         mContentProviderClient.getType(URI);
-        verify(mIContentProvider).getType(URI);
+        verify(mIContentProvider).getType(mAttributionSource, URI);
     }
 
     public void testGetTypeTimeout() throws RemoteException, InterruptedException {
-        doAnswer(ANSWER_SLEEP).when(mIContentProvider).getType(URI);
+        doAnswer(ANSWER_SLEEP).when(mIContentProvider).getType(mAttributionSource, URI);
 
         testTimeout(() -> mContentProviderClient.getType(URI));
 
-        verify(mIContentProvider).getType(URI);
+        verify(mIContentProvider).getType(mAttributionSource, URI);
     }
 
     public void testGetStreamTypes() throws RemoteException {
         mContentProviderClient.getStreamTypes(URI, "");
-        verify(mIContentProvider).getStreamTypes(URI, "");
+        verify(mIContentProvider).getStreamTypes(mAttributionSource, URI, "");
     }
 
     public void testGetStreamTypesTimeout() throws RemoteException, InterruptedException {
-        doAnswer(ANSWER_SLEEP).when(mIContentProvider).getStreamTypes(URI, "");
+        doAnswer(ANSWER_SLEEP).when(mIContentProvider).getStreamTypes(mAttributionSource,
+                URI, "");
 
         testTimeout(() -> mContentProviderClient.getStreamTypes(URI, ""));
 
-        verify(mIContentProvider).getStreamTypes(URI, "");
+        verify(mIContentProvider).getStreamTypes(mAttributionSource, URI, "");
     }
 
     public void testCanonicalize() throws RemoteException {