diff options
| -rw-r--r-- | build_overrides/build.gni | 5 | ||||
| -rw-r--r-- | testing/gtest_mac.h | 62 | ||||
| -rw-r--r-- | testing/gtest_mac.mm | 98 |
3 files changed, 162 insertions, 3 deletions
diff --git a/build_overrides/build.gni b/build_overrides/build.gni index fe286e5fcf..9d68f10933 100644 --- a/build_overrides/build.gni +++ b/build_overrides/build.gni @@ -3,7 +3,6 @@ # found in the LICENSE file. # See https://bugs.chromium.org/p/webrtc/issues/detail?id=5453. -# Some WebRTC targets require the 10.7 deployment version of the Mac SDK -# and a 10.11 min SDK, but those targets are only used in non-Chromium -# builds. +# These overrides are needed and should generally track Chromium settings. +mac_deployment_target_build_override = "10.7" mac_sdk_min_build_override = "10.10" diff --git a/testing/gtest_mac.h b/testing/gtest_mac.h new file mode 100644 index 0000000000..0c0b6555a3 --- /dev/null +++ b/testing/gtest_mac.h @@ -0,0 +1,62 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. +#ifndef TESTING_GTEST_MAC_H_ +#define TESTING_GTEST_MAC_H_ +#include <gtest/internal/gtest-port.h> +#include <gtest/gtest.h> +#ifdef GTEST_OS_MAC +#import <Foundation/Foundation.h> +namespace testing { +namespace internal { +// This overloaded version allows comparison between ObjC objects that conform +// to the NSObject protocol. Used to implement {ASSERT|EXPECT}_NSEQ(). +GTEST_API_ AssertionResult CmpHelperNSEQ(const char* expected_expression, + const char* actual_expression, + id<NSObject> expected, + id<NSObject> actual); +// This overloaded version allows comparison between ObjC objects that conform +// to the NSObject protocol. Used to implement {ASSERT|EXPECT}_NSNE(). +GTEST_API_ AssertionResult CmpHelperNSNE(const char* expected_expression, + const char* actual_expression, + id<NSObject> expected, + id<NSObject> actual); +#if !defined(GTEST_OS_IOS) +// This overloaded version allows comparison between NSRect objects using +// NSEqualRects. Used to implement {ASSERT|EXPECT}_NSEQ(). +GTEST_API_ AssertionResult CmpHelperNSEQ(const char* expected_expression, + const char* actual_expression, + const NSRect& expected, + const NSRect& actual); +// This overloaded version allows comparison between NSRect objects using +// NSEqualRects. Used to implement {ASSERT|EXPECT}_NSNE(). +GTEST_API_ AssertionResult CmpHelperNSNE(const char* expected_expression, + const char* actual_expression, + const NSRect& expected, + const NSRect& actual); +// This overloaded version allows comparison between NSPoint objects using +// NSEqualPoints. Used to implement {ASSERT|EXPECT}_NSEQ(). +GTEST_API_ AssertionResult CmpHelperNSEQ(const char* expected_expression, + const char* actual_expression, + const NSPoint& expected, + const NSPoint& actual); +// This overloaded version allows comparison between NSPoint objects using +// NSEqualPoints. Used to implement {ASSERT|EXPECT}_NSNE(). +GTEST_API_ AssertionResult CmpHelperNSNE(const char* expected_expression, + const char* actual_expression, + const NSPoint& expected, + const NSPoint& actual); +#endif // !GTEST_OS_IOS +} // namespace internal +} // namespace testing +// Tests that [expected isEqual:actual]. +#define EXPECT_NSEQ(expected, actual) \ + EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperNSEQ, expected, actual) +#define EXPECT_NSNE(val1, val2) \ + EXPECT_PRED_FORMAT2(::testing::internal::CmpHelperNSNE, val1, val2) +#define ASSERT_NSEQ(expected, actual) \ + ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperNSEQ, expected, actual) +#define ASSERT_NSNE(val1, val2) \ + ASSERT_PRED_FORMAT2(::testing::internal::CmpHelperNSNE, val1, val2) +#endif // GTEST_OS_MAC +#endif // TESTING_GTEST_MAC_H_ diff --git a/testing/gtest_mac.mm b/testing/gtest_mac.mm new file mode 100644 index 0000000000..b490f558bd --- /dev/null +++ b/testing/gtest_mac.mm @@ -0,0 +1,98 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. +#import "gtest_mac.h" +#include <string> +#include <gtest/gtest.h> +#include <gtest/internal/gtest-port.h> +#include <gtest/internal/gtest-string.h> +#ifdef GTEST_OS_MAC +#import <Foundation/Foundation.h> +namespace testing { +namespace internal { +// Handles nil values for |obj| properly by using safe printing of %@ in +// -stringWithFormat:. +static inline const char* StringDescription(id<NSObject> obj) { + return [[NSString stringWithFormat:@"%@", obj] UTF8String]; +} +// This overloaded version allows comparison between ObjC objects that conform +// to the NSObject protocol. Used to implement {ASSERT|EXPECT}_EQ(). +GTEST_API_ AssertionResult CmpHelperNSEQ(const char* expected_expression, + const char* actual_expression, + id<NSObject> expected, + id<NSObject> actual) { + if (expected == actual || [expected isEqual:actual]) { + return AssertionSuccess(); + } + return EqFailure(expected_expression, actual_expression, + std::string(StringDescription(expected)), + std::string(StringDescription(actual)), false); +} +// This overloaded version allows comparison between ObjC objects that conform +// to the NSObject protocol. Used to implement {ASSERT|EXPECT}_NE(). +GTEST_API_ AssertionResult CmpHelperNSNE(const char* expected_expression, + const char* actual_expression, + id<NSObject> expected, + id<NSObject> actual) { + if (expected != actual && ![expected isEqual:actual]) { + return AssertionSuccess(); + } + Message msg; + msg << "Expected: (" << expected_expression << ") != (" << actual_expression + << "), actual: " << StringDescription(expected) << " vs " + << StringDescription(actual); + return AssertionFailure(msg); +} +#if !defined(GTEST_OS_IOS) +GTEST_API_ AssertionResult CmpHelperNSEQ(const char* expected_expression, + const char* actual_expression, + const NSRect& expected, + const NSRect& actual) { + if (NSEqualRects(expected, actual)) { + return AssertionSuccess(); + } + return EqFailure(expected_expression, actual_expression, + [NSStringFromRect(expected) UTF8String], + [NSStringFromRect(actual) UTF8String], false); +} +GTEST_API_ AssertionResult CmpHelperNSNE(const char* expected_expression, + const char* actual_expression, + const NSRect& expected, + const NSRect& actual) { + if (!NSEqualRects(expected, actual)) { + return AssertionSuccess(); + } + Message msg; + msg << "Expected: (" << expected_expression << ") != (" << actual_expression + << "), actual: " << [NSStringFromRect(expected) UTF8String] << " vs " + << [NSStringFromRect(actual) UTF8String]; + return AssertionFailure(msg); +} +GTEST_API_ AssertionResult CmpHelperNSEQ(const char* expected_expression, + const char* actual_expression, + const NSPoint& expected, + const NSPoint& actual) { + if (NSEqualPoints(expected, actual)) { + return AssertionSuccess(); + } + return EqFailure(expected_expression, actual_expression, + [NSStringFromPoint(expected) UTF8String], + [NSStringFromPoint(actual) UTF8String], false); +} +GTEST_API_ AssertionResult CmpHelperNSNE(const char* expected_expression, + const char* actual_expression, + const NSPoint& expected, + const NSPoint& actual) { + if (!NSEqualPoints(expected, actual)) { + return AssertionSuccess(); + } + Message msg; + msg << "Expected: (" << expected_expression << ") != (" << actual_expression + << "), actual: " << [NSStringFromPoint(expected) UTF8String] << " vs " + << [NSStringFromPoint(actual) UTF8String]; + return AssertionFailure(msg); +} +#endif // !GTEST_OS_IOS +} // namespace internal +} // namespace testing +#endif // GTEST_OS_MAC |