Fold BinaryCodec boundary checks into existing tests

Author: Fancy

src/test/java/org/apache/commons/codec/binary/BinaryCodecTest.java

@@ -540,6 +540,9 @@ void testEncodeObjectNull() throws Exception {
     void testFromAsciiByteArray() {
         assertEquals(0, BinaryCodec.fromAscii((byte[]) null).length);
         assertEquals(0, BinaryCodec.fromAscii(new byte[0]).length);
+        assertArrayEquals(new byte[0], BinaryCodec.fromAscii("1".getBytes(CHARSET_UTF8)));
+        assertArrayEquals(new byte[] { 0 }, BinaryCodec.fromAscii("100000000".getBytes(CHARSET_UTF8)));
+        assertArrayEquals(new byte[] { (byte) 0x80 }, BinaryCodec.fromAscii("010000000".getBytes(CHARSET_UTF8)));
         // With a single raw binary
         byte[] bits = new byte[1];
         byte[] decoded = BinaryCodec.fromAscii("00000000".getBytes(CHARSET_UTF8));
@@ -631,6 +634,9 @@ void testFromAsciiByteArray() {
     void testFromAsciiCharArray() {
         assertEquals(0, BinaryCodec.fromAscii((char[]) null).length);
         assertEquals(0, BinaryCodec.fromAscii(new char[0]).length);
+        assertArrayEquals(new byte[0], BinaryCodec.fromAscii("1".toCharArray()));
+        assertArrayEquals(new byte[] { 0 }, BinaryCodec.fromAscii("100000000".toCharArray()));
+        assertArrayEquals(new byte[] { (byte) 0x80 }, BinaryCodec.fromAscii("010000000".toCharArray()));
         // With a single raw binary
         byte[] bits = new byte[1];
         byte[] decoded = BinaryCodec.fromAscii("00000000".toCharArray());
@@ -1069,6 +1075,7 @@ void testToAsciiString() {
         bits[1] = (byte) (BIT_0 | BIT_1 | BIT_2 | BIT_3 | BIT_4 | BIT_5 | BIT_6 | BIT_7);
         encoded = BinaryCodec.toAsciiString(bits);
         assertEquals("1111111111111111", encoded);
+        assertEquals("", BinaryCodec.toAsciiString(null));
     }
 
     /**
@@ -1160,30 +1167,4 @@ void testToByteArrayFromString() {
         assertEquals(0, instance.toByteArray((String) null).length);
     }
 
-    @Test
-    void testFromAsciiByteArrayLengthLessThan8ReturnsEmpty() {
-        assertArrayEquals(new byte[0], BinaryCodec.fromAscii("1".getBytes(CHARSET_UTF8)));
-    }
-
-    @Test
-    void testFromAsciiCharArrayLengthLessThan8ReturnsEmpty() {
-        assertArrayEquals(new byte[0], BinaryCodec.fromAscii("1".toCharArray()));
-    }
-
-    @Test
-    void testFromAsciiByteArrayLengthNotMultipleOf8IgnoresLeadingBits() {
-        assertArrayEquals(new byte[] { 0 }, BinaryCodec.fromAscii("100000000".getBytes(CHARSET_UTF8)));
-        assertArrayEquals(new byte[] { (byte) 0x80 }, BinaryCodec.fromAscii("010000000".getBytes(CHARSET_UTF8)));
-    }
-
-    @Test
-    void testFromAsciiCharArrayLengthNotMultipleOf8IgnoresLeadingBits() {
-        assertArrayEquals(new byte[] { 0 }, BinaryCodec.fromAscii("100000000".toCharArray()));
-        assertArrayEquals(new byte[] { (byte) 0x80 }, BinaryCodec.fromAscii("010000000".toCharArray()));
-    }
-
-    @Test
-    void testToAsciiStringNullReturnsEmptyString() {
-        assertEquals("", BinaryCodec.toAsciiString(null));
-    }
 }