From 8c827b7eb2dfefd6ed63ef883d3c36f3241db1b8 Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Wed, 4 Oct 2017 14:51:42 +0900 Subject: [PATCH] Add some useful helpers and constants. Test: Pulled out of a client app ; the client app is behaving Test: identically to how it was behaving before. Wrote unit Test: tests in frameworks-net. Change-Id: I397137748a95c65cee2e1e1b243a1a260e83a6f7 --- .../android/internal/util/BitUtilsTest.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tests/net/java/com/android/internal/util/BitUtilsTest.java b/tests/net/java/com/android/internal/util/BitUtilsTest.java index 0ad8a21f77..f4dc12ab83 100644 --- a/tests/net/java/com/android/internal/util/BitUtilsTest.java +++ b/tests/net/java/com/android/internal/util/BitUtilsTest.java @@ -55,6 +55,25 @@ public class BitUtilsTest { assertEquals(65535, uint16((short)65535)); } + @Test + public void testUnsignedShortComposition() { + byte b0 = 0; + byte b1 = 1; + byte b2 = 2; + byte b10 = 10; + byte b16 = 16; + byte b128 = -128; + byte b224 = -32; + byte b255 = -1; + assertEquals(0x0000, uint16(b0, b0)); + assertEquals(0xffff, uint16(b255, b255)); + assertEquals(0x0a01, uint16(b10, b1)); + assertEquals(0x8002, uint16(b128, b2)); + assertEquals(0x01ff, uint16(b1, b255)); + assertEquals(0x80ff, uint16(b128, b255)); + assertEquals(0xe010, uint16(b224, b16)); + } + @Test public void testUnsignedIntWideningConversions() { assertEquals(0, uint32(0));