Add backport test for Objects.requireNonNull
Currently this is rewritten by CodeRewriter, but it's tested here as well for completeness.
Test: tools/test.py --no-internal -v *Backport*Test*
Change-Id: Iec0cb2d1d17a89d80b7332d09fe96e7e0baf3cef
diff --git a/src/test/java/com/android/tools/r8/desugar/backports/ObjectsBackportTest.java b/src/test/java/com/android/tools/r8/desugar/backports/ObjectsBackportTest.java
index 9c6405c..74aec20 100644
--- a/src/test/java/com/android/tools/r8/desugar/backports/ObjectsBackportTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/backports/ObjectsBackportTest.java
@@ -22,8 +22,8 @@
public ObjectsBackportTest(TestParameters parameters) {
super(parameters, Objects.class, Main.class);
- registerTarget(AndroidApiLevel.N, 57);
- registerTarget(AndroidApiLevel.K, 53);
+ registerTarget(AndroidApiLevel.N, 59);
+ registerTarget(AndroidApiLevel.K, 55);
}
static final class Main extends MiniAssert {
@@ -37,6 +37,7 @@
testNonNull();
testToString();
testToStringOrDefault();
+ testRequireNonNull();
testRequireNonNullOrMessage();
}
@@ -209,6 +210,16 @@
}, "null default"));
}
+ private static void testRequireNonNull() {
+ Object o = new Object();
+ assertSame(o, Objects.requireNonNull(o));
+
+ try {
+ throw new AssertionError(Objects.requireNonNull(null));
+ } catch (NullPointerException expected) {
+ }
+ }
+
private static void testRequireNonNullOrMessage() {
Object o = new Object();
assertSame(o, Objects.requireNonNull(o, "unexpected"));