From ab9bded8a665cccbf41ed99ee48d32418e1a8ed5 Mon Sep 17 00:00:00 2001
From: Enrique Zamudio <alterbass@gmail.com>
Date: Tue, 23 Apr 2013 11:22:48 -0500
Subject: [PATCH] Update test code

---
 src/test/java/j8583/TestBinaries.java | 16 ++++++++--------
 src/test/java/j8583/TestHexCodec.java |  3 +--
 src/test/java/j8583/TestParsing.java  |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/test/java/j8583/TestBinaries.java b/src/test/java/j8583/TestBinaries.java
index 76a40b7..7ec47cd 100644
--- a/src/test/java/j8583/TestBinaries.java
+++ b/src/test/java/j8583/TestBinaries.java
@@ -16,8 +16,8 @@ import com.solab.iso8583.util.HexCodec;
 /** Test binary message encoding and binary fields. */
 public class TestBinaries {
 
-	private MessageFactory mfactAscii = new MessageFactory();
-	private MessageFactory mfactBin = new MessageFactory();
+	private MessageFactory<IsoMessage> mfactAscii = new MessageFactory<IsoMessage>();
+	private MessageFactory<IsoMessage> mfactBin = new MessageFactory<IsoMessage>();
 
 	@Before
 	public void setup() throws IOException {
@@ -35,26 +35,26 @@ public class TestBinaries {
 		Assert.assertEquals(new BigDecimal("1234.00"), m.getObjectValue(4));
 		Assert.assertTrue("No field 7!", m.hasField(7));
 		Assert.assertEquals("Wrong trace", "000123", m.getField(11).toString());
-		byte[] buf = (byte[])m.getObjectValue(41);
+		byte[] buf = m.getObjectValue(41);
 		byte[] exp = new byte[]{ (byte)0xab, (byte)0xcd, (byte)0xef, 0, 0, 0, 0, 0};
 		Assert.assertEquals("Field 41 wrong length", 8, buf.length);
 		Assert.assertArrayEquals("Field 41 wrong value", exp, buf);
-		buf = (byte[])m.getObjectValue(42);
+		buf = m.getObjectValue(42);
 		exp = new byte[]{ (byte)0x0a, (byte)0xbc, (byte)0xde, 0 };
 		Assert.assertEquals("field 42 wrong length", 4, buf.length);
 		Assert.assertArrayEquals("Field 42 wrong value", exp, buf);
 		Assert.assertTrue(((String)m.getObjectValue(43)).startsWith("Field of length 40"));
-		buf = (byte[])m.getObjectValue(62);
+		buf = m.getObjectValue(62);
 		exp = new byte[]{ 1, (byte)0x23, (byte)0x45, (byte)0x67, (byte)0x89, (byte)0xab, (byte)0xcd, (byte)0xef,
 				0x62, 1, (byte)0x23, (byte)0x45, (byte)0x67, (byte)0x89, (byte)0xab, (byte)0xcd };
 		Assert.assertArrayEquals(exp, buf);
-		buf = (byte[])m.getObjectValue(64);
+		buf = m.getObjectValue(64);
         exp[8] = 0x64;
 		Assert.assertArrayEquals(exp, buf);
-		buf = (byte[])m.getObjectValue(63);
+		buf = m.getObjectValue(63);
 		exp = new byte[]{ 0, (byte)0x12, (byte)0x34, (byte)0x56, (byte)0x78, (byte)0x63 };
 		Assert.assertArrayEquals(exp, buf);
-		buf = (byte[])m.getObjectValue(65);
+		buf = m.getObjectValue(65);
         exp[5] = 0x65;
 		Assert.assertArrayEquals(exp, buf);
 	}
diff --git a/src/test/java/j8583/TestHexCodec.java b/src/test/java/j8583/TestHexCodec.java
index 33c7b17..592fc42 100644
--- a/src/test/java/j8583/TestHexCodec.java
+++ b/src/test/java/j8583/TestHexCodec.java
@@ -1,7 +1,6 @@
 package j8583;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 import com.solab.iso8583.util.HexCodec;
diff --git a/src/test/java/j8583/TestParsing.java b/src/test/java/j8583/TestParsing.java
index 7251b7a..34a6c61 100644
--- a/src/test/java/j8583/TestParsing.java
+++ b/src/test/java/j8583/TestParsing.java
@@ -7,7 +7,7 @@ import java.text.ParseException;
 import com.solab.iso8583.IsoMessage;
 import com.solab.iso8583.IsoValue;
 import com.solab.iso8583.parse.NumericParseInfo;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;