LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Clean up the arguments annotation and verify items on IpMemoryStoreTest."

Browse Source 
am: 3bee1cdc4e

Change-Id: Ifbd359f9fec530076f3216c171120436ed4221a6
This commit is contained in:
Xiao Ma
2019-05-10 08:33:48 -07:00
committed by android-build-merger
parent c72bc8eea1 3bee1cdc4e
commit 82a7e510a5
1 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
tests/net/java/android/net/IpMemoryStoreTest.java
View File

@@ -111,13 +111,12 @@ public class IpMemoryStoreTest {
@Test @Test
public void testNetworkAttributes() throws Exception { public void testNetworkAttributes() throws Exception {
startIpMemoryStore(true); startIpMemoryStore(true /* supplyService */);
final String l2Key = "fakeKey"; final String l2Key = "fakeKey";
mStore.storeNetworkAttributes(l2Key, TEST_NETWORK_ATTRIBUTES, mStore.storeNetworkAttributes(l2Key, TEST_NETWORK_ATTRIBUTES,
status -> { status -> assertTrue("Store not successful : " + status.resultCode,
assertTrue("Store not successful : " + status.resultCode, status.isSuccess()); status.isSuccess()));
});
verify(mMockService, times(1)).storeNetworkAttributes(eq(l2Key), verify(mMockService, times(1)).storeNetworkAttributes(eq(l2Key),
mNapCaptor.capture(), any()); mNapCaptor.capture(), any());
assertEquals(TEST_NETWORK_ATTRIBUTES, new NetworkAttributes(mNapCaptor.getValue())); assertEquals(TEST_NETWORK_ATTRIBUTES, new NetworkAttributes(mNapCaptor.getValue()));
@@ -135,7 +134,7 @@ public class IpMemoryStoreTest {
@Test @Test
public void testPrivateData() throws RemoteException { public void testPrivateData() throws RemoteException {
startIpMemoryStore(true); startIpMemoryStore(true /* supplyService */);
final Blob b = new Blob(); final Blob b = new Blob();
b.data = TEST_BLOB_DATA; b.data = TEST_BLOB_DATA;
final String l2Key = "fakeKey"; final String l2Key = "fakeKey";
@@ -162,7 +161,7 @@ public class IpMemoryStoreTest {
@Test @Test
public void testFindL2Key() public void testFindL2Key()
throws UnknownHostException, RemoteException, Exception { throws UnknownHostException, RemoteException, Exception {
startIpMemoryStore(true); startIpMemoryStore(true /* supplyService */);
final String l2Key = "fakeKey"; final String l2Key = "fakeKey";
mStore.findL2Key(TEST_NETWORK_ATTRIBUTES, mStore.findL2Key(TEST_NETWORK_ATTRIBUTES,
@@ -177,7 +176,7 @@ public class IpMemoryStoreTest {
@Test @Test
public void testIsSameNetwork() throws UnknownHostException, RemoteException { public void testIsSameNetwork() throws UnknownHostException, RemoteException {
startIpMemoryStore(true); startIpMemoryStore(true /* supplyService */);
final String l2Key1 = "fakeKey1"; final String l2Key1 = "fakeKey1";
final String l2Key2 = "fakeKey2"; final String l2Key2 = "fakeKey2";
@@ -193,7 +192,7 @@ public class IpMemoryStoreTest {
@Test @Test
public void testEnqueuedIpMsRequests() throws Exception { public void testEnqueuedIpMsRequests() throws Exception {
startIpMemoryStore(false); startIpMemoryStore(false /* supplyService */);
final Blob b = new Blob(); final Blob b = new Blob();
b.data = TEST_BLOB_DATA; b.data = TEST_BLOB_DATA;
@@ -201,9 +200,8 @@ public class IpMemoryStoreTest {
// enqueue multiple ipms requests // enqueue multiple ipms requests
mStore.storeNetworkAttributes(l2Key, TEST_NETWORK_ATTRIBUTES, mStore.storeNetworkAttributes(l2Key, TEST_NETWORK_ATTRIBUTES,
status -> { status -> assertTrue("Store not successful : " + status.resultCode,
assertTrue("Store not successful : " + status.resultCode, status.isSuccess()); status.isSuccess()));
});
mStore.retrieveNetworkAttributes(l2Key, mStore.retrieveNetworkAttributes(l2Key,
(status, key, attr) -> { (status, key, attr) -> {
assertTrue("Retrieve network attributes not successful : " assertTrue("Retrieve network attributes not successful : "
@@ -212,9 +210,8 @@ public class IpMemoryStoreTest {
assertEquals(TEST_NETWORK_ATTRIBUTES, attr); assertEquals(TEST_NETWORK_ATTRIBUTES, attr);
}); });
mStore.storeBlob(l2Key, TEST_CLIENT_ID, TEST_DATA_NAME, b, mStore.storeBlob(l2Key, TEST_CLIENT_ID, TEST_DATA_NAME, b,
status -> { status -> assertTrue("Store not successful : " + status.resultCode,
assertTrue("Store not successful : " + status.resultCode, status.isSuccess()); status.isSuccess()));
});
mStore.retrieveBlob(l2Key, TEST_CLIENT_ID, TEST_OTHER_DATA_NAME, mStore.retrieveBlob(l2Key, TEST_CLIENT_ID, TEST_OTHER_DATA_NAME,
(status, key, name, data) -> { (status, key, name, data) -> {
assertTrue("Retrieve blob status not successful : " + status.resultCode, assertTrue("Retrieve blob status not successful : " + status.resultCode,
@@ -240,7 +237,7 @@ public class IpMemoryStoreTest {
@Test @Test
public void testEnqueuedIpMsRequestsWithException() throws Exception { public void testEnqueuedIpMsRequestsWithException() throws Exception {
startIpMemoryStore(true); startIpMemoryStore(true /* supplyService */);
doThrow(RemoteException.class).when(mMockService).retrieveNetworkAttributes(any(), any()); doThrow(RemoteException.class).when(mMockService).retrieveNetworkAttributes(any(), any());
final Blob b = new Blob(); final Blob b = new Blob();
@@ -249,9 +246,8 @@ public class IpMemoryStoreTest {
// enqueue multiple ipms requests // enqueue multiple ipms requests
mStore.storeNetworkAttributes(l2Key, TEST_NETWORK_ATTRIBUTES, mStore.storeNetworkAttributes(l2Key, TEST_NETWORK_ATTRIBUTES,
status -> { status -> assertTrue("Store not successful : " + status.resultCode,
assertTrue("Store not successful : " + status.resultCode, status.isSuccess()); status.isSuccess()));
});
mStore.retrieveNetworkAttributes(l2Key, mStore.retrieveNetworkAttributes(l2Key,
(status, key, attr) -> { (status, key, attr) -> {
assertTrue("Retrieve network attributes not successful : " assertTrue("Retrieve network attributes not successful : "
@@ -260,9 +256,8 @@ public class IpMemoryStoreTest {
assertEquals(TEST_NETWORK_ATTRIBUTES, attr); assertEquals(TEST_NETWORK_ATTRIBUTES, attr);
}); });
mStore.storeBlob(l2Key, TEST_CLIENT_ID, TEST_DATA_NAME, b, mStore.storeBlob(l2Key, TEST_CLIENT_ID, TEST_DATA_NAME, b,
status -> { status -> assertTrue("Store not successful : " + status.resultCode,
assertTrue("Store not successful : " + status.resultCode, status.isSuccess()); status.isSuccess()));
});
mStore.retrieveBlob(l2Key, TEST_CLIENT_ID, TEST_OTHER_DATA_NAME, mStore.retrieveBlob(l2Key, TEST_CLIENT_ID, TEST_OTHER_DATA_NAME,
(status, key, name, data) -> { (status, key, name, data) -> {
assertTrue("Retrieve blob status not successful : " + status.resultCode, assertTrue("Retrieve blob status not successful : " + status.resultCode,
@@ -286,7 +281,7 @@ public class IpMemoryStoreTest {
@Test @Test
public void testEnqueuedIpMsRequestsCallbackFunctionWithException() throws Exception { public void testEnqueuedIpMsRequestsCallbackFunctionWithException() throws Exception {
startIpMemoryStore(true); startIpMemoryStore(true /* supplyService */);
final Blob b = new Blob(); final Blob b = new Blob();
b.data = TEST_BLOB_DATA; b.data = TEST_BLOB_DATA;
@@ -294,9 +289,8 @@ public class IpMemoryStoreTest {
// enqueue multiple ipms requests // enqueue multiple ipms requests
mStore.storeNetworkAttributes(l2Key, TEST_NETWORK_ATTRIBUTES, mStore.storeNetworkAttributes(l2Key, TEST_NETWORK_ATTRIBUTES,
status -> { status -> assertTrue("Store not successful : " + status.resultCode,
assertTrue("Store not successful : " + status.resultCode, status.isSuccess()); status.isSuccess()));
});
mStore.retrieveNetworkAttributes(l2Key, mStore.retrieveNetworkAttributes(l2Key,
(status, key, attr) -> { (status, key, attr) -> {
throw new RuntimeException("retrieveNetworkAttributes test"); throw new RuntimeException("retrieveNetworkAttributes test");
@@ -320,6 +314,7 @@ public class IpMemoryStoreTest {
inOrder.verify(mMockService).storeNetworkAttributes(eq(l2Key), mNapCaptor.capture(), inOrder.verify(mMockService).storeNetworkAttributes(eq(l2Key), mNapCaptor.capture(),
any()); any());
inOrder.verify(mMockService).retrieveNetworkAttributes(eq(l2Key), any());
inOrder.verify(mMockService).storeBlob(eq(l2Key), eq(TEST_CLIENT_ID), eq(TEST_DATA_NAME), inOrder.verify(mMockService).storeBlob(eq(l2Key), eq(TEST_CLIENT_ID), eq(TEST_DATA_NAME),
eq(b), any()); eq(b), any());
inOrder.verify(mMockService).retrieveBlob(eq(l2Key), eq(TEST_CLIENT_ID), inOrder.verify(mMockService).retrieveBlob(eq(l2Key), eq(TEST_CLIENT_ID),