Merge "Add missing test coverage for TcpInfo" into main am: 96d8031ff8 Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/2836336 Change-Id: I97bbb40e8cbbdf895b0bee0a55b6360447c1a46d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/networkstack/netlink/TcpInfo.java b/src/com/android/networkstack/netlink/TcpInfo.java index 73d206e..de450e9 100644 --- a/src/com/android/networkstack/netlink/TcpInfo.java +++ b/src/com/android/networkstack/netlink/TcpInfo.java
@@ -170,7 +170,8 @@ } } - private static String decodeWscale(byte num) { + @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) + static String decodeWscale(byte num) { return String.valueOf((num >> 4) & 0x0f) + ":" + String.valueOf(num & 0x0f); }
diff --git a/tests/unit/src/com/android/networkstack/netlink/TcpInfoTest.java b/tests/unit/src/com/android/networkstack/netlink/TcpInfoTest.java index 380f4ec..ff56f5f 100644 --- a/tests/unit/src/com/android/networkstack/netlink/TcpInfoTest.java +++ b/tests/unit/src/com/android/networkstack/netlink/TcpInfoTest.java
@@ -242,4 +242,20 @@ return info; } + + @Test + public void testHashCode() { + final TcpInfo info = new TcpInfo(2, 1, 5); + final TcpInfo info2 = new TcpInfo(2, 1, 5); + + assertEquals(info, info2); + assertEquals(info.hashCode(), info2.hashCode()); + } + + @Test + public void testDecodeWscale() { + assertEquals("0:0", TcpInfo.decodeWscale((byte) 0)); + assertEquals("15:15", TcpInfo.decodeWscale((byte) 255)); + assertEquals("15:0", TcpInfo.decodeWscale((byte) 240)); + } }