update Java version

Author: peteroupc

src/main/java/com/upokecenter/cbor/CBORObject.java

@@ -1051,7 +1051,7 @@ public static <TKey, TValue> CBORObject FromObject(Map<TKey,
      * specially handled by this method: null , primitive types, strings,
      * CBORObject , ExtendedDecimal , ExtendedFloat , ExtendedRational, the
      * custom BigInteger , lists, arrays, enumerations (<code>Enum</code>
-     * objects), and maps.<p>In the .NET version, if the object is a type
+     * objects), and maps. <p>In the .NET version, if the object is a type
      * not specially handled by this method, returns a CBOR map with the
      * values of each of its read/write properties (or all properties in the
      * case of an anonymous type). Properties are converted to their

src/main/java/com/upokecenter/util/BigInteger.java

@@ -944,24 +944,6 @@ public BigInteger[] divideAndRemainder(BigInteger divisor) {
         }
         return new BigInteger[] { bigquo, BigInteger.valueOf(smallRemainder) };
       }
-      if (this.wordCount == 2 && divisor.wordCount == 2 &&
-          (this.words[1] >> 15) != 0 && (divisor.words[1] >> 15) != 0) {
-        int a = ((int)this.words[0]) & 0xffff;
-        int b = ((int)divisor.words[0]) & 0xffff;
-        {
-          a |= (((int)this.words[1]) & 0xffff) << 16;
-          b |= (((int)divisor.words[1]) & 0xffff) << 16;
-          int quo = a / b;
-          if (this.negative) {
-            quo = -quo;
-          }
-          int rem = a - (b * quo);
-          BigInteger[] quotAndRem = new BigInteger[2];
-          quotAndRem[0] = BigInteger.valueOf(quo);
-          quotAndRem[1] = BigInteger.valueOf(rem);
-          return quotAndRem;
-        }
-      }
       words1Size += words1Size & 1;
       words2Size += words2Size & 1;
       short[] bigRemainderreg = new short[RoundupSize((int)words2Size)];

src/test/java/com/upokecenter/test/BigIntTest.java

@@ -15,10 +15,10 @@ public class BigIntTest {
     // Test some specific cases
     @Test
     public void TestSpecificCases() {
-      TestCommon.DoTestRemainder(
-        "-2472320648",
-        "2831812081",
-        "359491433");
+      TestCommon.DoTestDivide("2472320648", "2831812081", "0");
+      TestCommon.DoTestDivide("-2472320648", "2831812081", "0");
+      TestCommon.DoTestRemainder("2472320648", "2831812081", "2472320648");
+      TestCommon.DoTestRemainder("-2472320648", "2831812081", "-2472320648");
       TestCommon.DoTestMultiply(
 "39258416159456516340113264558732499166970244380745050",
 "39258416159456516340113264558732499166970244380745051",
@@ -47,11 +47,9 @@ public void TestToString() {
     @Test
     public void TestMultiplyDivide() {
       FastRandom r = new FastRandom();
-      for (int i = 0; i < 4000; ++i) {
+      for (int i = 0; i < 10000; ++i) {
         BigInteger bigintA = RandomObjects.RandomBigInteger(r);
         BigInteger bigintB = RandomObjects.RandomBigInteger(r);
-        bigintA = BigInteger.fromString("-2472320648");
-        bigintB = BigInteger.fromString("2831812081");
         // Test that A*B/A = B and A*B/B = A
         BigInteger bigintC = bigintA.multiply(bigintB);
         BigInteger bigintRem;
@@ -100,10 +98,7 @@ public void TestMultiplyDivide() {
 BigInteger[] divrem=(bigintA).divideAndRemainder(bigintB);
 bigintC = divrem[0];
 bigintRem = divrem[1]; }
-          System.out.println(bigintC);
-          System.out.println(bigintRem);
           bigintD = bigintB.multiply(bigintC);
-          System.out.println(bigintD);
           bigintD = bigintD.add(bigintRem);
           if (!bigintD.equals(bigintA)) {
             Assert.assertEquals("TestMultiplyDivide " + bigintA + "; " + bigintB,bigintA,bigintD);

src/test/java/com/upokecenter/test/CBORTest.java

@@ -1449,8 +1449,7 @@ public void TestRandomNonsense() {
                 throw new IllegalStateException("", ex);
               }
             } catch (CBORException ex) {
-              // Expected exception
-              System.out.print("");
+              System.out.print("");  // Expected exception
             }
           }
 }

src/test/java/com/upokecenter/test/TestCommon.java

@@ -83,12 +83,23 @@ public static void DoTestDivide(
       BigInteger bigintB = BigInteger.fromString(divisor);
       if (bigintB.signum() == 0) {
         try {
-          bigintA.divide(bigintB); Assert.fail("Expected divide by 0 error");
+          bigintA.divide(bigintB);
+          Assert.fail("Expected divide by 0 error");
         } catch (ArithmeticException ex) {
           System.out.println(ex.getMessage());
         }
+        try {
+ bigintA.divideAndRemainder(bigintB);
+Assert.fail("Should have failed");
+} catch (ArithmeticException ex) {
+System.out.print("");
+} catch (Exception ex) {
+ Assert.fail(ex.toString());
+throw new IllegalStateException("", ex);
+}
       } else {
         AssertBigIntegersEqual(result, bigintA.divide(bigintB));
+        AssertBigIntegersEqual(result, bigintA.divideAndRemainder(bigintB)[0]);
       }
     }
 
@@ -104,8 +115,18 @@ public static void DoTestRemainder(
         } catch (ArithmeticException ex) {
           System.out.println(ex.getMessage());
         }
+        try {
+ bigintA.divideAndRemainder(bigintB);
+Assert.fail("Should have failed");
+} catch (ArithmeticException ex) {
+System.out.print("");
+} catch (Exception ex) {
+ Assert.fail(ex.toString());
+throw new IllegalStateException("", ex);
+}
       } else {
         AssertBigIntegersEqual(result, bigintA.remainder(bigintB));
+        AssertBigIntegersEqual(result, bigintA.divideAndRemainder(bigintB)[1]);
       }
     }