diff --git a/tests/net/Android.bp b/tests/net/Android.bp index 2539c0f66c..c62d85e418 100644 --- a/tests/net/Android.bp +++ b/tests/net/Android.bp @@ -13,7 +13,6 @@ android_test { "mockito-target-minus-junit4", "platform-test-annotations", "services.core", - "services.ipmemorystore", "services.net", ], libs: [ diff --git a/tests/net/java/android/net/IpMemoryStoreTest.java b/tests/net/java/android/net/IpMemoryStoreTest.java index 57ecc8f38c..18c6768894 100644 --- a/tests/net/java/android/net/IpMemoryStoreTest.java +++ b/tests/net/java/android/net/IpMemoryStoreTest.java @@ -16,6 +16,9 @@ package android.net; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doAnswer; + import android.content.Context; import androidx.test.filters.SmallTest; @@ -33,13 +36,25 @@ public class IpMemoryStoreTest { @Mock Context mMockContext; @Mock + NetworkStackClient mNetworkStackClient; + @Mock IIpMemoryStore mMockService; IpMemoryStore mStore; @Before public void setUp() { MockitoAnnotations.initMocks(this); - mStore = new IpMemoryStore(mMockContext, mMockService); + doAnswer(invocation -> { + ((IIpMemoryStoreCallbacks) invocation.getArgument(0)) + .onIpMemoryStoreFetched(mMockService); + return null; + }).when(mNetworkStackClient).fetchIpMemoryStore(any()); + mStore = new IpMemoryStore(mMockContext) { + @Override + protected NetworkStackClient getNetworkStackClient() { + return mNetworkStackClient; + } + }; } @Test