[gwt-contrib] Change in gwt[master]: Failing tests for java.util.Objects

[Thomas Broyer]

Thomas Broyer has submitted this change and it was merged.
Change subject: Failing tests for java.util.Objects
......................................................................


Failing tests for java.util.Objects

Fixes issue 8193

Change-Id: I394c80559ce4e872826f832f0aca24fcd0e156ba
---
M user/super/com/google/gwt/emul/java/util/Objects.java
M user/test/com/google/gwt/emultest/java/util/ObjectsTest.java
2 files changed, 7 insertions(+), 9 deletions(-)

Approvals:
  Leeroy Jenkins: Verified
  Thomas Broyer: Looks good to me, approved



diff --git a/user/super/com/google/gwt/emul/java/util/Objects.java  
b/user/super/com/google/gwt/emul/java/util/Objects.java
index ca0f5e1..ec5e9a4 100644
--- a/user/super/com/google/gwt/emul/java/util/Objects.java
+++ b/user/super/com/google/gwt/emul/java/util/Objects.java
@@ -29,7 +29,13 @@
   }

   public static boolean deepEquals(Object a, Object b) {
-    if (equals(a, b)) {
+    if (a == b) {
+      return true;
+    }
+    if (a == null || b == null) {
+      return false;
+    }
+    if (a.equals(b)) {
       return true;
     }

diff --git a/user/test/com/google/gwt/emultest/java/util/ObjectsTest.java  
b/user/test/com/google/gwt/emultest/java/util/ObjectsTest.java
index 96cd788..f6416e2 100644
--- a/user/test/com/google/gwt/emultest/java/util/ObjectsTest.java
+++ b/user/test/com/google/gwt/emultest/java/util/ObjectsTest.java
@@ -82,14 +82,6 @@

     Object obj = new Object();
     assertTrue(Objects.equals(obj, obj));
-
-    assertFalse(Objects.equals(new Object() {
-      @Override
-      public boolean equals(Object other) {
-        fail("Shouldn't call equals if second argument is null");
-        return false;
-      }
-    }, null));
   }

   public void testHashCode() {

--
To view, visit https://gwt-review.googlesource.com/3400
To unsubscribe, visit https://gwt-review.googlesource.com/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I394c80559ce4e872826f832f0aca24fcd0e156ba
Gerrit-PatchSet: 1
Gerrit-Project: gwt
Gerrit-Branch: master
Gerrit-Owner: Andrey Korzhevskiy <a.korzhevs...@gmail.com>
Gerrit-Reviewer: Leeroy Jenkins <jenk...@gwtproject.org>
Gerrit-Reviewer: Matthew Dempsky <mdemp...@google.com>
Gerrit-Reviewer: Thomas Broyer <t.bro...@gmail.com>

--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
--- 
You received this message because you are subscribed to the Google Groups "GWT Contributors" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to google-web-toolkit-contributors+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.