commit eb2a20586d32c4a89d10e03f5f621cd8f425b8ea
author Jake Wharton <jakew@google.com> Thu Sep 19 16:19:47 2019 -0400
committer Jake Wharton <jakew@google.com> Fri Sep 20 13:07:42 2019 +0000
tree b1cc67596c319f2af7a28614f908ca1dae86a7ea
parent 293b81553f1fcbb5b51d92d7e951016850349412

Remove some @IgnoreInvokes in favor of specific ignores

Test: tools/test.py --dex_vm all --no-internal -v *Backport*Test*
Change-Id: I4fdf9c39e350ea0001df392ee519c0b99f4e24e8

src/test/java/com/android/tools/r8/desugar/backports/MathBackportTest.java

diff --git a/src/test/java/com/android/tools/r8/desugar/backports/MathBackportTest.java b/src/test/java/com/android/tools/r8/desugar/backports/MathBackportTest.java
index 8edfa56..cbde5a7 100644
--- a/src/test/java/com/android/tools/r8/desugar/backports/MathBackportTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/backports/MathBackportTest.java
@@ -20,6 +20,7 @@
   public MathBackportTest(TestParameters parameters) {
     super(parameters, Math.class, Main.class);
     registerTarget(AndroidApiLevel.N, 97);
+    ignoreInvokes("nextAfter");  // Available in API 9, used to test nextDown.
   }
 
   static final class Main extends MiniAssert {
@@ -240,7 +241,7 @@
           -0.1d, 0.1d,
       };
       for (double interestingValue : interestingValues) {
-        assertEquals(nextAfter(interestingValue, Double.NEGATIVE_INFINITY),
+        assertEquals(Math.nextAfter(interestingValue, Double.NEGATIVE_INFINITY),
             Math.nextDown(interestingValue));
       }
     }
@@ -258,7 +259,7 @@
           -0.1f, 0.1f,
       };
       for (float interestingValue : interestingValues) {
-        assertEquals(nextAfter(interestingValue, Float.NEGATIVE_INFINITY),
+        assertEquals(Math.nextAfter(interestingValue, Float.NEGATIVE_INFINITY),
             Math.nextDown(interestingValue));
       }
     }
@@ -311,15 +312,5 @@
       } catch (ArithmeticException expected) {
       }
     }
-
-    @IgnoreInvokes
-    private static double nextAfter(double value, double direction) {
-      return Math.nextAfter(value, direction);
-    }
-
-    @IgnoreInvokes
-    private static double nextAfter(float value, float direction) {
-      return Math.nextAfter(value, direction);
-    }
   }
 }

src/test/java/com/android/tools/r8/desugar/backports/StrictMathBackportTest.java

diff --git a/src/test/java/com/android/tools/r8/desugar/backports/StrictMathBackportTest.java b/src/test/java/com/android/tools/r8/desugar/backports/StrictMathBackportTest.java
index 5805764..915a6fb 100644
--- a/src/test/java/com/android/tools/r8/desugar/backports/StrictMathBackportTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/backports/StrictMathBackportTest.java
@@ -20,6 +20,7 @@
   public StrictMathBackportTest(TestParameters parameters) {
     super(parameters, StrictMath.class, Main.class);
     registerTarget(AndroidApiLevel.N, 75);
+    ignoreInvokes("nextAfter");  // Available in API 9, used to test nextDown.
   }
 
   static final class Main extends MiniAssert {
@@ -170,7 +171,7 @@
           -0.1d, 0.1d,
       };
       for (double interestingValue : interestingValues) {
-        assertEquals(nextAfter(interestingValue, Double.NEGATIVE_INFINITY),
+        assertEquals(StrictMath.nextAfter(interestingValue, Double.NEGATIVE_INFINITY),
             StrictMath.nextDown(interestingValue));
       }
     }
@@ -188,7 +189,7 @@
           -0.1f, 0.1f,
       };
       for (float interestingValue : interestingValues) {
-        assertEquals(nextAfter(interestingValue, Float.NEGATIVE_INFINITY),
+        assertEquals(StrictMath.nextAfter(interestingValue, Float.NEGATIVE_INFINITY),
             StrictMath.nextDown(interestingValue));
       }
     }
@@ -241,15 +242,5 @@
       } catch (ArithmeticException expected) {
       }
     }
-
-    @IgnoreInvokes
-    private static double nextAfter(double value, double direction) {
-      return StrictMath.nextAfter(value, direction);
-    }
-
-    @IgnoreInvokes
-    private static double nextAfter(float value, float direction) {
-      return StrictMath.nextAfter(value, direction);
-    }
   }
 }