joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Ensure SpiUnavailableException was thrown because of duplicate SPI" am: ef716bcb94 am: 93165a4497

Browse source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2015999

Change-Id: I8683ed966c4d53960d5ed768f8466b3e9e23c59b
This commit is contained in:
Aaron Huang 2022-03-16 09:30:03 +00:00 • committed by Automerger Merge Worker
commit 70405d6d22
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/cts/net/src/android/net/cts/IpSecManagerTest.java
View file

@ -52,6 +52,7 @@ import static android.system.OsConstants.IPPROTO_UDP;
import static com.android.compatibility.common.util.PropertyUtil.getFirstApiLevel;
import static com.android.compatibility.common.util.PropertyUtil.getVendorApiLevel;
import static com.android.testutils.MiscAsserts.assertThrows;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
@ -129,12 +130,11 @@ public class IpSecManagerTest extends IpSecBaseTest {
assertTrue("Failed to allocate specified SPI, " + DROID_SPI,
droidSpi.getSpi() == DROID_SPI);
try {
mISM.allocateSecurityParameterIndex(addr, DROID_SPI);
fail("Duplicate SPI was allowed to be created");
} catch (IpSecManager.SpiUnavailableException expected) {
// This is a success case because we expect a dupe SPI to throw
}
IpSecManager.SpiUnavailableException expectedException =
assertThrows("Duplicate SPI was allowed to be created",
IpSecManager.SpiUnavailableException.class,
() -> mISM.allocateSecurityParameterIndex(addr, DROID_SPI));
assertEquals(expectedException.getSpi(), droidSpi.getSpi());
randomSpi.close();
droidSpi.close();