commit 6d49a8ed171c76fefb80f31629001c4c42f08996
author hjon <hjon@webrtc.org> Tue Jan 26 13:06:42 2016 -0800
committer Commit bot <commit-bot@chromium.org> Tue Jan 26 21:06:48 2016 +0000
tree 52d331743c054fa088e853c2b2e83ef4178bf29b
parent 7b582a2e4f7290e10e9d5fb52d7c21798c6f9f13

Update API for Objective-C RTCConfiguration.

BUG=

Review URL: https://codereview.webrtc.org/1616303002

Cr-Commit-Position: refs/heads/master@{#11386}

webrtc/api/objctests/RTCIceServerTest.mm

diff --git a/webrtc/api/objctests/RTCIceServerTest.mm b/webrtc/api/objctests/RTCIceServerTest.mm
index 5fa43f8..2e6fb25 100644
--- a/webrtc/api/objctests/RTCIceServerTest.mm
+++ b/webrtc/api/objctests/RTCIceServerTest.mm
@@ -16,11 +16,13 @@
 
 #import "webrtc/api/objc/RTCIceServer.h"
 #import "webrtc/api/objc/RTCIceServer+Private.h"
+#import "webrtc/base/objc/NSString+StdString.h"
 
 @interface RTCIceServerTest : NSObject
 - (void)testOneURLServer;
 - (void)testTwoURLServer;
 - (void)testPasswordCredential;
+- (void)testInitFromNativeServer;
 @end
 
 @implementation RTCIceServerTest
@@ -30,7 +32,7 @@
       @"stun:stun1.example.net" ]];
 
   webrtc::PeerConnectionInterface::IceServer iceStruct = server.iceServer;
-  EXPECT_EQ((size_t)1, iceStruct.urls.size());
+  EXPECT_EQ(1u, iceStruct.urls.size());
   EXPECT_EQ("stun:stun1.example.net", iceStruct.urls.front());
   EXPECT_EQ("", iceStruct.username);
   EXPECT_EQ("", iceStruct.password);
@@ -41,7 +43,7 @@
       @"turn1:turn1.example.net", @"turn2:turn2.example.net" ]];
 
   webrtc::PeerConnectionInterface::IceServer iceStruct = server.iceServer;
-  EXPECT_EQ((size_t)2, iceStruct.urls.size());
+  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);
@@ -54,12 +56,27 @@
                 username:@"username"
               credential:@"credential"];
   webrtc::PeerConnectionInterface::IceServer iceStruct = server.iceServer;
-  EXPECT_EQ((size_t)1, iceStruct.urls.size());
+  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)testInitFromNativeServer {
+  webrtc::PeerConnectionInterface::IceServer nativeServer;
+  nativeServer.username = "username";
+  nativeServer.password = "password";
+  nativeServer.urls.push_back("stun:stun.example.net");
+
+  RTCIceServer *iceServer =
+      [[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]);
+}
+
 @end
 
 TEST(RTCIceServerTest, OneURLTest) {
@@ -82,3 +99,10 @@
     [test testPasswordCredential];
   }
 }
+
+TEST(RTCIceServerTest, InitFromNativeServerTest) {
+  @autoreleasepool {
+    RTCIceServerTest *test = [[RTCIceServerTest alloc] init];
+    [test testInitFromNativeServer];
+  }
+}