[Minor fixes and UT] Added some more unit test cases and fixed some

minor issues found.

Signed-off-by: Tatiana Leon <tatiana.leon@digi.com>

Author: tatianaleon

library/src/main/java/com/digi/xbee/api/XBeeNetwork.java

@@ -412,7 +412,7 @@ public RemoteXBeeDevice getDevice(XBee64BitAddress address) {
 		if (address == null)
 			throw new NullPointerException("64-bit address cannot be null.");
 		if (address.equals(XBee64BitAddress.UNKNOWN_ADDRESS))
-			throw new NullPointerException("64-bit address cannot be unknown.");
+			throw new IllegalArgumentException("64-bit address cannot be unknown.");
 
 		logger.debug("{}Getting device '{}' from network.", localDevice.toString(), address);
 
@@ -443,7 +443,7 @@ public RemoteXBeeDevice getDevice(XBee16BitAddress address) throws OperationNotS
 		if (address == null)
 			throw new NullPointerException("16-bit address cannot be null.");
 		if (address.equals(XBee16BitAddress.UNKNOWN_ADDRESS))
-			throw new NullPointerException("16-bit address cannot be unknown.");
+			throw new IllegalArgumentException("16-bit address cannot be unknown.");
 
 		logger.debug("{}Getting device '{}' from network.", localDevice.toString(), address);
 
@@ -492,7 +492,7 @@ public RemoteXBeeDevice getDevice(XBee16BitAddress address) throws OperationNotS
 	 * @return The remote XBee Device instance in the network, {@code null} if
 	 *         the device could not be successfully added.
 	 * 
-	 * @throws NullPointerException if {@code RemoteDevice == null}.
+	 * @throws NullPointerException if {@code remoteDevice == null}.
 	 * 
 	 * @see #addRemoteDevices(List)
 	 * @see #removeRemoteDevice(RemoteXBeeDevice)
@@ -618,7 +618,11 @@ public List<RemoteXBeeDevice> addRemoteDevices(List<RemoteXBeeDevice> list) {
 		logger.debug("{}Adding '{}' devices to network.", localDevice.toString(), list.size());
 
 		for (int i = 0; i < list.size(); i++) {
-			RemoteXBeeDevice d = addRemoteDevice(list.get(i));
+			RemoteXBeeDevice toAdd = list.get(i);
+			if (toAdd == null)
+				continue;
+			
+			RemoteXBeeDevice d = addRemoteDevice(toAdd);
 			if (d != null)
 				addedList.add(d);
 		}
@@ -716,7 +720,7 @@ public void removeRemoteDevice(RemoteXBeeDevice remoteDevice) {
 	public void clearDeviceList() {
 		logger.debug("{}Clearing the network.", localDevice.toString());
 		remotesBy64BitAddr.clear();
-		remotesBy64BitAddr.clear();
+		remotesBy16BitAddr.clear();
 	}
 
 	/**

library/src/main/java/com/digi/xbee/api/models/HardwareVersionEnum.java

@@ -13,8 +13,6 @@
 
 import java.util.HashMap;
 
-import com.digi.xbee.api.utils.HexUtils;
-
 /**
  * Enumerates the different hardware versions of the XBee devices.
  */

library/src/main/java/com/digi/xbee/api/utils/ByteUtils.java

@@ -38,10 +38,12 @@ public static byte[] readBytes(int numBytes, ByteArrayInputStream inputStream) {
 		if (inputStream == null)
 			throw new NullPointerException("Input stream cannot be null.");
 		if (numBytes < 0)
-			throw new IllegalArgumentException("Number of bytes to read must be greater than 0.");
+			throw new IllegalArgumentException("Number of bytes to read must be equal or greater than 0.");
 
 		byte[] data = new byte[numBytes];
 		int len = inputStream.read(data, 0, numBytes);
+		if (len == - 1)
+			return new byte[0];
 		if (len < numBytes) {
 			byte[] d = new byte[len];
 			System.arraycopy(data, 0, d, 0, len);
@@ -110,13 +112,16 @@ public static long byteArrayToLong(byte[] byteArray) {
 		if (byteArray == null)
 			throw new NullPointerException("Byte array cannot be null.");
 
+		if (byteArray.length == 0)
+			return 0;
+		
 		byte[] values = byteArray;
 		if (byteArray.length < 8) {
 			values = new byte[8];
-			int diff = 8 - byteArray.length;
+			int diff = values.length - byteArray.length;
 			for (int i = 0; i < diff; i++)
 				values[i] = 0;
-			for (int i = diff; i < 8; i++)
+			for (int i = diff; i < values.length; i++)
 				values[i] = byteArray[i - diff];
 		}
 		return ((long)values[0] << 56) 
@@ -162,13 +167,16 @@ public static int byteArrayToInt(byte[] byteArray) {
 		if (byteArray == null)
 			throw new NullPointerException("Byte array cannot be null.");
 
+		if (byteArray.length == 0)
+			return 0;
+		
 		byte[] values = byteArray;
 		if (byteArray.length < 4) {
 			values = new byte[4];
-			int diff = 4 - byteArray.length;
+			int diff = values.length - byteArray.length;
 			for (int i = 0; i < diff; i++)
 				values[i] = 0;
-			for (int i = diff; i < 4; i++)
+			for (int i = diff; i < values.length; i++)
 				values[i] = byteArray[i - diff];
 		}
 		return ((values[0] & 0xFF) << 24)
@@ -208,8 +216,18 @@ public static short byteArrayToShort(byte[] byteArray) {
 		if (byteArray == null)
 			throw new NullPointerException("Byte array cannot be null.");
 
-		return (short) (((byteArray[0] << 8) & 0xFF00) 
-						| byteArray[1] & 0x00FF);
+		if (byteArray.length == 0)
+			return 0;
+		
+		byte[] values = byteArray;
+		if (byteArray.length < 2) {
+			values = new byte[2];
+			values[1] = byteArray[0];
+			values[0] = 0;
+		}
+		
+		return (short) (((values[0] << 8) & 0xFF00) 
+						| values[1] & 0x00FF);
 	}
 
 	/**
@@ -267,8 +285,14 @@ public static int byteToInt(byte b) {
 	 * 
 	 * @return {@code true} if the given bit position is set to {@code 1} 
 	 *         in the {@code containerInteger}, {@code false} otherwise.
+	 *         
+	 * @throws IllegalArgumentException if {@code bitPosition < 0} or
+	 *                                  if {@code bitPosition > 31}.
 	 */
 	public static boolean isBitEnabled(int containerInteger, int bitPosition) {
+		if (bitPosition < 0 || bitPosition > 31)
+			throw new IllegalArgumentException("Bit position must be between 0 and 31.");
+		
 		return (((containerInteger & 0xFFFFFFFF) >> bitPosition) & 0x01) == 0x01;
 	}
 
@@ -281,10 +305,22 @@ public static boolean isBitEnabled(int containerInteger, int bitPosition) {
 	 * @param bitLength Size in bits of the integer value to read.
 	 * 
 	 * @return The integer read value.
+	 * 
+	 * @throws IllegalArgumentException if {@code bitOffset < 0} or
+	 *                                  if {@code bitOffset > 7} or
+	 *                                  if {@code bitLength < 0} or
+	 *                                  if {@code bitLength > 8}.
 	 */
 	public static int readIntegerFromByte(byte containerByte, int bitOffset, int bitLength) {
+		if (bitOffset < 0 || bitOffset > 7)
+			throw new IllegalArgumentException("Offset must be between 0 and 7.");
+		if (bitLength < 0 || bitLength > 7)
+			throw new IllegalArgumentException("Length must be between 0 and 8.");
+		
 		int readInteger = 0;
 		for (int i = 0; i < bitLength; i++) {
+			if (bitOffset + i > 7)
+				break;
 			if (isBitEnabled(containerByte, bitOffset + i))
 				readInteger = readInteger | (int)Math.pow(2, i);
 		}
@@ -298,8 +334,14 @@ public static int readIntegerFromByte(byte containerByte, int bitOffset, int bit
 	 * @param bitOffset Offset inside the byte to read the boolean value.
 	 * 
 	 * @return The read boolean value.
+	 * 
+	 * @throws IllegalArgumentException if {@code bitOffset < 0} or
+	 *                                  if {@code bitOffset > 31}.
 	 */
 	public static boolean readBooleanFromByte(byte containerByte, int bitOffset) {
+		if (bitOffset < 0 || bitOffset > 31)
+			throw new IllegalArgumentException("Bit offset must be between 0 and 7.");
+		
 		return isBitEnabled(containerByte, bitOffset);
 	}
 
@@ -339,11 +381,17 @@ public static byte[] readUntilCR(ByteArrayInputStream inputStream) {
 	 * @return Final byte array of the given size containing the given data and
 	 *         replacing with zeros the remaining space.
 	 * 
+	 * @throws IllegalArgumentException if {@code finalSize < 0}.
 	 * @throws NullPointerException if {@code data == null}.
 	 */
 	public static byte[] newByteArray(byte[] data, int finalSize) {
 		if (data == null)
 			throw new NullPointerException("Data cannot be null.");
+		if (finalSize < 0)
+			throw new IllegalArgumentException("Final size must be equal or greater than 0.");
+		
+		if (finalSize == 0)
+			return new byte[0];
 
 		byte[] filledArray = new byte[finalSize];
 		int diff = finalSize - data.length;
@@ -362,8 +410,16 @@ public static byte[] newByteArray(byte[] data, int finalSize) {
 	 * @param source Byte array to swap.
 	 * 
 	 * @return The swapped byte array.
+	 * 
+	 * @throws NullPointerException if {@code source == null}.
 	 */
 	public static byte[] swapByteArray(byte[] source) {
+		if (source == null)
+			throw new NullPointerException("Source cannot be null.");
+		
+		if (source.length == 0)
+			return new byte[0];
+		
 		byte[] swapped = new byte[source.length];
 		for (int i = 0; i < source.length; i++)
 			swapped[source.length - i - 1] = source[i];

library/src/main/java/com/digi/xbee/api/utils/HexUtils.java

@@ -34,7 +34,8 @@ public class HexUtils {
 	 */
 	public static String byteArrayToHexString(byte[] value) {
 		if (value == null )
-			throw new NullPointerException("Value to convert cannot be null");
+			throw new NullPointerException("Value to convert cannot be null.");
+		
 		final StringBuilder hex = new StringBuilder(2 * value.length );
 		for (final byte b : value) {
 			hex.append(HEXES.charAt((b & 0xF0) >> 4))
@@ -118,18 +119,15 @@ public static boolean containsLetters(String parameter) {
 	 * @param minBytes The minimum number of bytes to be represented.
 	 * 
 	 * @return The integer value as hexadecimal string.
+	 * 
+	 * @throws IllegalArgumentException if {@code minBytes <= 0}.
 	 */
 	public static String integerToHexString(int value, int minBytes) {
-		byte[] intAsByteArray = ByteUtils.intToByteArray(value);
-		String intAsHexString = "";
-		boolean numberFound = false;
-		for (int i = 0; i < intAsByteArray.length; i++) {
-			if (intAsByteArray[i] == 0x00 && !numberFound && intAsByteArray.length - i > minBytes)
-				continue;
-			intAsHexString += HexUtils.byteArrayToHexString(new byte[] {(byte)(intAsByteArray[i] & 0xFF)});
-			numberFound = true;
-		}
-		return intAsHexString;
+		if (minBytes <= 0)
+			throw new IllegalArgumentException("Minimum number of bytes must be greater than 0.");
+		
+		String f = String.format("%%0%dX", minBytes*2);
+		return String.format(f, value);
 	}
 
 	/**
@@ -148,12 +146,18 @@ public static String prettyHexString(String hexString) {
 		if (hexString == null)
 			throw new NullPointerException("Hexadecimal string cannot be null.");
 
+		String copy = hexString.toUpperCase();
+		for (final char c : copy.toCharArray()) {
+			if (!HEXES.contains(""+c))
+				throw new IllegalArgumentException("Given string cannot contain non-hexadecimal characters.");
+		}
+		
 		String prettyHexString = "";
-		if (hexString.length() % 2 != 0)
-			hexString = "0" + hexString;
-		int iterations = hexString.length() / 2;
+		if (copy.length() % 2 != 0)
+			copy = "0" + copy;
+		int iterations = copy.length() / 2;
 		for (int i = 0; i < iterations; i++)
-			prettyHexString += hexString.substring(2 * i, 2 * i + 2) + " ";
+			prettyHexString += copy.substring(2 * i, 2 * i + 2) + " ";
 		return prettyHexString.trim();
 	}