Obj-C SDK Cleanup
This CL separates the files under sdk/objc into logical directories, replacing the previous file layout under Framework/. A long term goal is to have some system set up to generate the files under sdk/objc/api (the PeerConnection API wrappers) from the C++ code. In the shorter term the goal is to abstract out shared concepts from these classes in order to make them as uniform as possible. The separation into base/, components/, and helpers/ are to differentiate between the base layer's common protocols, various utilities and the actual platform specific components. The old directory layout that resembled a framework's internal layout is not necessary, since it is generated by the framework target when building it. Bug: webrtc:9627 Change-Id: Ib084fd83f050ae980649ca99e841f4fb0580bd8f Reviewed-on: https://webrtc-review.googlesource.com/94142 Reviewed-by: Kári Helgason <kthelgason@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> Reviewed-by: Henrik Andreassson <henrika@webrtc.org> Commit-Queue: Anders Carlsson <andersc@webrtc.org> Cr-Commit-Position: refs/heads/master@{#24493}
This commit is contained in:
committed by
Commit Bot
parent
9ea5765f78
commit
7bca8ca4e2
93
sdk/objc/unittests/RTCPeerConnectionFactoryBuilderTest.mm
Normal file
93
sdk/objc/unittests/RTCPeerConnectionFactoryBuilderTest.mm
Normal file
@ -0,0 +1,93 @@
|
||||
/*
|
||||
* Copyright 2015 The WebRTC project authors. All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by a BSD-style license
|
||||
* that can be found in the LICENSE file in the root of the source
|
||||
* tree. An additional intellectual property rights grant can be found
|
||||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
#import <OCMock/OCMock.h>
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#import "api/peerconnection/RTCPeerConnectionFactory+Native.h"
|
||||
#import "api/peerconnection/RTCPeerConnectionFactoryBuilder+DefaultComponents.h"
|
||||
#import "api/peerconnection/RTCPeerConnectionFactoryBuilder.h"
|
||||
|
||||
#include "api/audio_codecs/builtin_audio_decoder_factory.h"
|
||||
#include "api/audio_codecs/builtin_audio_encoder_factory.h"
|
||||
#include "api/video_codecs/video_decoder_factory.h"
|
||||
#include "api/video_codecs/video_encoder_factory.h"
|
||||
#include "modules/audio_device/include/audio_device.h"
|
||||
#include "modules/audio_processing/include/audio_processing.h"
|
||||
|
||||
#include "rtc_base/gunit.h"
|
||||
#include "rtc_base/system/unused.h"
|
||||
|
||||
@interface RTCPeerConnectionFactoryBuilderTest : NSObject
|
||||
- (void)testBuilder;
|
||||
- (void)testDefaultComponentsBuilder;
|
||||
@end
|
||||
|
||||
@implementation RTCPeerConnectionFactoryBuilderTest
|
||||
|
||||
- (void)testBuilder {
|
||||
id factoryMock = OCMStrictClassMock([RTCPeerConnectionFactory class]);
|
||||
OCMExpect([factoryMock alloc]).andReturn(factoryMock);
|
||||
#ifdef HAVE_NO_MEDIA
|
||||
RTC_UNUSED([[[factoryMock expect] andReturn:factoryMock] initWithNoMedia]);
|
||||
#else
|
||||
RTC_UNUSED([[[[factoryMock expect] andReturn:factoryMock] ignoringNonObjectArgs]
|
||||
initWithNativeAudioEncoderFactory:nullptr
|
||||
nativeAudioDecoderFactory:nullptr
|
||||
nativeVideoEncoderFactory:nullptr
|
||||
nativeVideoDecoderFactory:nullptr
|
||||
audioDeviceModule:nullptr
|
||||
audioProcessingModule:nullptr]);
|
||||
#endif
|
||||
RTCPeerConnectionFactoryBuilder* builder = [[RTCPeerConnectionFactoryBuilder alloc] init];
|
||||
RTCPeerConnectionFactory* peerConnectionFactory = [builder createPeerConnectionFactory];
|
||||
EXPECT_TRUE(peerConnectionFactory != nil);
|
||||
OCMVerifyAll(factoryMock);
|
||||
}
|
||||
|
||||
- (void)testDefaultComponentsBuilder {
|
||||
id factoryMock = OCMStrictClassMock([RTCPeerConnectionFactory class]);
|
||||
OCMExpect([factoryMock alloc]).andReturn(factoryMock);
|
||||
#ifdef HAVE_NO_MEDIA
|
||||
RTC_UNUSED([[[factoryMock expect] andReturn:factoryMock] initWithNoMedia]);
|
||||
#else
|
||||
RTC_UNUSED([[[[factoryMock expect] andReturn:factoryMock] ignoringNonObjectArgs]
|
||||
initWithNativeAudioEncoderFactory:nullptr
|
||||
nativeAudioDecoderFactory:nullptr
|
||||
nativeVideoEncoderFactory:nullptr
|
||||
nativeVideoDecoderFactory:nullptr
|
||||
audioDeviceModule:nullptr
|
||||
audioProcessingModule:nullptr]);
|
||||
#endif
|
||||
RTCPeerConnectionFactoryBuilder* builder = [RTCPeerConnectionFactoryBuilder defaultBuilder];
|
||||
RTCPeerConnectionFactory* peerConnectionFactory = [builder createPeerConnectionFactory];
|
||||
EXPECT_TRUE(peerConnectionFactory != nil);
|
||||
OCMVerifyAll(factoryMock);
|
||||
}
|
||||
@end
|
||||
|
||||
TEST(RTCPeerConnectionFactoryBuilderTest, BuilderTest) {
|
||||
@autoreleasepool {
|
||||
RTCPeerConnectionFactoryBuilderTest* test = [[RTCPeerConnectionFactoryBuilderTest alloc] init];
|
||||
[test testBuilder];
|
||||
}
|
||||
}
|
||||
|
||||
TEST(RTCPeerConnectionFactoryBuilderTest, DefaultComponentsBuilderTest) {
|
||||
@autoreleasepool {
|
||||
RTCPeerConnectionFactoryBuilderTest* test = [[RTCPeerConnectionFactoryBuilderTest alloc] init];
|
||||
[test testDefaultComponentsBuilder];
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user