Fix incorrect test.
Bug: 136974947
Change-Id: Ibc2c024fc4fbd37b510a9f9cf04c404573729add
diff --git a/src/test/java/com/android/tools/r8/shaking/definitelynull/DefinitelyNullTest.java b/src/test/java/com/android/tools/r8/shaking/definitelynull/DefinitelyNullTest.java
index b33b0c7..c736dc1 100644
--- a/src/test/java/com/android/tools/r8/shaking/definitelynull/DefinitelyNullTest.java
+++ b/src/test/java/com/android/tools/r8/shaking/definitelynull/DefinitelyNullTest.java
@@ -17,7 +17,7 @@
@RunWith(Parameterized.class)
public class DefinitelyNullTest extends TestBase {
- static final String EXPECTED = StringUtils.lines("false", "call: NPE");
+ static final String EXPECTED = StringUtils.lines("value: null", "null: true", "call: NPE");
private final TestParameters parameters;
@@ -57,7 +57,6 @@
// Prepend the full definition of class A since the compiler will have mostly eliminated it.
.addRunClasspathFiles(classpath)
.run(parameters.getRuntime(), TestClass.class)
- // TODO(b/136974947): Should print "true" then "call: NPE".
.assertSuccessWithOutput(EXPECTED);
}
}
diff --git a/src/test/java/com/android/tools/r8/shaking/definitelynull/TestClass.java b/src/test/java/com/android/tools/r8/shaking/definitelynull/TestClass.java
index b24441d..76e1403 100644
--- a/src/test/java/com/android/tools/r8/shaking/definitelynull/TestClass.java
+++ b/src/test/java/com/android/tools/r8/shaking/definitelynull/TestClass.java
@@ -17,7 +17,8 @@
public static void main(String[] args) throws ReflectiveOperationException {
// There are no visible instantiations of A, so the value of 'a' is concluded to be 'null'.
A a = getInstance();
- System.out.println("null: " + a == null); // This is expected to print 'true'.
+ System.out.println("value: " + a);
+ System.out.println("null: " + (a == null)); // This is expected to print 'true'.
try {
System.out.println("call: " + a.foo()); // This is expected to throw due to null receiver.
} catch (NullPointerException e) {
