# HG changeset patch # User smarks # Date 1522305834 25200 # Node ID ed0bfd119607762220872ffd138b6674b6a5aa27 # Parent 44f4a81c3b962896b99e29dfe7704706d03aa3c1 add test for equality with non-optional diff -r 44f4a81c3b96 -r ed0bfd119607 test/jdk/java/util/Optional/Basic.java --- a/test/jdk/java/util/Optional/Basic.java Wed Mar 28 15:24:53 2018 -0700 +++ b/test/jdk/java/util/Optional/Basic.java Wed Mar 28 23:43:54 2018 -0700 @@ -62,8 +62,10 @@ void checkEmpty(Optional empty) { assertTrue(empty.equals(Optional.empty())); assertTrue(Optional.empty().equals(empty)); - assertFalse(empty.equals(Optional.of(""))); - assertFalse(Optional.of("").equals(empty)); + assertFalse(empty.equals(Optional.of("unexpected"))); + assertFalse(Optional.of("unexpected").equals(empty)); + assertFalse(empty.equals("unexpected")); + assertFalse(empty.isPresent()); assertEquals(empty.hashCode(), 0); assertEquals(empty.orElse("x"), "x"); @@ -97,6 +99,8 @@ assertTrue(Optional.of(expected).equals(opt)); assertFalse(opt.equals(Optional.of("unexpected"))); assertFalse(Optional.of("unexpected").equals(opt)); + assertFalse(opt.equals("unexpected")); + assertTrue(opt.isPresent()); assertEquals(opt.hashCode(), expected.hashCode()); assertEquals(opt.orElse("unexpected"), expected);