diff --git a/src/zutil/converter/Converter.java b/src/zutil/converter/Converter.java index 15a76c3..2ddea9c 100755 --- a/src/zutil/converter/Converter.java +++ b/src/zutil/converter/Converter.java @@ -59,11 +59,11 @@ public class Converter { * @return a byte array of four bytes */ public static byte[] toBytes(int num){ - return new byte[]{ - (byte)(num & 0xff), - (byte)((num >> 8)& 0xff), - (byte)((num >> 16)& 0xff), - (byte)((num >> 24)& 0xff)}; + return new byte[]{ + (byte)((num >> 24)& 0xff), + (byte)((num >> 16)& 0xff), + (byte)((num >> 8)& 0xff), + (byte)(num & 0xff)}; } /** diff --git a/src/zutil/converter/ConverterTest.java b/test/zutil/converter/ConverterTest.java similarity index 85% rename from src/zutil/converter/ConverterTest.java rename to test/zutil/converter/ConverterTest.java index 7ad52e8..aff0543 100755 --- a/src/zutil/converter/ConverterTest.java +++ b/test/zutil/converter/ConverterTest.java @@ -90,4 +90,14 @@ public class ConverterTest { assertEquals(Integer.MAX_VALUE, Converter.toInt(new byte[]{(byte)0x7F,(byte)0xFF,(byte)0xFF,(byte)0xFF})); assertEquals(Integer.MAX_VALUE, Converter.toInt(new byte[]{(byte)0x7F,(byte)0xFF,(byte)0xFF,(byte)0xFF,(byte)0xFF,(byte)0xFF})); } + + @Test + public void intToByteArray(){ + assertArrayEquals(new byte[]{0x00,0x00,0x00,0x00}, Converter.toBytes(0)); + assertArrayEquals(new byte[]{0x00,0x00,0x00,0x01}, Converter.toBytes(1)); + assertArrayEquals(new byte[]{0x00,0x00,0x01,0x00}, Converter.toBytes(256)); + assertArrayEquals(new byte[]{(byte)0xFF,(byte)0xFF,(byte)0xFF,(byte)0xFF}, Converter.toBytes(-1)); + assertArrayEquals(new byte[]{(byte)0x7F,(byte)0xFF,(byte)0xFF,(byte)0xFF}, Converter.toBytes(Integer.MAX_VALUE)); + assertArrayEquals(new byte[]{(byte)0x80,(byte)0x00,(byte)0x00,(byte)0x00}, Converter.toBytes(Integer.MIN_VALUE)); + } } diff --git a/src/zutil/converter/NumberToWordsConverterTest.java b/test/zutil/converter/NumberToWordsConverterTest.java similarity index 100% rename from src/zutil/converter/NumberToWordsConverterTest.java rename to test/zutil/converter/NumberToWordsConverterTest.java