Update ArrayFuncsTest.java to JUnit-4.

diff --git a/src/nom/tam/util/test/ArrayFuncsTest.java b/src/nom/tam/util/test/ArrayFuncsTest.java
index df5efb0afe680b62849dc1ef98d0bb75e173eb8c..7ad8e5165f10bd9c543dc26b8b63af4e51b53537 100644 (file)
--- a/src/nom/tam/util/test/ArrayFuncsTest.java
+++ b/src/nom/tam/util/test/ArrayFuncsTest.java
@@ -6,6 +6,12 @@
  */\r
 package nom.tam.util.test;\r
 \r
+import org.junit.Test;\r
+import static org.junit.Assert.assertEquals;\r
+import static org.junit.Assert.assertTrue;\r
+import static org.junit.Assert.assertFalse;\r
+import static org.junit.Assert.assertSame;\r
+import static org.junit.Assert.assertNotSame;\r
 import junit.framework.*;\r
 import java.lang.reflect.*;\r
 import java.util.Arrays;\r
@@ -15,21 +21,12 @@ import nom.tam.util.ArrayFuncs;
  *\r
  * @author Thomas McGlynn\r
  */\r
-public class ArrayFuncsTest extends TestCase {\r
-\r
-    public ArrayFuncsTest(String testName) {\r
-        super(testName);\r
-    }\r
-\r
-    protected void setUp() throws Exception {\r
-    }\r
-\r
-    protected void tearDown() throws Exception {\r
-    }\r
+public class ArrayFuncsTest {\r
 \r
     /**\r
      * Test of computeSize method, of class nom.tam.util.ArrayFuncs.\r
      */\r
+    @Test\r
     public void testComputeSize() {\r
         System.out.println("computeSize");\r
 \r
@@ -58,6 +55,7 @@ public class ArrayFuncsTest extends TestCase {
     /**\r
      * Test of nElements method, of class nom.tam.util.ArrayFuncs.\r
      */\r
+    @Test\r
     public void testNElements() {\r
         System.out.println("nElements");\r
 \r
@@ -72,6 +70,7 @@ public class ArrayFuncsTest extends TestCase {
     /**\r
      * Test of deepClone method, of class nom.tam.util.ArrayFuncs.\r
      */\r
+    @Test\r
     public void testDeepClone() {\r
         int[][] test = {{0, 1}, {2, 3}, {4, 5}};\r
         int[][] result = (int[][]) nom.tam.util.ArrayFuncs.deepClone(test);\r
@@ -96,6 +95,7 @@ public class ArrayFuncsTest extends TestCase {
         }\r
 \r
         public boolean equals(Object x) {\r
+           System.out.println("checking equality");\r
             return (x instanceof CloneTest)\r
                     && (((CloneTest) x).value == this.value);\r
         }\r
@@ -104,6 +104,7 @@ public class ArrayFuncsTest extends TestCase {
     /**\r
      * Test of genericClone method, of class nom.tam.util.ArrayFuncs.\r
      */\r
+    @Test\r
     public void testGenericClone() {\r
         System.out.println("genericClone");\r
 \r
@@ -126,6 +127,7 @@ public class ArrayFuncsTest extends TestCase {
     /**\r
      * Test of copyArray method, of class nom.tam.util.ArrayFuncs.\r
      */\r
+    @Test\r
     public void testCopyArray() {\r
         System.out.println("copyArray");\r
 \r
@@ -138,6 +140,7 @@ public class ArrayFuncsTest extends TestCase {
     /**\r
      * Test of getDimensions method, of class nom.tam.util.ArrayFuncs.\r
      */\r
+    @Test\r
     public void testGetDimensions() {\r
         System.out.println("getDimensions");\r
 \r
@@ -157,6 +160,7 @@ public class ArrayFuncsTest extends TestCase {
     /**\r
      * Test of getBaseArray method, of class nom.tam.util.ArrayFuncs.\r
      */\r
+    @Test\r
     public void testGetBaseArray() {\r
 \r
         int[][][] test = new int[2][3][4];\r
@@ -169,6 +173,7 @@ public class ArrayFuncsTest extends TestCase {
     /**\r
      * Test of getBaseClass method, of class nom.tam.util.ArrayFuncs.\r
      */\r
+    @Test\r
     public void testGetBaseClass() {\r
         System.out.println("getBaseClass");\r
 \r
@@ -179,6 +184,7 @@ public class ArrayFuncsTest extends TestCase {
     /**\r
      * Test of getBaseLength method, of class nom.tam.util.ArrayFuncs.\r
      */\r
+    @Test\r
     public void testGetBaseLength() {\r
 \r
         assertEquals(ArrayFuncs.getBaseLength(new int[2][3]), 4);\r
@@ -195,6 +201,7 @@ public class ArrayFuncsTest extends TestCase {
     /**\r
      * Test of generateArray method, of class nom.tam.util.ArrayFuncs.\r
      */\r
+    @Test\r
     public void testGenerateArray() {\r
         System.out.println("generateArray");\r
 \r
@@ -213,6 +220,7 @@ public class ArrayFuncsTest extends TestCase {
     /**\r
      * Test of testPattern method, of class nom.tam.util.ArrayFuncs.\r
      */\r
+    @Test\r
     public void testTestPattern() {\r
         System.out.println("testPattern");\r
 \r
@@ -229,6 +237,7 @@ public class ArrayFuncsTest extends TestCase {
     /**\r
      * Test of flatten method, of class nom.tam.util.ArrayFuncs.\r
      */\r
+    @Test\r
     public void testFlatten() {\r
         System.out.println("flatten");\r
 \r
@@ -241,6 +250,7 @@ public class ArrayFuncsTest extends TestCase {
     /**\r
      * Test of curl method, of class nom.tam.util.ArrayFuncs.\r
      */\r
+    @Test\r
     public void testCurl() {\r
         System.out.println("curl");\r
 \r
@@ -259,6 +269,7 @@ public class ArrayFuncsTest extends TestCase {
     /**\r
      * Test of mimicArray method, of class nom.tam.util.ArrayFuncs.\r
      */\r
+    @Test\r
     public void testMimicArray() {\r
         System.out.println("mimicArray");\r
 \r
@@ -273,6 +284,7 @@ public class ArrayFuncsTest extends TestCase {
     /**\r
      * Test of convertArray method, of class nom.tam.util.ArrayFuncs.\r
      */\r
+    @Test\r
     public void testConvertArray() {\r
         System.out.println("convertArray");\r
 \r
@@ -286,7 +298,7 @@ public class ArrayFuncsTest extends TestCase {
 \r
         newType = int.class;\r
         int[][] ires = (int[][]) ArrayFuncs.convertArray(array, newType, true);\r
-        assertEquals(array, ires);\r
+        assertSame(array, ires);\r
 \r
         ires = (int[][]) ArrayFuncs.convertArray(array, newType, false);\r
         assertNotSame(array, ires);\r
@@ -296,6 +308,7 @@ public class ArrayFuncsTest extends TestCase {
     /**\r
      * Test of copyInto method, of class nom.tam.util.ArrayFuncs.\r
      */\r
+    @Test\r
     public void testCopyInto() {\r
         System.out.println("copyInto");\r
 \r
@@ -304,13 +317,14 @@ public class ArrayFuncsTest extends TestCase {
 \r
         ArrayFuncs.copyInto(x, y);\r
 \r
-        assertEquals((double) x[0][0], y[0][0]);\r
-        assertEquals((double) x[1][2], y[1][2]);\r
+        assertEquals((double) x[0][0], y[0][0], 0.01);\r
+        assertEquals((double) x[1][2], y[1][2], 0.01);\r
     }\r
 \r
     /**\r
      * Test of arrayEquals method, of class nom.tam.util.ArrayFuncs.\r
      */\r
+    @Test\r
     public void testArrayEquals() {\r
         System.out.println("arrayEquals");\r
 \r
@@ -331,6 +345,7 @@ public class ArrayFuncsTest extends TestCase {
     /**\r
      * Test of doubleArrayEquals method, of class nom.tam.util.ArrayFuncs.\r
      */\r
+    @Test\r
     public void testDoubleArrayEquals() {\r
 \r
         double x[] = {1, 2, 3};\r
@@ -349,6 +364,7 @@ public class ArrayFuncsTest extends TestCase {
     /**\r
      * Test of floatArrayEquals method, of class nom.tam.util.ArrayFuncs.\r
      */\r
+    @Test\r
     public void testFloatArrayEquals() {\r
         float x[] = {1f, 2f, 3f};\r
         float y[] = {1f, 2f, 3f};\r