svn commit: r1301753 - /commons/sandbox/flatfile/trunk/src/test/java/org/apache/commons/flatfile/DynamicFieldTest.java

[mb...@apache.org]

Author: mbenson
Date: Fri Mar 16 20:49:23 2012
New Revision: 1301753

URL: http://svn.apache.org/viewvc?rev=1301753&view=rev
Log:
use junit's provided array equality checks, after having upgraded

Modified:
    commons/sandbox/flatfile/trunk/src/test/java/org/apache/commons/flatfile/DynamicFieldTest.java

Modified: commons/sandbox/flatfile/trunk/src/test/java/org/apache/commons/flatfile/DynamicFieldTest.java
URL: http://svn.apache.org/viewvc/commons/sandbox/flatfile/trunk/src/test/java/org/apache/commons/flatfile/DynamicFieldTest.java?rev=1301753&r1=1301752&r2=1301753&view=diff
==============================================================================
--- commons/sandbox/flatfile/trunk/src/test/java/org/apache/commons/flatfile/DynamicFieldTest.java (original)
+++ commons/sandbox/flatfile/trunk/src/test/java/org/apache/commons/flatfile/DynamicFieldTest.java Fri Mar 16 20:49:23 2012
@@ -16,6 +16,7 @@
  */
 package org.apache.commons.flatfile;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -216,40 +217,6 @@ public class DynamicFieldTest extends En
         return (DynamicField) entityFactory.getEntity(name);
     }
 
-    /**
-     * Detailed comparison
-     * @param a
-     * @param b
-     */
-    private void assertArrayEquals(byte[] a, byte[] b) {
-        if (a != b) {
-            if (a == null || b == null) {
-                fail();
-            }
-            assertEquals(a.length, b.length);
-            byte[] checkA = new byte[BUFFER_SIZE];
-            byte[] checkB = new byte[BUFFER_SIZE];
-            int cur = 0;
-            while (cur < a.length) {
-                int len = Math.min(BUFFER_SIZE, a.length - cur);
-                System.arraycopy(a, cur, checkA, 0, len);
-                System.arraycopy(b, cur, checkB, 0, len);
-                if (len < BUFFER_SIZE) {
-                    Arrays.fill(checkA, len, BUFFER_SIZE, (byte) 0);
-                    Arrays.fill(checkB, len, BUFFER_SIZE, (byte) 0);
-                }
-                if (!Arrays.equals(checkA, checkB)) {
-                    String stringA = new String(checkA, 0, len);
-                    String stringB = new String(checkB, 0, len);
-                    fail("difference in (" + cur + " - " + (cur + len - 1)
-                            + "); expected \"" + stringA + "\" but was \""
-                            + stringB + "\"");
-                }
-                cur += len;
-            }
-        }
-    }
-
     protected String getSource() {
         return "dynamicField.test";
     }