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

Merge "Update CTS to use renamed API method."

Browse Source
This commit is contained in:
nharold
2017-12-14 21:10:16 +00:00
committed by Gerrit Code Review
parent 78a4d4300b b58d3aa5b8
commit 123988e6e1
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/cts/net/src/android/net/cts/IpSecManagerTest.java
View File

@@ -99,20 +99,20 @@ public class IpSecManagerTest extends AndroidTestCase {
public void testAllocSpi() throws Exception { public void testAllocSpi() throws Exception {
for (InetAddress addr : GOOGLE_DNS_LIST) { for (InetAddress addr : GOOGLE_DNS_LIST) {
IpSecManager.SecurityParameterIndex randomSpi = null, droidSpi = null; IpSecManager.SecurityParameterIndex randomSpi = null, droidSpi = null;
randomSpi = mISM.reserveSecurityParameterIndex(IpSecTransform.DIRECTION_OUT, addr); randomSpi = mISM.allocateSecurityParameterIndex(IpSecTransform.DIRECTION_OUT, addr);
assertTrue( assertTrue(
"Failed to receive a valid SPI", "Failed to receive a valid SPI",
randomSpi.getSpi() != IpSecManager.INVALID_SECURITY_PARAMETER_INDEX); randomSpi.getSpi() != IpSecManager.INVALID_SECURITY_PARAMETER_INDEX);
droidSpi = droidSpi =
mISM.reserveSecurityParameterIndex( mISM.allocateSecurityParameterIndex(
IpSecTransform.DIRECTION_IN, addr, DROID_SPI); IpSecTransform.DIRECTION_IN, addr, DROID_SPI);
assertTrue( assertTrue(
"Failed to allocate specified SPI, " + DROID_SPI, "Failed to allocate specified SPI, " + DROID_SPI,
droidSpi.getSpi() == DROID_SPI); droidSpi.getSpi() == DROID_SPI);
try { try {
mISM.reserveSecurityParameterIndex(IpSecTransform.DIRECTION_IN, addr, DROID_SPI); mISM.allocateSecurityParameterIndex(IpSecTransform.DIRECTION_IN, addr, DROID_SPI);
fail("Duplicate SPI was allowed to be created"); fail("Duplicate SPI was allowed to be created");
} catch (IpSecManager.SpiUnavailableException expected) { } catch (IpSecManager.SpiUnavailableException expected) {
// This is a success case because we expect a dupe SPI to throw // This is a success case because we expect a dupe SPI to throw
@@ -239,10 +239,10 @@ public class IpSecManagerTest extends AndroidTestCase {
public void testCreateTransform() throws Exception { public void testCreateTransform() throws Exception {
InetAddress local = LOOPBACK_4; InetAddress local = LOOPBACK_4;
IpSecManager.SecurityParameterIndex outSpi = IpSecManager.SecurityParameterIndex outSpi =
mISM.reserveSecurityParameterIndex(IpSecTransform.DIRECTION_OUT, local); mISM.allocateSecurityParameterIndex(IpSecTransform.DIRECTION_OUT, local);
IpSecManager.SecurityParameterIndex inSpi = IpSecManager.SecurityParameterIndex inSpi =
mISM.reserveSecurityParameterIndex( mISM.allocateSecurityParameterIndex(
IpSecTransform.DIRECTION_IN, local, outSpi.getSpi()); IpSecTransform.DIRECTION_IN, local, outSpi.getSpi());
IpSecTransform transform = IpSecTransform transform =
@@ -293,10 +293,10 @@ public class IpSecManagerTest extends AndroidTestCase {
InetAddress local = InetAddress.getByName(localAddress); InetAddress local = InetAddress.getByName(localAddress);
IpSecManager.SecurityParameterIndex outSpi = IpSecManager.SecurityParameterIndex outSpi =
mISM.reserveSecurityParameterIndex(IpSecTransform.DIRECTION_OUT, local); mISM.allocateSecurityParameterIndex(IpSecTransform.DIRECTION_OUT, local);
IpSecManager.SecurityParameterIndex inSpi = IpSecManager.SecurityParameterIndex inSpi =
mISM.reserveSecurityParameterIndex( mISM.allocateSecurityParameterIndex(
IpSecTransform.DIRECTION_IN, local, outSpi.getSpi()); IpSecTransform.DIRECTION_IN, local, outSpi.getSpi());
IpSecTransform transform = IpSecTransform transform =
@@ -505,9 +505,9 @@ public class IpSecManagerTest extends AndroidTestCase {
// Create SPIs, UDP encap socket // Create SPIs, UDP encap socket
try (IpSecManager.UdpEncapsulationSocket encapSocket = mISM.openUdpEncapsulationSocket(); try (IpSecManager.UdpEncapsulationSocket encapSocket = mISM.openUdpEncapsulationSocket();
IpSecManager.SecurityParameterIndex outSpi = IpSecManager.SecurityParameterIndex outSpi =
mISM.reserveSecurityParameterIndex(IpSecTransform.DIRECTION_OUT, local); mISM.allocateSecurityParameterIndex(IpSecTransform.DIRECTION_OUT, local);
IpSecManager.SecurityParameterIndex inSpi = IpSecManager.SecurityParameterIndex inSpi =
mISM.reserveSecurityParameterIndex( mISM.allocateSecurityParameterIndex(
IpSecTransform.DIRECTION_IN, local, outSpi.getSpi()); IpSecTransform.DIRECTION_IN, local, outSpi.getSpi());
IpSecTransform transform = IpSecTransform transform =
buildIpSecTransform(mContext, inSpi, outSpi, encapSocket, local)) { buildIpSecTransform(mContext, inSpi, outSpi, encapSocket, local)) {
@@ -564,9 +564,9 @@ public class IpSecManagerTest extends AndroidTestCase {
// separate sockets for inbound and outbound) // separate sockets for inbound and outbound)
try (IpSecManager.UdpEncapsulationSocket encapSocket = mISM.openUdpEncapsulationSocket(); try (IpSecManager.UdpEncapsulationSocket encapSocket = mISM.openUdpEncapsulationSocket();
IpSecManager.SecurityParameterIndex outSpi = IpSecManager.SecurityParameterIndex outSpi =
mISM.reserveSecurityParameterIndex(IpSecTransform.DIRECTION_OUT, local); mISM.allocateSecurityParameterIndex(IpSecTransform.DIRECTION_OUT, local);
IpSecManager.SecurityParameterIndex inSpi = IpSecManager.SecurityParameterIndex inSpi =
mISM.reserveSecurityParameterIndex(IpSecTransform.DIRECTION_IN, local); mISM.allocateSecurityParameterIndex(IpSecTransform.DIRECTION_IN, local);
IpSecTransform transform = IpSecTransform transform =
buildIpSecTransform(mContext, inSpi, outSpi, encapSocket, local)) { buildIpSecTransform(mContext, inSpi, outSpi, encapSocket, local)) {