From 64c70a260ec6891e3fa435f16624d3a36a7985e9 Mon Sep 17 00:00:00 2001 From: Byoungchan Lee Date: Fri, 19 Aug 2022 06:55:59 +0900 Subject: [PATCH] Replace use of gtest expectation macro with XCTest's macro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:8382 Change-Id: I9d9276fcb0a9b13a8caa3baca5d3bc5c95c03c6a Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/272120 Reviewed-by: Mirko Bonadei Commit-Queue: Kári Helgason Reviewed-by: Kári Helgason Reviewed-by: Kári Helgason Cr-Commit-Position: refs/heads/main@{#37879} --- sdk/BUILD.gn | 1 - sdk/objc/unittests/scoped_cftyperef_tests.mm | 34 +++++++++----------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn index 5f21ffe641..7e973ddfce 100644 --- a/sdk/BUILD.gn +++ b/sdk/BUILD.gn @@ -1132,7 +1132,6 @@ if (is_ios || is_mac) { "../rtc_base:rtc_event", "../rtc_base/system:unused", "../system_wrappers", - "../test:test_support", # TODO(webrtc:8382): Remove use of gtest "//third_party/libyuv", ] diff --git a/sdk/objc/unittests/scoped_cftyperef_tests.mm b/sdk/objc/unittests/scoped_cftyperef_tests.mm index be26720b95..a354410ede 100644 --- a/sdk/objc/unittests/scoped_cftyperef_tests.mm +++ b/sdk/objc/unittests/scoped_cftyperef_tests.mm @@ -12,8 +12,6 @@ #include "sdk/objc/helpers/scoped_cftyperef.h" -#include "test/gtest.h" - namespace { struct TestType { TestType() : has_value(true) {} @@ -50,62 +48,62 @@ using ScopedTestType = rtc::internal::ScopedTypeRef - (void)testShouldNotRetainByDefault { TestType a; ScopedTestType ref(&a); - EXPECT_EQ(0, a.retain_count); + XCTAssertEqual(0, a.retain_count); } - (void)testShouldRetainWithPolicy { TestType a; ScopedTestType ref(&a, rtc::RetainPolicy::RETAIN); - EXPECT_EQ(1, a.retain_count); + XCTAssertEqual(1, a.retain_count); } - (void)testShouldReleaseWhenLeavingScope { TestType a; - EXPECT_EQ(0, a.retain_count); + XCTAssertEqual(0, a.retain_count); { ScopedTestType ref(&a, rtc::RetainPolicy::RETAIN); - EXPECT_EQ(1, a.retain_count); + XCTAssertEqual(1, a.retain_count); } - EXPECT_EQ(0, a.retain_count); + XCTAssertEqual(0, a.retain_count); } - (void)testShouldBeCopyable { TestType a; - EXPECT_EQ(0, a.retain_count); + XCTAssertEqual(0, a.retain_count); { ScopedTestType ref1(&a, rtc::RetainPolicy::RETAIN); - EXPECT_EQ(1, a.retain_count); + XCTAssertEqual(1, a.retain_count); ScopedTestType ref2 = ref1; - EXPECT_EQ(2, a.retain_count); + XCTAssertEqual(2, a.retain_count); } - EXPECT_EQ(0, a.retain_count); + XCTAssertEqual(0, a.retain_count); } - (void)testCanReleaseOwnership { TestType a; - EXPECT_EQ(0, a.retain_count); + XCTAssertEqual(0, a.retain_count); { ScopedTestType ref(&a, rtc::RetainPolicy::RETAIN); - EXPECT_EQ(1, a.retain_count); + XCTAssertEqual(1, a.retain_count); TestTypeRef b = ref.release(); } - EXPECT_EQ(1, a.retain_count); + XCTAssertEqual(1, a.retain_count); } - (void)testShouldBeTestableForTruthiness { ScopedTestType ref; - EXPECT_FALSE(ref); + XCTAssertFalse(ref); TestType a; ref = &a; - EXPECT_TRUE(ref); + XCTAssertTrue(ref); ref.release(); - EXPECT_FALSE(ref); + XCTAssertFalse(ref); } - (void)testShouldProvideAccessToWrappedType { TestType a; ScopedTestType ref(&a); - EXPECT_EQ(&(a.retain_count), &(ref->retain_count)); + XCTAssertEqual(&(a.retain_count), &(ref->retain_count)); } @end