[Mac] Better handling of nil for testing macros.

EXPECT_NSEQ() and EXPECT_NSNE() were implemented in terms of [x
isEqual:y].  This meant that EXPECT_NSEQ(nil, nil) failed, and
EXPECT_NSNE(nil, nil) succeeded.  Add additional tests against the raw
pointers to resolve this.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/4697004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65710 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 12 insertions, 2 deletions

diff --git a/testing/gtest_mac.mm b/testing/gtest_mac.mm
index 3caacdf..94c9a20 100644
--- a/testing/gtest_mac.mm
+++ b/testing/gtest_mac.mm
@@ -21,7 +21,7 @@ GTEST_API_ AssertionResult CmpHelperNSEQ(const char* expected_expression,
                                          const char* actual_expression,
                                          id<NSObject> expected,
                                          id<NSObject> actual) {
-  if ([expected isEqual:actual]) {
+  if (expected == actual || [expected isEqual:actual]) {
     return AssertionSuccess();
   }
   return EqFailure(expected_expression,
@@ -37,7 +37,7 @@ GTEST_API_ AssertionResult CmpHelperNSNE(const char* expected_expression,
                                          const char* actual_expression,
                                          id<NSObject> expected,
                                          id<NSObject> actual) {
-  if (![expected isEqual:actual]) {
+  if (expected != actual && ![expected isEqual:actual]) {
     return AssertionSuccess();
   }
   Message msg;
diff --git a/testing/gtest_mac_unittest.mm b/testing/gtest_mac_unittest.mm
index c5bc47f..1376ed1 100644
--- a/testing/gtest_mac_unittest.mm
+++ b/testing/gtest_mac_unittest.mm
@@ -45,3 +45,13 @@ TEST(GTestMac, AssertNSNE) {
 
   ASSERT_NSNE(@"a", @"b");
 }
+
+TEST(GTestMac, ExpectNSNil) {
+  base::mac::ScopedNSAutoreleasePool pool;
+
+  EXPECT_NSEQ(nil, nil);
+  EXPECT_NSNE(nil, @"a");
+  EXPECT_NSNE(@"a", nil);
+
+  // TODO(shess): Test that EXPECT_NSNE(nil, nil) fails.
+}