diff options
| author | Di Lu <ludi@google.com> | 2018-01-11 11:35:25 -0800 |
|---|---|---|
| committer | Di Lu <ludi@google.com> | 2018-01-18 15:23:56 -0800 |
| commit | 0b611f496e9dd6be62419d8cd7f2d164efefad1c (patch) | |
| tree | 68560acf16096b3d242b7893e09d54a7a88ac363 /tests/net/java/com/android/server/IpSecServiceParameterizedTest.java | |
| parent | 3965e3bbc615c0476202baff35a6006eef140b94 (diff) | |
Add xfrm mark in IpSecConfig
Bug: 63589600
Test: runtest frameworks-net
Change-Id: I2d38d781b8b31d8bf39fd4e9a7e31509f15a9e16
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 4fbb228e6e53..cb0bdfc752d4 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), @@ -280,7 +294,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 = @@ -314,7 +333,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); |