diff options
| author | Benedict Wong <benedictwong@google.com> | 2018-01-24 05:53:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-24 05:53:29 +0000 |
| commit | 73f79ceae991d4e8b8d28c464fcf11a296877a68 (patch) | |
| tree | 9c85e407faf22cc6bbe39282bae98c53e84e7167 /tests/net/java/com/android/server/IpSecServiceParameterizedTest.java | |
| parent | 8fd5b7e1c3efc51b10911be3a1f1cc98e8402556 (diff) | |
| parent | 0b611f496e9dd6be62419d8cd7f2d164efefad1c (diff) | |
Merge "Add xfrm mark in IpSecConfig"
Diffstat (limited to 'tests/net/java/com/android/server/IpSecServiceParameterizedTest.java')
| -rw-r--r-- | tests/net/java/com/android/server/IpSecServiceParameterizedTest.java | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java b/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java index 1618e07a79c0..801a396ecb3d 100644 --- a/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java +++ b/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java @@ -136,7 +136,12 @@ public class IpSecServiceParameterizedTest { verify(mMockNetd) .ipSecDeleteSecurityAssociation( - eq(spiResp.resourceId), anyString(), anyString(), eq(TEST_SPI)); + eq(spiResp.resourceId), + anyString(), + anyString(), + eq(TEST_SPI), + anyInt(), + anyInt()); // Verify quota and RefcountedResource objects cleaned up IpSecService.UserRecord userRecord = @@ -168,7 +173,12 @@ public class IpSecServiceParameterizedTest { verify(mMockNetd) .ipSecDeleteSecurityAssociation( - eq(spiResp.resourceId), anyString(), anyString(), eq(TEST_SPI)); + eq(spiResp.resourceId), + anyString(), + anyString(), + eq(TEST_SPI), + anyInt(), + anyInt()); // Verify quota and RefcountedResource objects cleaned up assertEquals(0, userRecord.mSpiQuotaTracker.mCurrent); @@ -221,6 +231,8 @@ public class IpSecServiceParameterizedTest { anyString(), anyLong(), eq(TEST_SPI), + anyInt(), + anyInt(), eq(IpSecAlgorithm.AUTH_HMAC_SHA256), eq(AUTH_KEY), anyInt(), @@ -254,6 +266,8 @@ public class IpSecServiceParameterizedTest { anyString(), anyLong(), eq(TEST_SPI), + anyInt(), + anyInt(), eq(""), eq(new byte[] {}), eq(0), @@ -305,7 +319,12 @@ public class IpSecServiceParameterizedTest { verify(mMockNetd) .ipSecDeleteSecurityAssociation( - eq(createTransformResp.resourceId), anyString(), anyString(), eq(TEST_SPI)); + eq(createTransformResp.resourceId), + anyString(), + anyString(), + eq(TEST_SPI), + anyInt(), + anyInt()); // Verify quota and RefcountedResource objects cleaned up IpSecService.UserRecord userRecord = @@ -339,7 +358,12 @@ public class IpSecServiceParameterizedTest { verify(mMockNetd) .ipSecDeleteSecurityAssociation( - eq(createTransformResp.resourceId), anyString(), anyString(), eq(TEST_SPI)); + eq(createTransformResp.resourceId), + anyString(), + anyString(), + eq(TEST_SPI), + anyInt(), + anyInt()); // Verify quota and RefcountedResource objects cleaned up assertEquals(0, userRecord.mTransformQuotaTracker.mCurrent); |