From 40fbbe1012f506ce4efdb099109c4d04be2b5e53 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Fri, 15 Apr 2016 17:56:13 +0200 Subject: [PATCH] Fixed wrong byte ordering --- src/zutil/converter/Converter.java | 6 +++--- test/zutil/converter/ConverterTest.java | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/zutil/converter/Converter.java b/src/zutil/converter/Converter.java index 2ddea9c..c30b99e 100755 --- a/src/zutil/converter/Converter.java +++ b/src/zutil/converter/Converter.java @@ -60,10 +60,10 @@ public class Converter { */ public static byte[] toBytes(int num){ return new byte[]{ - (byte)((num >> 24)& 0xff), - (byte)((num >> 16)& 0xff), + (byte)(num & 0xff), (byte)((num >> 8)& 0xff), - (byte)(num & 0xff)}; + (byte)((num >> 16)& 0xff), + (byte)((num >> 24)& 0xff)}; } /** diff --git a/test/zutil/converter/ConverterTest.java b/test/zutil/converter/ConverterTest.java index aff0543..7aed9a3 100755 --- a/test/zutil/converter/ConverterTest.java +++ b/test/zutil/converter/ConverterTest.java @@ -94,10 +94,10 @@ public class ConverterTest { @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[]{0x01,0x00,0x00,0x00}, Converter.toBytes(1)); + assertArrayEquals(new byte[]{0x00,0x01,0x00,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)); + assertArrayEquals(new byte[]{(byte)0xFF,(byte)0xFF,(byte)0xFF,(byte)0x7F}, Converter.toBytes(Integer.MAX_VALUE)); + assertArrayEquals(new byte[]{(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x80}, Converter.toBytes(Integer.MIN_VALUE)); } }