--- MutableIntTest.java	Thu Aug  6 19:31:58 2009
+++ MutableLongTest.java	Thu Aug  6 19:32:10 2009
@@ -23,12 +23,12 @@
 /**
  * JUnit tests.
  * 
- * @version $Id: MutableIntTest.java 161244 2005-04-14 06:16:36Z ggregory $
- * @see MutableInt
+ * @version $Id: MutableLongTest.java 161244 2005-04-14 06:16:36Z ggregory $
+ * @see MutableLong
  */
-public class MutableIntTest extends TestCase {
+public class MutableLongTest extends TestCase {
 
-    public MutableIntTest(String testName) {
+    public MutableLongTest(String testName) {
         super(testName);
     }
 
@@ -37,39 +37,39 @@
     }
 
     public static Test suite() {
-        return new TestSuite(MutableIntTest.class);
+        return new TestSuite(MutableLongTest.class);
     }
 
     // ----------------------------------------------------------------
     public void testConstructors() {
-        assertEquals(0, new MutableInt().intValue());
+        assertEquals(0, new MutableLong().longValue());
         
-        assertEquals(1, new MutableInt(1).intValue());
+        assertEquals(1, new MutableLong(1).longValue());
         
-        assertEquals(2, new MutableInt(new Integer(2)).intValue());
-        assertEquals(3, new MutableInt(new MutableLong(3)).intValue());
+        assertEquals(2, new MutableLong(new Long(2)).longValue());
+        assertEquals(3, new MutableLong(new MutableLong(3)).longValue());
         try {
-            new MutableInt(null);
+            new MutableLong(null);
             fail();
         } catch (NullPointerException ex) {}
     }
 
     public void testGetSet() {
-        final MutableInt mutNum = new MutableInt(0);
-        assertEquals(0, new MutableInt().intValue());
-        assertEquals(new Integer(0), new MutableInt().getValue());
+        final MutableLong mutNum = new MutableLong(0);
+        assertEquals(0, new MutableLong().longValue());
+        assertEquals(new Long(0), new MutableLong().getValue());
         
         mutNum.setValue(1);
-        assertEquals(1, mutNum.intValue());
-        assertEquals(new Integer(1), mutNum.getValue());
+        assertEquals(1, mutNum.longValue());
+        assertEquals(new Long(1), mutNum.getValue());
         
-        mutNum.setValue(new Integer(2));
-        assertEquals(2, mutNum.intValue());
-        assertEquals(new Integer(2), mutNum.getValue());
+        mutNum.setValue(new Long(2));
+        assertEquals(2, mutNum.longValue());
+        assertEquals(new Long(2), mutNum.getValue());
         
         mutNum.setValue(new MutableLong(3));
-        assertEquals(3, mutNum.intValue());
-        assertEquals(new Integer(3), mutNum.getValue());
+        assertEquals(3, mutNum.longValue());
+        assertEquals(new Long(3), mutNum.getValue());
         try {
             mutNum.setValue(null);
             fail();
@@ -81,9 +81,9 @@
     }
 
     public void testEquals() {
-        final MutableInt mutNumA = new MutableInt(0);
-        final MutableInt mutNumB = new MutableInt(0);
-        final MutableInt mutNumC = new MutableInt(1);
+        final MutableLong mutNumA = new MutableLong(0);
+        final MutableLong mutNumB = new MutableLong(0);
+        final MutableLong mutNumC = new MutableLong(1);
 
         assertEquals(true, mutNumA.equals(mutNumA));
         assertEquals(true, mutNumA.equals(mutNumB));
@@ -93,33 +93,33 @@
         assertEquals(false, mutNumB.equals(mutNumC));
         assertEquals(true, mutNumC.equals(mutNumC));
         assertEquals(false, mutNumA.equals(null));
-        assertEquals(false, mutNumA.equals(new Integer(0)));
+        assertEquals(false, mutNumA.equals(new Long(0)));
         assertEquals(false, mutNumA.equals("0"));
     }
 
     public void testHashCode() {
-        final MutableInt mutNumA = new MutableInt(0);
-        final MutableInt mutNumB = new MutableInt(0);
-        final MutableInt mutNumC = new MutableInt(1);
+        final MutableLong mutNumA = new MutableLong(0);
+        final MutableLong mutNumB = new MutableLong(0);
+        final MutableLong mutNumC = new MutableLong(1);
 
         assertEquals(true, mutNumA.hashCode() == mutNumA.hashCode());
         assertEquals(true, mutNumA.hashCode() == mutNumB.hashCode());
         assertEquals(false, mutNumA.hashCode() == mutNumC.hashCode());
-        assertEquals(true, mutNumA.hashCode() == new Integer(0).hashCode());
+        assertEquals(true, mutNumA.hashCode() == new Long(0).hashCode());
     }
 
     public void testCompareTo() {
-        final MutableInt mutNum = new MutableInt(0);
+        final MutableLong mutNum = new MutableLong(0);
 
-        assertEquals(0, mutNum.compareTo(new MutableInt(0)));
-        assertEquals(+1, mutNum.compareTo(new MutableInt(-1)));
-        assertEquals(-1, mutNum.compareTo(new MutableInt(1)));
+        assertEquals(0, mutNum.compareTo(new MutableLong(0)));
+        assertEquals(+1, mutNum.compareTo(new MutableLong(-1)));
+        assertEquals(-1, mutNum.compareTo(new MutableLong(1)));
         try {
             mutNum.compareTo(null);
             fail();
         } catch (NullPointerException ex) {}
         try {
-            mutNum.compareTo(new Integer(0));
+            mutNum.compareTo(new Long(0));
             fail();
         } catch (ClassCastException ex) {}
         try {
@@ -129,19 +129,20 @@
     }
 
     public void testPrimitiveValues() {
-        MutableInt mutNum = new MutableInt(1);
-        
-        assertEquals( (byte) 1, mutNum.byteValue() );
-        assertEquals( (short) 1, mutNum.shortValue() );
+        MutableLong mutNum = new MutableLong(1L);
+
         assertEquals( 1.0F, mutNum.floatValue(), 0 );
         assertEquals( 1.0, mutNum.doubleValue(), 0 );
+        assertEquals( (byte) 1, mutNum.byteValue() );
+        assertEquals( (short) 1, mutNum.shortValue() );
+        assertEquals( 1, mutNum.intValue() );
         assertEquals( 1L, mutNum.longValue() );
     }
 
     public void testToString() {
-        assertEquals("0", new MutableInt(0).toString());
-        assertEquals("10", new MutableInt(10).toString());
-        assertEquals("-123", new MutableInt(-123).toString());
+        assertEquals("0", new MutableLong(0).toString());
+        assertEquals("10", new MutableLong(10).toString());
+        assertEquals("-123", new MutableLong(-123).toString());
     }
 
 }
