Remove the new addition test

Author: Jochen Buchholz

src/main/java/org/javamoney/moneta/FastMoney.java

@@ -365,24 +365,20 @@ private long addExact(long num1, long num2) {
         if(num2==0){
             return num1;
         }
-//        boolean pos = num1>0 && num2 >0;
-//        boolean neg = num1<0 && num2 <0;
-        int lz1 = Long.numberOfLeadingZeros(num1);
-        int lz2 = Long.numberOfLeadingZeros(num2);
+        boolean pos = num1>0 && num2 >0;
+        boolean neg = num1<0 && num2 <0;
         long exact = num1 + num2;
-        if(lz1>2 && lz2>2){
-          return exact;
-        }
+
+//        if((num1 ^ num2) >= 0 & (num1 ^ exact) < 0){
+//        	throw new ArithmeticException("Long evaluation overflow.");
+//        }
 
-        if(exact-num1 != num2){
-        	throw new ArithmeticException("Long evaluation overflow.");
+        if(pos && exact <=0){
+            throw new ArithmeticException("Long evaluation positive overflow.");
+        }
+        if(neg && exact >=0){
+            throw new ArithmeticException("Long evaluation negative overflow.");
         }
-//        if(pos && exact <=0){
-//            throw new ArithmeticException("Long evaluation positive overflow.");
-//        }
-//        if(neg && exact >=0){
-//            throw new ArithmeticException("Long evaluation negative overflow.");
-//        }
         return exact;
     }
 

src/test/java/org/javamoney/moneta/FastMoneyTest.java

@@ -15,25 +15,33 @@
  */
 package org.javamoney.moneta;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNotSame;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.lang.invoke.MethodHandles;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import javax.money.CurrencyUnit;
 import javax.money.Monetary;
 import javax.money.MonetaryAmount;
 import javax.money.MonetaryOperator;
 import javax.money.MonetaryQuery;
-import javax.money.NumberValue;
 
 import org.junit.Assert;
 import org.testng.annotations.Test;
 
-import java.io.*;
-import java.lang.invoke.MethodHandles;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import static org.testng.Assert.*;
-
 /**
  * @author Anatole
  */
@@ -282,25 +290,28 @@ public void testAdd(){
         assertNotNull(moneyResult);
         assertEquals(11d, moneyResult.getNumber().doubleValue(), 0d);
 
-        // This example produce a false positive
+        // This example produce a false positive in the old version
         money1 = FastMoney.of(44474249632057L, EURO);
         money2 = FastMoney.of(72913073429160L, EURO);
-        moneyResult = money1.add(money2);
-        assertNotNull(moneyResult);
-        assertEquals(money1, moneyResult.subtract(money2));
-        // Values greater   92233720368547.75807 not allowed, but we got no long overflow
+
+        try {
+            moneyResult = money1.add(money2); 
+            fail("overflow should raise ArithmeticException");
+        } catch (ArithmeticException e) {
+            // should happen
+        }
+        
+        // check greates    92233720368547.75807 value
         long fastMoneyMax = 92233720368547L;
 		FastMoney money3 = FastMoney.of(fastMoneyMax, "CHF");
-        money1=money3.add(money3);
-        assertEquals(money1, money3.multiply(2));
 
-//        try {
-//            // the maximum value for FastMoney is 92233720368547.75807 so this should overflow
-//            money3.add(money3);
-//            fail("overflow should raise ArithmeticException");
-//        } catch (ArithmeticException e) {
-//            // should happen
-//        }
+        try {
+            // the maximum value for FastMoney is 92233720368547.75807 so this should overflow
+            money3.add(money3);
+            fail("overflow should raise ArithmeticException");
+        } catch (ArithmeticException e) {
+            // should happen
+        }
     }
 
     /**