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

Side by Side Diff: testing/gtest_mac.h

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/include/gtest/gtest_prod.h ('k') | testing/gtest_mac.mm » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #ifndef TESTING_GTEST_MAC_H_ 5 #ifndef TESTING_GTEST_MAC_H_
6 #define TESTING_GTEST_MAC_H_ 6 #define TESTING_GTEST_MAC_H_
7 7
8 #include <gtest/internal/gtest-port.h> 8 #include "testing/gtest/include/gtest/gtest.h"
9 #include <gtest/gtest.h> 9 #include "third_party/googletest/src/googletest/include/gtest/internal/gtest-por t.h"
10 10
11 #ifdef GTEST_OS_MAC 11 #ifdef GTEST_OS_MAC
12 12
13 #import <Foundation/Foundation.h> 13 #import <Foundation/Foundation.h>
14 14
15 namespace testing { 15 namespace testing {
16 namespace internal { 16 namespace internal {
17 17
18 // This overloaded version allows comparison between ObjC objects that conform 18 // This overloaded version allows comparison between ObjC objects that conform
19 // to the NSObject protocol. Used to implement {ASSERT|EXPECT}_NSEQ(). 19 // to the NSObject protocol. Used to implement {ASSERT|EXPECT}_NSEQ().
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperNSNE, val1, val2) 71 EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperNSNE, val1, val2)
72 72
73 #define ASSERT_NSEQ(expected, actual) \ 73 #define ASSERT_NSEQ(expected, actual) \
74 ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperNSEQ, expected, actual) 74 ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperNSEQ, expected, actual)
75 #define ASSERT_NSNE(val1, val2) \ 75 #define ASSERT_NSNE(val1, val2) \
76 ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperNSNE, val1, val2) 76 ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperNSNE, val1, val2)
77 77
78 #endif // GTEST_OS_MAC 78 #endif // GTEST_OS_MAC
79 79
80 #endif // TESTING_GTEST_MAC_H_ 80 #endif // TESTING_GTEST_MAC_H_
OLDNEW
« no previous file with comments | « testing/gtest/include/gtest/gtest_prod.h ('k') | testing/gtest_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698