summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-29 19:50:01 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-29 19:50:01 +0000
commitcee49d22e3ee4dfee233de27c6bfa46ec1c830df (patch)
treed7d6a25c991ccdfe5b8a6ddb180d71410417c0e0 /testing
parentede3c34635ce1867d36f1e0741b1d6369fa11db6 (diff)
downloadchromium_src-cee49d22e3ee4dfee233de27c6bfa46ec1c830df.zip
chromium_src-cee49d22e3ee4dfee233de27c6bfa46ec1c830df.tar.gz
chromium_src-cee49d22e3ee4dfee233de27c6bfa46ec1c830df.tar.bz2
Fix GTestMac.AssertNSEQ on Mac 64.
Switch to NSStrings; NSNumbers may be tagged pointers. BUG=244703 TEST=Mac 64 tester goes green Review URL: https://chromiumcodereview.appspot.com/15690016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202944 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing')
-rw-r--r--testing/gtest_mac_unittest.mm8
1 files changed, 4 insertions, 4 deletions
diff --git a/testing/gtest_mac_unittest.mm b/testing/gtest_mac_unittest.mm
index da3d555..9363b41 100644
--- a/testing/gtest_mac_unittest.mm
+++ b/testing/gtest_mac_unittest.mm
@@ -28,10 +28,10 @@ TEST(GTestMac, ExpectNSEQ) {
TEST(GTestMac, AssertNSEQ) {
base::mac::ScopedNSAutoreleasePool pool;
- NSNumber* n1 = [NSNumber numberWithInt:42];
- NSNumber* n2 = [NSNumber numberWithInt:42];
- EXPECT_NE(n1, n2);
- ASSERT_NSEQ(n1, n2);
+ NSString* s1 = [NSString stringWithUTF8String:"a"];
+ NSString* s2 = @"a";
+ EXPECT_NE(s1, s2);
+ ASSERT_NSEQ(s1, s2);
}
TEST(GTestMac, ExpectNSNE) {