From 5156e787f351fb38b70454f03ac2e0d1633e54d4 Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Mon, 8 Nov 2021 13:25:45 +0900 Subject: [PATCH] Include the failing stats in stats failure assertions. Currently debugging IpSecManagerTest counter test failures is difficult because the assertion message does not say how many bytes/packets were expected. Add this information to the assertion message. Bug: 204860049 Test: test-only change Change-Id: I4e12be9a58a688fcee3362dceb31d9f21e981d6c --- .../src/android/net/cts/IpSecManagerTest.java | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/tests/cts/net/src/android/net/cts/IpSecManagerTest.java b/tests/cts/net/src/android/net/cts/IpSecManagerTest.java index 5c95aa3b95..7323c5900d 100644 --- a/tests/cts/net/src/android/net/cts/IpSecManagerTest.java +++ b/tests/cts/net/src/android/net/cts/IpSecManagerTest.java @@ -413,20 +413,26 @@ public class IpSecManagerTest extends IpSecBaseTest { // Check that iface stats are within an acceptable range; data might be sent // on the local interface by other apps. - assertApproxEquals( - ifaceTxBytes, newIfaceTxBytes, expectedTxByteDelta, ERROR_MARGIN_BYTES); - assertApproxEquals( - ifaceRxBytes, newIfaceRxBytes, expectedRxByteDelta, ERROR_MARGIN_BYTES); - assertApproxEquals( - ifaceTxPackets, newIfaceTxPackets, expectedTxPacketDelta, ERROR_MARGIN_PKTS); - assertApproxEquals( - ifaceRxPackets, newIfaceRxPackets, expectedRxPacketDelta, ERROR_MARGIN_PKTS); + assertApproxEquals("TX bytes", ifaceTxBytes, newIfaceTxBytes, expectedTxByteDelta, + ERROR_MARGIN_BYTES); + assertApproxEquals("RX bytes", ifaceRxBytes, newIfaceRxBytes, expectedRxByteDelta, + ERROR_MARGIN_BYTES); + assertApproxEquals("TX packets", ifaceTxPackets, newIfaceTxPackets, + expectedTxPacketDelta, ERROR_MARGIN_PKTS); + assertApproxEquals("RX packets", ifaceRxPackets, newIfaceRxPackets, + expectedRxPacketDelta, ERROR_MARGIN_PKTS); } private static void assertApproxEquals( - long oldStats, long newStats, int expectedDelta, double errorMargin) { - assertTrue(expectedDelta <= newStats - oldStats); - assertTrue((expectedDelta * errorMargin) > newStats - oldStats); + String what, long oldStats, long newStats, int expectedDelta, double errorMargin) { + assertTrue( + "Expected at least " + expectedDelta + " " + what + + ", got " + (newStats - oldStats), + newStats - oldStats >= expectedDelta); + assertTrue( + "Expected at most " + errorMargin + " * " + expectedDelta + " " + what + + ", got " + (newStats - oldStats), + newStats - oldStats < (expectedDelta * errorMargin)); } private static void initStatsChecker() throws Exception {