Merge "Cleanup of resource limit tests"
am: 39f58678db
Change-Id: Ifcbc61ad8003c43ba1baff6d4d534192f6498206
diff --git a/tests/net/java/com/android/server/IpSecServiceTest.java b/tests/net/java/com/android/server/IpSecServiceTest.java
index 8e579aa..0720886f 100644
--- a/tests/net/java/com/android/server/IpSecServiceTest.java
+++ b/tests/net/java/com/android/server/IpSecServiceTest.java
@@ -270,8 +270,8 @@
}
/**
- * This function checks if the number of encap UDP socket that one UID can reserve
- * has a reasonable limit.
+ * This function checks if the number of encap UDP socket that one UID can reserve has a
+ * reasonable limit.
*/
@Test
public void testSocketResourceTrackerLimitation() throws Exception {
@@ -287,9 +287,10 @@
openUdpEncapSockets.add(newUdpEncapSocket);
}
// Assert that the total sockets quota has a reasonable limit.
+ assertTrue("No UDP encap socket was open", !openUdpEncapSockets.isEmpty());
assertTrue(
- openUdpEncapSockets.size() > 0
- && openUdpEncapSockets.size() < MAX_NUM_ENCAP_SOCKETS);
+ "Number of open UDP encap sockets is out of bound",
+ openUdpEncapSockets.size() < MAX_NUM_ENCAP_SOCKETS);
// Try to reserve one more UDP encapsulation socket, and should fail.
IpSecUdpEncapResponse extraUdpEncapSocket =
@@ -297,7 +298,7 @@
assertNotNull(extraUdpEncapSocket);
assertEquals(IpSecManager.Status.RESOURCE_UNAVAILABLE, extraUdpEncapSocket.status);
- // Close one of the open UDP encapsulation scokets.
+ // Close one of the open UDP encapsulation sockets.
mIpSecService.closeUdpEncapsulationSocket(openUdpEncapSockets.get(0).resourceId);
openUdpEncapSockets.get(0).fileDescriptor.close();
openUdpEncapSockets.remove(0);
@@ -316,10 +317,9 @@
}
/**
- * This function checks if the number of SPI that one UID can reserve
- * has a reasonable limit.
- * This test does not test for both address families or duplicate SPIs because resource
- * tracking code does not depend on them.
+ * This function checks if the number of SPI that one UID can reserve has a reasonable limit.
+ * This test does not test for both address families or duplicate SPIs because resource tracking
+ * code does not depend on them.
*/
@Test
public void testSpiResourceTrackerLimitation() throws Exception {