diff options
| -rw-r--r-- | testing/gtest_mac.mm | 4 | ||||
| -rw-r--r-- | testing/gtest_mac_unittest.mm | 10 |
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. +} |