Use assertFailsWith to verify exception cases

Test: atest FrameworksNetTests
Change-Id: If7373a1e6543975bee9c646384f6ca4d643a1711
This commit is contained in:
chiachangwang
2023-06-09 06:08:39 +00:00
parent 8af048721a
commit 60179ec28e

View File

@@ -28,9 +28,9 @@ import com.android.testutils.assertEqualBothWays
import com.android.testutils.assertParcelingIsLossless
import com.android.testutils.parcelingRoundTrip
import java.net.InetAddress
import kotlin.test.assertFailsWith
import org.junit.Assert.assertEquals
import org.junit.Assert.assertNotEquals
import org.junit.Assert.fail
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
@@ -57,33 +57,30 @@ class NattKeepalivePacketDataTest {
@Test @IgnoreUpTo(Build.VERSION_CODES.Q)
fun testConstructor() {
try {
assertFailsWith<InvalidPacketException>(
"Dst port is not NATT port should cause exception") {
nattKeepalivePacket(dstPort = TEST_PORT)
fail("Dst port is not NATT port should cause exception")
} catch (e: InvalidPacketException) {
assertEquals(e.error, ERROR_INVALID_PORT)
}.let {
assertEquals(it.error, ERROR_INVALID_PORT)
}
try {
assertFailsWith<InvalidPacketException>("A v6 srcAddress should cause exception") {
nattKeepalivePacket(srcAddress = TEST_ADDRV6)
fail("A v6 srcAddress should cause exception")
} catch (e: InvalidPacketException) {
assertEquals(e.error, ERROR_INVALID_IP_ADDRESS)
}.let {
assertEquals(it.error, ERROR_INVALID_IP_ADDRESS)
}
try {
assertFailsWith<InvalidPacketException>("A v6 dstAddress should cause exception") {
nattKeepalivePacket(dstAddress = TEST_ADDRV6)
fail("A v6 dstAddress should cause exception")
} catch (e: InvalidPacketException) {
assertEquals(e.error, ERROR_INVALID_IP_ADDRESS)
}.let {
assertEquals(it.error, ERROR_INVALID_IP_ADDRESS)
}
try {
assertFailsWith<IllegalArgumentException>("Invalid data should cause exception") {
parcelingRoundTrip(
NattKeepalivePacketData(TEST_SRC_ADDRV4, TEST_PORT, TEST_DST_ADDRV4, TEST_PORT,
NattKeepalivePacketData(TEST_SRC_ADDRV4, TEST_PORT, TEST_DST_ADDRV4, TEST_PORT,
byteArrayOf(12, 31, 22, 44)))
fail("Invalid data should cause exception")
} catch (e: IllegalArgumentException) { }
}
}
@Test @IgnoreUpTo(Build.VERSION_CODES.Q)