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

Side by Side Diff: testing/gtest_mac.h

Issue 1211283003: Overload EXPECT_NSEQ to handle NSRect. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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 | « no previous file | 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 <gtest/internal/gtest-port.h>
9 #include <gtest/gtest.h> 9 #include <gtest/gtest.h>
10 10
(...skipping 11 matching lines...) Expand all
22 id<NSObject> expected, 22 id<NSObject> expected,
23 id<NSObject> actual); 23 id<NSObject> actual);
24 24
25 // This overloaded version allows comparison between ObjC objects that conform 25 // This overloaded version allows comparison between ObjC objects that conform
26 // to the NSObject protocol. Used to implement {ASSERT|EXPECT}_NE(). 26 // to the NSObject protocol. Used to implement {ASSERT|EXPECT}_NE().
27 GTEST_API_ AssertionResult CmpHelperNSNE(const char* expected_expression, 27 GTEST_API_ AssertionResult CmpHelperNSNE(const char* expected_expression,
28 const char* actual_expression, 28 const char* actual_expression,
29 id<NSObject> expected, 29 id<NSObject> expected,
30 id<NSObject> actual); 30 id<NSObject> actual);
31 31
32 // This overloaded version allows comparison between NSRect objects using
33 // NSEqualRects. Used to implement {ASSERT|EXPECT}_EQ().
tapted 2015/06/26 06:26:07 {ASSERT|EXPECT}_NSEQ?
jackhou1 2015/06/30 00:33:13 Done.
34 GTEST_API_ AssertionResult CmpHelperNSEQ(const char* expected_expression,
35 const char* actual_expression,
36 const NSRect& expected,
37 const NSRect& actual);
38
39 // This overloaded version allows comparison between NSRect objects using
40 // NSEqualRects. Used to implement {ASSERT|EXPECT}_EQ().
tapted 2015/06/26 06:26:07 EQ->NE or, probably, {ASSERT|EXPECT}_NSNE?
jackhou1 2015/06/30 00:33:13 Done.
41 GTEST_API_ AssertionResult CmpHelperNSNE(const char* expected_expression,
42 const char* actual_expression,
43 const NSRect& expected,
44 const NSRect& actual);
45
32 } // namespace internal 46 } // namespace internal
33 } // namespace testing 47 } // namespace testing
34 48
35 // Tests that [expected isEqual:actual]. 49 // Tests that [expected isEqual:actual].
36 #define EXPECT_NSEQ(expected, actual) \ 50 #define EXPECT_NSEQ(expected, actual) \
37 EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperNSEQ, expected, actual) 51 EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperNSEQ, expected, actual)
38 #define EXPECT_NSNE(val1, val2) \ 52 #define EXPECT_NSNE(val1, val2) \
39 EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperNSNE, val1, val2) 53 EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperNSNE, val1, val2)
40 54
41 #define ASSERT_NSEQ(expected, actual) \ 55 #define ASSERT_NSEQ(expected, actual) \
42 ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperNSEQ, expected, actual) 56 ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperNSEQ, expected, actual)
43 #define ASSERT_NSNE(val1, val2) \ 57 #define ASSERT_NSNE(val1, val2) \
44 ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperNSNE, val1, val2) 58 ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperNSNE, val1, val2)
45 59
46 #endif // GTEST_OS_MAC 60 #endif // GTEST_OS_MAC
47 61
48 #endif // TESTING_GTEST_MAC_H_ 62 #endif // TESTING_GTEST_MAC_H_
OLDNEW
« no previous file with comments | « no previous file | testing/gtest_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698