Update iOS AppRTCDemo to use the updated Objective-C API.

webrtc/examples/objc/AppRTCDemo/tests/ARDAppClientTest.mm

 /*
  *  Copyright 2014 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 <OCMock/OCMock.h>
 
 #import "ARDAppClient+Internal.h"
 #import "ARDJoinResponse+Internal.h"
 #import "ARDMessageResponse+Internal.h"
 #import "ARDSDPUtils.h"
-#import "RTCMediaConstraints.h"
-#import "RTCPeerConnectionFactory.h"
-#import "RTCSessionDescription.h"
+#import "webrtc/api/objc/RTCMediaConstraints.h"

[tkchin_webrtc, 2016/03/08 19:51:22]

ditto import order

[hjon_webrtc, 2016/03/10 03:32:43]

Done.

+#import "webrtc/api/objc/RTCPeerConnectionFactory.h"
+#import "webrtc/api/objc/RTCSessionDescription.h"
 
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/ssladapter.h"
 
 // These classes mimic XCTest APIs, to make eventual conversion to XCTest
 // easier. Conversion will happen once XCTest is supported well on build bots.
 @interface ARDTestExpectation : NSObject
 
 @property(nonatomic, readonly) NSString *description;
 @property(nonatomic, readonly) BOOL isFulfilled;
@@ skipping 150 matching lines @@
     messageHandler(message);
   }] sendMessage:[OCMArg any]];
   return mockSignalingChannel;
 }
 
 - (id)mockTURNClient {
   id mockTURNClient =
       [OCMockObject mockForProtocol:@protocol(ARDTURNClient)];
   [[[mockTURNClient stub] andDo:^(NSInvocation *invocation) {
     // Don't return anything in TURN response.
-    __unsafe_unretained void (^completionHandler)(NSArray *turnServers,
+    __unsafe_unretained void (^completionHandler)(RTCIceServer *turnServer,
                                                   NSError *error);
     [invocation getArgument:&completionHandler atIndex:2];
-    completionHandler([NSArray array], nil);
-  }] requestServersWithCompletionHandler:[OCMArg any]];
+    completionHandler(nil, nil);
+  }] requestServerWithCompletionHandler:[OCMArg any]];
   return mockTURNClient;
 }
 
 - (ARDAppClient *)createAppClientForRoomId:(NSString *)roomId
                                   clientId:(NSString *)clientId
                                isInitiator:(BOOL)isInitiator
                                   messages:(NSArray *)messages
                             messageHandler:
     (void (^)(ARDSignalingMessage *message))messageHandler
                           connectedHandler:(void (^)(void))connectedHandler {
@@ skipping 88 matching lines @@
 @end
 
 @implementation ARDSDPUtilsTest
 
 - (void)testPreferVideoCodec {
   NSString *sdp = @("m=video 9 RTP/SAVPF 100 116 117 96 120\n"
                     "a=rtpmap:120 H264/90000\n");
   NSString *expectedSdp = @("m=video 9 RTP/SAVPF 120 100 116 117 96\n"
                             "a=rtpmap:120 H264/90000\n");
   RTCSessionDescription* desc =
-      [[RTCSessionDescription alloc] initWithType:@"offer" sdp:sdp];
+      [[RTCSessionDescription alloc] initWithType:RTCSdpTypeOffer sdp:sdp];
   RTCSessionDescription *h264Desc =
       [ARDSDPUtils descriptionForDescription:desc
                          preferredVideoCodec:@"H264"];
   EXPECT_TRUE([h264Desc.description isEqualToString:expectedSdp]);
 }
 
 @end
 
 class SignalingTest : public ::testing::Test {
  protected:
@@ skipping 13 matching lines @@
 }
 
 TEST_F(SignalingTest, SDPTest) {
   @autoreleasepool {
     ARDSDPUtilsTest *test = [[ARDSDPUtilsTest alloc] init];
     [test testPreferVideoCodec];
   }
 }