Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update IpSecService UnitTests

Browse Source 
The IpSecService Unit tests relied on the
directionality of the IpSecConfig and previously
did not specify a source address. Unit tests
updated without functional change other than to
address these two requirements.

Bug: 71717213
Test: runtest frameworks-net
Change-Id: Iedbed735bc50fd4fdfe985f9e173956062a7b0d1
This commit is contained in:
Nathan Harold
2018-01-16 19:34:01 -08:00
parent a25233123b
commit 5676f5fdae
2 changed files with 58 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/net/java/com/android/server/IpSecServiceParameterizedTest.java
View File

@@ -56,10 +56,11 @@ public class IpSecServiceParameterizedTest {
private static final int TEST_SPI = 0xD1201D;
private final String mDestinationAddr;
private final String mSourceAddr;
@Parameterized.Parameters
public static Collection ipSecConfigs() {
return Arrays.asList(new Object[][] {{"8.8.4.4"}, {"2601::10"}});
return Arrays.asList(new Object[][] {{"1.2.3.4", "8.8.4.4"}, {"2601::2", "2601::10"}});
}
private static final byte[] AEAD_KEY = {
@@ -94,8 +95,9 @@ public class IpSecServiceParameterizedTest {
private static final IpSecAlgorithm AEAD_ALGO =
new IpSecAlgorithm(IpSecAlgorithm.AUTH_CRYPT_AES_GCM, AEAD_KEY, 128);
public IpSecServiceParameterizedTest(String remoteAddr) {
mDestinationAddr = remoteAddr;
public IpSecServiceParameterizedTest(String sourceAddr, String destAddr) {
mSourceAddr = sourceAddr;
mDestinationAddr = destAddr;
}
@Before
@@ -192,6 +194,7 @@ public class IpSecServiceParameterizedTest {
private void addDefaultSpisAndRemoteAddrToIpSecConfig(IpSecConfig config) throws Exception {
config.setSpiResourceId(getNewSpiResourceId(mDestinationAddr, TEST_SPI));
config.setSourceAddress(mSourceAddr);
config.setDestinationAddress(mDestinationAddr);
}