Skip to content

Commit 2624ebf

Browse files
committed
Fix test and support singular byte toString mode
1 parent 7082318 commit 2624ebf

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

src/main/java/at/favre/lib/bytes/Util.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ static String toString(Bytes bytes) {
359359
preview = "(0x" + bytes.encodeHex() + ")";
360360
}
361361

362-
return bytes.length() + " bytes " + preview;
362+
return bytes.length() + " " + (bytes.length() == 1 ? "byte" : "bytes") + " " + preview;
363363
}
364364

365365
/**

src/test/java/at/favre/lib/bytes/BytesMiscTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public class BytesMiscTest extends ABytesTest {
3636
@Test
3737
public void testToString() throws Exception {
3838
testToString(Bytes.wrap(new byte[0]));
39+
testToString(Bytes.wrap(example_bytes_one));
3940
testToString(Bytes.wrap(new byte[2]));
4041
testToString(Bytes.wrap(example_bytes_seven));
4142
testToString(Bytes.wrap(example2_bytes_seven));

src/test/java/at/favre/lib/bytes/BytesTransformTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -252,11 +252,11 @@ public int compare(Byte o1, Byte o2) {
252252

253253
@Test
254254
public void leftShift() throws Exception {
255-
assertArrayEquals(new byte[]{2}, Bytes.from(1).leftShift(1).array());
256-
assertArrayEquals(new byte[]{4}, Bytes.from(1).leftShift(2).array());
257-
assertArrayEquals(new byte[]{8}, Bytes.from(1).leftShift(3).array());
258-
assertArrayEquals(new byte[]{example_bytes_two[0], example_bytes_two[1], 0}, Bytes.from(example_bytes_two).leftShift(8).array());
259-
assertArrayEquals(new byte[]{example_bytes_two[0], example_bytes_two[1], 0, 0}, Bytes.from(example_bytes_two).leftShift(16).array());
255+
assertArrayEquals(new byte[]{2}, Bytes.from((byte) 1).leftShift(1).array());
256+
assertArrayEquals(new byte[]{4}, Bytes.from((byte) 1).leftShift(2).array());
257+
assertArrayEquals(new byte[]{8}, Bytes.from((byte) 1).leftShift(3).array());
258+
assertArrayEquals(new byte[]{example_bytes_two[1], 0}, Bytes.from(example_bytes_two).leftShift(8).array());
259+
assertArrayEquals(new byte[]{0, 0}, Bytes.from(example_bytes_two).leftShift(16).array());
260260
}
261261

262262
@Test

0 commit comments

Comments
 (0)