commit 6951591806f46405564a6cb868a88d0daf6764d2
author Hans Boehm <hboehm@google.com> Thu Oct 01 16:07:56 2015 -0700
committer Hans Boehm <hboehm@google.com> Thu Oct 01 16:23:09 2015 -0700
tree 8329ed171f3cbbbe423b892666a7ec4ec798d969
parent 90cf66e539ffabc13db8a9cc524115f5fe849169

Fix factorial(0)

Bug: 24575798

Make factorial(0) return 1, as intended.
Add a few factorial tests.
Fix targetPackage spec so test is actually runnable again.

Change-Id: Ibb8d827f0325999c6b5ed49a939e1532ddf55639

src/com/android/calculator2/BoundedRational.java

diff --git a/src/com/android/calculator2/BoundedRational.java b/src/com/android/calculator2/BoundedRational.java
index 9d3e2a7..dc132f6 100644
--- a/src/com/android/calculator2/BoundedRational.java
+++ b/src/com/android/calculator2/BoundedRational.java
@@ -555,6 +555,9 @@
             }
             return prod1.multiply(prod2);
         } else {
+            if (n == 0) {
+                return BigInteger.ONE;
+            }
             BigInteger res = BigInteger.valueOf(n);
             for (long i = n - step; i > 1; i -= step) {
                 res = res.multiply(BigInteger.valueOf(i));

tests/AndroidManifest.xml

diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 62fe5c0..491603d 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -21,7 +21,7 @@
 
     <instrumentation
         android:name="android.test.InstrumentationTestRunner"
-        android:targetPackage="com.android.exactcalculator"
+        android:targetPackage="com.android.calculator2"
         android:label="BoundedRational and Calculator Functional Test" />
 
     <application>

tests/README.txt

diff --git a/tests/README.txt b/tests/README.txt
index 304766f..bfe35ca 100644
--- a/tests/README.txt
+++ b/tests/README.txt
@@ -4,7 +4,7 @@
 2) Install the calculator with
 adb install <tree root>/out/target/product/generic/data/app/ExactCalculator/ExactCalculator.apk
 3) adb install <tree root>/out/target/product/generic/data/app/ExactCalculatorTests/ExactCalculatorTests.apk
-4) adb shell am instrument -w com.android.exactcalculator.tests/android.test.InstrumentationTestRunner
+4) adb shell am instrument -w com.android.calculator2.tests/android.test.InstrumentationTestRunner
 
 There are three kinds of tests:
 

tests/src/com/android/calculator2/BRTest.java

diff --git a/tests/src/com/android/calculator2/BRTest.java b/tests/src/com/android/calculator2/BRTest.java
index 0163a0f..68214d0 100644
--- a/tests/src/com/android/calculator2/BRTest.java
+++ b/tests/src/com/android/calculator2/BRTest.java
@@ -151,6 +151,10 @@
                 "digitsRequired(-1/2)");
         check(BoundedRational.digitsRequired(new BoundedRational(1,-2)) == 1,
                 "digitsRequired(1/-2)");
+        check(BoundedRational.fact(BoundedRational.ZERO).equals(BoundedRational.ONE), "0!");
+        check(BoundedRational.fact(BoundedRational.ONE).equals(BoundedRational.ONE), "1!");
+        check(BoundedRational.fact(BoundedRational.TWO).equals(BoundedRational.TWO), "2!");
+        check(BoundedRational.fact(BR_15).equals(new BoundedRational(1307674368000L)), "15!");
         // We check values that include all interesting degree values.
         BoundedRational r = BR_M390;
         while (!r.equals(BR_390)) {