Remove objc tests from rtc_unittests and move tests to sdk_unittests
The tests in rtc_unittests_objc are old gtest based tests and
The tests in sdk_unittests are XCTest based tests.
The objc tests in rtc_unittest are causing problems [1],
so I think it's time to combine the two types of objc tests.
Renaming the files to match the existing sdk_unittests and
removing the use of gtest helper functions (eg, EXPECT_EQ)
are planned for follow-up CLs.
[1] https://webrtc-review.googlesource.com/c/src/+/261724/9
Bug: webrtc:8382
Change-Id: I9308b35f654c4479c9df72bf7cd7f4032e267eb2
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/262380
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Daniel.L (Byoungchan) Lee <daniel.l@hpcnt.com>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36878}
diff --git a/sdk/objc/unittests/RTCAudioSessionTest.mm b/sdk/objc/unittests/RTCAudioSessionTest.mm
index 7d32ec6..f62eb46 100644
--- a/sdk/objc/unittests/RTCAudioSessionTest.mm
+++ b/sdk/objc/unittests/RTCAudioSessionTest.mm
@@ -10,6 +10,7 @@
#import <Foundation/Foundation.h>
#import <OCMock/OCMock.h>
+#import <XCTest/XCTest.h>
#include <vector>
@@ -111,8 +112,7 @@
@end
-
-@interface RTCAudioSessionTest : NSObject
+@interface RTCAudioSessionTest : XCTestCase
@end
@@ -322,57 +322,3 @@
}
@end
-
-namespace webrtc {
-
-class AudioSessionTest : public ::testing::Test {
- protected:
- void TearDown() override {
- RTC_OBJC_TYPE(RTCAudioSession) *session = [RTC_OBJC_TYPE(RTCAudioSession) sharedInstance];
- for (id<RTC_OBJC_TYPE(RTCAudioSessionDelegate)> delegate : session.delegates) {
- [session removeDelegate:delegate];
- }
- }
-};
-
-TEST_F(AudioSessionTest, AddAndRemoveDelegates) {
- RTCAudioSessionTest *test = [[RTCAudioSessionTest alloc] init];
- [test testAddAndRemoveDelegates];
-}
-
-TEST_F(AudioSessionTest, PushDelegate) {
- RTCAudioSessionTest *test = [[RTCAudioSessionTest alloc] init];
- [test testPushDelegate];
-}
-
-TEST_F(AudioSessionTest, ZeroingWeakDelegate) {
- RTCAudioSessionTest *test = [[RTCAudioSessionTest alloc] init];
- [test testZeroingWeakDelegate];
-}
-
-TEST_F(AudioSessionTest, RemoveDelegateOnDealloc) {
- RTCAudioSessionTest *test = [[RTCAudioSessionTest alloc] init];
- [test testRemoveDelegateOnDealloc];
-}
-
-TEST_F(AudioSessionTest, AudioSessionActivation) {
- RTCAudioSessionTest *test = [[RTCAudioSessionTest alloc] init];
- [test testAudioSessionActivation];
-}
-
-TEST_F(AudioSessionTest, ConfigureWebRTCSession) {
- RTCAudioSessionTest *test = [[RTCAudioSessionTest alloc] init];
- [test testConfigureWebRTCSession];
-}
-
-TEST_F(AudioSessionTest, ConfigureWebRTCSessionWithoutLocking) {
- RTCAudioSessionTest *test = [[RTCAudioSessionTest alloc] init];
- [test testConfigureWebRTCSessionWithoutLocking];
-}
-
-TEST_F(AudioSessionTest, AudioVolumeDidNotify) {
- RTCAudioSessionTest *test = [[RTCAudioSessionTest alloc] init];
- [test testAudioVolumeDidNotify];
-}
-
-} // namespace webrtc