Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(260)

Side by Side Diff: testing/gtest_mac_unittest.mm

Issue 2856383002: Roll googletest to 1.7.0+. (Closed)
Patch Set: Rebase to get past http://crrev.com/2789433004 Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « testing/gtest_mac.mm ('k') | third_party/.gitignore » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Note that while this file is in testing/ and tests GTest macros, it is built 5 // Note that while this file is in testing/ and tests GTest macros, it is built
6 // as part of Chromium's unit_tests target because the project does not build 6 // as part of Chromium's unit_tests target because the project does not build
7 // or run GTest's internal test suite. 7 // or run GTest's internal test suite.
8 8
9 #import "testing/gtest_mac.h" 9 #import "testing/gtest_mac.h"
10 10
11 #import <Foundation/Foundation.h> 11 #import <Foundation/Foundation.h>
12 12
13 #include "base/mac/scoped_nsautorelease_pool.h" 13 #include "base/mac/scoped_nsautorelease_pool.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 #include "testing/gtest/include/gtest/internal/gtest-port.h" 15 #include "third_party/googletest/src/googletest/include/gtest/internal/gtest-por t.h"
16 16
17 TEST(GTestMac, ExpectNSEQ) { 17 TEST(GTestMac, ExpectNSEQ) {
18 base::mac::ScopedNSAutoreleasePool pool; 18 base::mac::ScopedNSAutoreleasePool pool;
19 19
20 EXPECT_NSEQ(@"a", @"a"); 20 EXPECT_NSEQ(@"a", @"a");
21 21
22 NSString* s1 = [NSString stringWithUTF8String:"a"]; 22 NSString* s1 = [NSString stringWithUTF8String:"a"];
23 NSString* s2 = @"a"; 23 NSString* s2 = @"a";
24 EXPECT_NE(s1, s2); 24 EXPECT_NE(s1, s2);
25 EXPECT_NSEQ(s1, s2); 25 EXPECT_NSEQ(s1, s2);
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 EXPECT_NSNE(NSMakePoint(1, 2), NSMakePoint(3, 4)); 100 EXPECT_NSNE(NSMakePoint(1, 2), NSMakePoint(3, 4));
101 } 101 }
102 102
103 TEST(GTestMac, AssertNSNEPoint) { 103 TEST(GTestMac, AssertNSNEPoint) {
104 base::mac::ScopedNSAutoreleasePool pool; 104 base::mac::ScopedNSAutoreleasePool pool;
105 105
106 ASSERT_NSNE(NSMakePoint(1, 2), NSMakePoint(3, 4)); 106 ASSERT_NSNE(NSMakePoint(1, 2), NSMakePoint(3, 4));
107 } 107 }
108 108
109 #endif // !GTEST_OS_IOS 109 #endif // !GTEST_OS_IOS
OLDNEW
« no previous file with comments | « testing/gtest_mac.mm ('k') | third_party/.gitignore » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698