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}
This commit is contained in:
committed by
WebRTC LUCI CQ
parent
cbb8fb8337
commit
c8a6fb2bb8
@ -9,6 +9,7 @@
|
||||
*/
|
||||
|
||||
#import <OCMock/OCMock.h>
|
||||
#import <XCTest/XCTest.h>
|
||||
|
||||
#if TARGET_OS_IPHONE
|
||||
#import <UIKit/UIKit.h>
|
||||
@ -67,7 +68,7 @@ CMSampleBufferRef createTestSampleBufferRef() {
|
||||
: (AVCaptureSession *)captureSession;
|
||||
@end
|
||||
|
||||
@interface RTCCameraVideoCapturerTests : NSObject
|
||||
@interface RTCCameraVideoCapturerTests : XCTestCase
|
||||
@property(nonatomic, strong) id delegateMock;
|
||||
@property(nonatomic, strong) id deviceMock;
|
||||
@property(nonatomic, strong) id captureConnectionMock;
|
||||
@ -455,112 +456,3 @@ CMSampleBufferRef createTestSampleBufferRef() {
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
TEST(RTCCameraVideoCapturerTests, SetupSession) {
|
||||
RTCCameraVideoCapturerTests *test = [[RTCCameraVideoCapturerTests alloc] init];
|
||||
[test setup];
|
||||
[test testSetupSession];
|
||||
[test tearDown];
|
||||
}
|
||||
|
||||
TEST(RTCCameraVideoCapturerTests, SetupSessionOutput) {
|
||||
RTCCameraVideoCapturerTests *test = [[RTCCameraVideoCapturerTests alloc] init];
|
||||
[test setup];
|
||||
[test testSetupSessionOutput];
|
||||
[test tearDown];
|
||||
}
|
||||
|
||||
TEST(RTCCameraVideoCapturerTests, SupportedFormatsForDevice) {
|
||||
RTCCameraVideoCapturerTests *test = [[RTCCameraVideoCapturerTests alloc] init];
|
||||
[test setup];
|
||||
[test testSupportedFormatsForDevice];
|
||||
[test tearDown];
|
||||
}
|
||||
|
||||
TEST(RTCCameraVideoCapturerTests, DelegateCallbackNotCalledWhenInvalidBuffer) {
|
||||
RTCCameraVideoCapturerTests *test = [[RTCCameraVideoCapturerTests alloc] init];
|
||||
[test setup];
|
||||
[test testDelegateCallbackNotCalledWhenInvalidBuffer];
|
||||
[test tearDown];
|
||||
}
|
||||
|
||||
TEST(RTCCameraVideoCapturerTests, DelegateCallbackWithValidBufferAndOrientationUpdate) {
|
||||
RTCCameraVideoCapturerTests *test = [[RTCCameraVideoCapturerTests alloc] init];
|
||||
[test setup];
|
||||
[test testDelegateCallbackWithValidBufferAndOrientationUpdate];
|
||||
[test tearDown];
|
||||
}
|
||||
|
||||
TEST(RTCCameraVideoCapturerTests, RotationCameraBackLandscapeLeft) {
|
||||
RTCCameraVideoCapturerTests *test = [[RTCCameraVideoCapturerTests alloc] init];
|
||||
[test setup];
|
||||
[test testRotationCamera:AVCaptureDevicePositionBack
|
||||
withOrientation:UIDeviceOrientationLandscapeLeft];
|
||||
[test tearDown];
|
||||
}
|
||||
|
||||
TEST(RTCCameraVideoCapturerTests, RotationCameraFrontLandscapeLeft) {
|
||||
RTCCameraVideoCapturerTests *test = [[RTCCameraVideoCapturerTests alloc] init];
|
||||
[test setup];
|
||||
[test testRotationCamera:AVCaptureDevicePositionFront
|
||||
withOrientation:UIDeviceOrientationLandscapeLeft];
|
||||
[test tearDown];
|
||||
}
|
||||
|
||||
TEST(RTCCameraVideoCapturerTests, RotationCameraBackLandscapeRight) {
|
||||
RTCCameraVideoCapturerTests *test = [[RTCCameraVideoCapturerTests alloc] init];
|
||||
[test setup];
|
||||
[test testRotationCamera:AVCaptureDevicePositionBack
|
||||
withOrientation:UIDeviceOrientationLandscapeRight];
|
||||
[test tearDown];
|
||||
}
|
||||
|
||||
TEST(RTCCameraVideoCapturerTests, RotationCameraFrontLandscapeRight) {
|
||||
RTCCameraVideoCapturerTests *test = [[RTCCameraVideoCapturerTests alloc] init];
|
||||
[test setup];
|
||||
[test testRotationCamera:AVCaptureDevicePositionFront
|
||||
withOrientation:UIDeviceOrientationLandscapeRight];
|
||||
[test tearDown];
|
||||
}
|
||||
|
||||
TEST(RTCCameraVideoCapturerTests, RotationCameraFrame) {
|
||||
RTCCameraVideoCapturerTests *test = [[RTCCameraVideoCapturerTests alloc] init];
|
||||
[test setup];
|
||||
[test testRotationFrame];
|
||||
[test tearDown];
|
||||
}
|
||||
|
||||
TEST(RTCCameraVideoCapturerTests, ImageExif) {
|
||||
RTCCameraVideoCapturerTests *test = [[RTCCameraVideoCapturerTests alloc] init];
|
||||
[test setup];
|
||||
[test testImageExif];
|
||||
[test tearDown];
|
||||
}
|
||||
|
||||
TEST(RTCCameraVideoCapturerTests, StartAndStopCapture) {
|
||||
RTCCameraVideoCapturerTests *test = [[RTCCameraVideoCapturerTests alloc] init];
|
||||
[test setupWithMockedCaptureSession];
|
||||
[test testStartingAndStoppingCapture];
|
||||
[test tearDown];
|
||||
}
|
||||
|
||||
TEST(RTCCameraVideoCapturerTests, StartCaptureFailingToLockForConfiguration) {
|
||||
RTCCameraVideoCapturerTests *test = [[RTCCameraVideoCapturerTests alloc] init];
|
||||
[test setupWithMockedCaptureSession];
|
||||
[test testStartCaptureFailingToLockForConfiguration];
|
||||
[test tearDown];
|
||||
}
|
||||
|
||||
TEST(RTCCameraVideoCapturerTests, StartAndStopCaptureWithCallbacks) {
|
||||
RTCCameraVideoCapturerTests *test = [[RTCCameraVideoCapturerTests alloc] init];
|
||||
[test setupWithMockedCaptureSession];
|
||||
[test testStartingAndStoppingCaptureWithCallbacks];
|
||||
[test tearDown];
|
||||
}
|
||||
|
||||
TEST(RTCCameraVideoCapturerTests, StartCaptureFailingToLockForConfigurationWithCallback) {
|
||||
RTCCameraVideoCapturerTests *test = [[RTCCameraVideoCapturerTests alloc] init];
|
||||
[test setupWithMockedCaptureSession];
|
||||
[test testStartCaptureFailingToLockForConfigurationWithCallback];
|
||||
[test tearDown];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user