mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 05:40:42 +01:00
63ee39d0be
This reverts commit 181ea6e414.
Reason for revert: Breaks downstream project. Kári will help to land it next week.
Original change's description:
> Add a prefix for objc category.
>
> According to the Google Objective-C style [1], category names should
> start with an appropriate prefix. WebRTC has some category definitions
> for system interfaces, but it doesn't use prefixes.
>
> $ otool -ov WebRTC.framework/WebRTC | grep -E "^[0-9a-z]{16} 0x[0-9a-z]+ __OBJC_._CATEGORY" | grep -v "_RTC"
> 0000000002160840 0x217c3c0 __OBJC_$_CATEGORY_UIDevice_$_H264Profile
> 0000000002160850 0x21808b8 __OBJC_$_CATEGORY_AVCaptureSession_$_DevicePosition
> 0000000002160858 0x2180968 __OBJC_$_CATEGORY_NSString_$_StdString
> 0000000002160860 0x21809c8 __OBJC_$_CATEGORY_NSString_$_AbslStringView
>
> To avoid conflicts, prefix the names and methods of those categories.
> Also remove sdk/objc/Framework/Classes/Common/NSString+StdString.h as
> it is not used by any other files.
>
> [1] https://google.github.io/styleguide/objcguide.html#category-naming
>
> Bug: webrtc:13884
> Change-Id: I2cf2742af198ab4e0bfb15c0476d72971e50ceee
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/262341
> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
> Commit-Queue: Daniel.L (Byoungchan) Lee <daniel.l@hpcnt.com>
> Reviewed-by: Artem Titov <titovartem@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#36880}
Bug: webrtc:13884
Change-Id: I85257088e4a3a62e01ff925ab5e77af83b078ef3
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/262420
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Auto-Submit: Artem Titov <titovartem@webrtc.org>
Owners-Override: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36885}
136 lines
6 KiB
Text
136 lines
6 KiB
Text
/*
|
|
* 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>
|
|
#import <XCTest/XCTest.h>
|
|
|
|
#include <vector>
|
|
|
|
#include "rtc_base/gunit.h"
|
|
|
|
#import "api/peerconnection/RTCIceServer+Private.h"
|
|
#import "api/peerconnection/RTCIceServer.h"
|
|
#import "helpers/NSString+StdString.h"
|
|
|
|
@interface RTCIceServerTest : XCTestCase
|
|
@end
|
|
|
|
@implementation RTCIceServerTest
|
|
|
|
- (void)testOneURLServer {
|
|
RTC_OBJC_TYPE(RTCIceServer) *server =
|
|
[[RTC_OBJC_TYPE(RTCIceServer) alloc] initWithURLStrings:@[ @"stun:stun1.example.net" ]];
|
|
|
|
webrtc::PeerConnectionInterface::IceServer iceStruct = server.nativeServer;
|
|
EXPECT_EQ(1u, iceStruct.urls.size());
|
|
EXPECT_EQ("stun:stun1.example.net", iceStruct.urls.front());
|
|
EXPECT_EQ("", iceStruct.username);
|
|
EXPECT_EQ("", iceStruct.password);
|
|
}
|
|
|
|
- (void)testTwoURLServer {
|
|
RTC_OBJC_TYPE(RTCIceServer) *server = [[RTC_OBJC_TYPE(RTCIceServer) alloc]
|
|
initWithURLStrings:@[ @"turn1:turn1.example.net", @"turn2:turn2.example.net" ]];
|
|
|
|
webrtc::PeerConnectionInterface::IceServer iceStruct = server.nativeServer;
|
|
EXPECT_EQ(2u, iceStruct.urls.size());
|
|
EXPECT_EQ("turn1:turn1.example.net", iceStruct.urls.front());
|
|
EXPECT_EQ("turn2:turn2.example.net", iceStruct.urls.back());
|
|
EXPECT_EQ("", iceStruct.username);
|
|
EXPECT_EQ("", iceStruct.password);
|
|
}
|
|
|
|
- (void)testPasswordCredential {
|
|
RTC_OBJC_TYPE(RTCIceServer) *server =
|
|
[[RTC_OBJC_TYPE(RTCIceServer) alloc] initWithURLStrings:@[ @"turn1:turn1.example.net" ]
|
|
username:@"username"
|
|
credential:@"credential"];
|
|
webrtc::PeerConnectionInterface::IceServer iceStruct = server.nativeServer;
|
|
EXPECT_EQ(1u, iceStruct.urls.size());
|
|
EXPECT_EQ("turn1:turn1.example.net", iceStruct.urls.front());
|
|
EXPECT_EQ("username", iceStruct.username);
|
|
EXPECT_EQ("credential", iceStruct.password);
|
|
}
|
|
|
|
- (void)testHostname {
|
|
RTC_OBJC_TYPE(RTCIceServer) *server =
|
|
[[RTC_OBJC_TYPE(RTCIceServer) alloc] initWithURLStrings:@[ @"turn1:turn1.example.net" ]
|
|
username:@"username"
|
|
credential:@"credential"
|
|
tlsCertPolicy:RTCTlsCertPolicySecure
|
|
hostname:@"hostname"];
|
|
webrtc::PeerConnectionInterface::IceServer iceStruct = server.nativeServer;
|
|
EXPECT_EQ(1u, iceStruct.urls.size());
|
|
EXPECT_EQ("turn1:turn1.example.net", iceStruct.urls.front());
|
|
EXPECT_EQ("username", iceStruct.username);
|
|
EXPECT_EQ("credential", iceStruct.password);
|
|
EXPECT_EQ("hostname", iceStruct.hostname);
|
|
}
|
|
|
|
- (void)testTlsAlpnProtocols {
|
|
RTC_OBJC_TYPE(RTCIceServer) *server =
|
|
[[RTC_OBJC_TYPE(RTCIceServer) alloc] initWithURLStrings:@[ @"turn1:turn1.example.net" ]
|
|
username:@"username"
|
|
credential:@"credential"
|
|
tlsCertPolicy:RTCTlsCertPolicySecure
|
|
hostname:@"hostname"
|
|
tlsAlpnProtocols:@[ @"proto1", @"proto2" ]];
|
|
webrtc::PeerConnectionInterface::IceServer iceStruct = server.nativeServer;
|
|
EXPECT_EQ(1u, iceStruct.urls.size());
|
|
EXPECT_EQ("turn1:turn1.example.net", iceStruct.urls.front());
|
|
EXPECT_EQ("username", iceStruct.username);
|
|
EXPECT_EQ("credential", iceStruct.password);
|
|
EXPECT_EQ("hostname", iceStruct.hostname);
|
|
EXPECT_EQ(2u, iceStruct.tls_alpn_protocols.size());
|
|
}
|
|
|
|
- (void)testTlsEllipticCurves {
|
|
RTC_OBJC_TYPE(RTCIceServer) *server =
|
|
[[RTC_OBJC_TYPE(RTCIceServer) alloc] initWithURLStrings:@[ @"turn1:turn1.example.net" ]
|
|
username:@"username"
|
|
credential:@"credential"
|
|
tlsCertPolicy:RTCTlsCertPolicySecure
|
|
hostname:@"hostname"
|
|
tlsAlpnProtocols:@[ @"proto1", @"proto2" ]
|
|
tlsEllipticCurves:@[ @"curve1", @"curve2" ]];
|
|
webrtc::PeerConnectionInterface::IceServer iceStruct = server.nativeServer;
|
|
EXPECT_EQ(1u, iceStruct.urls.size());
|
|
EXPECT_EQ("turn1:turn1.example.net", iceStruct.urls.front());
|
|
EXPECT_EQ("username", iceStruct.username);
|
|
EXPECT_EQ("credential", iceStruct.password);
|
|
EXPECT_EQ("hostname", iceStruct.hostname);
|
|
EXPECT_EQ(2u, iceStruct.tls_alpn_protocols.size());
|
|
EXPECT_EQ(2u, iceStruct.tls_elliptic_curves.size());
|
|
}
|
|
|
|
- (void)testInitFromNativeServer {
|
|
webrtc::PeerConnectionInterface::IceServer nativeServer;
|
|
nativeServer.username = "username";
|
|
nativeServer.password = "password";
|
|
nativeServer.urls.push_back("stun:stun.example.net");
|
|
nativeServer.hostname = "hostname";
|
|
nativeServer.tls_alpn_protocols.push_back("proto1");
|
|
nativeServer.tls_alpn_protocols.push_back("proto2");
|
|
nativeServer.tls_elliptic_curves.push_back("curve1");
|
|
nativeServer.tls_elliptic_curves.push_back("curve2");
|
|
|
|
RTC_OBJC_TYPE(RTCIceServer) *iceServer =
|
|
[[RTC_OBJC_TYPE(RTCIceServer) alloc] initWithNativeServer:nativeServer];
|
|
EXPECT_EQ(1u, iceServer.urlStrings.count);
|
|
EXPECT_EQ("stun:stun.example.net",
|
|
[NSString stdStringForString:iceServer.urlStrings.firstObject]);
|
|
EXPECT_EQ("username", [NSString stdStringForString:iceServer.username]);
|
|
EXPECT_EQ("password", [NSString stdStringForString:iceServer.credential]);
|
|
EXPECT_EQ("hostname", [NSString stdStringForString:iceServer.hostname]);
|
|
EXPECT_EQ(2u, iceServer.tlsAlpnProtocols.count);
|
|
EXPECT_EQ(2u, iceServer.tlsEllipticCurves.count);
|
|
}
|
|
|
|
@end
|