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.
  */
 
+#include "webrtc/base/gunit.h"
+#include "webrtc/base/ssladapter.h"
+
 #import <Foundation/Foundation.h>

[tkchin_webrtc, 2016/03/11 20:47:38]

system libraries first (foundation, ocmock)

then webrtc stuff

[hjon_webrtc, 2016/03/11 22:44:15]

I also seem to recall #includes before #imports, correct?

[tkchin_webrtc, 2016/03/11 23:33:23]

yeah. This looks good.

 #import <OCMock/OCMock.h>
+#import "webrtc/api/objc/RTCMediaConstraints.h"
+#import "webrtc/api/objc/RTCPeerConnectionFactory.h"
+#import "webrtc/api/objc/RTCSessionDescription.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"
-
-#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;
 
 - (instancetype)initWithDescription:(NSString *)description;
 - (void)fulfill;
@@ skipping 176 matching lines @@
   id roomServerClient =
       [self mockRoomServerClientForRoomId:roomId
                                  clientId:clientId
                               isInitiator:isInitiator
                                  messages:messages
                            messageHandler:messageHandler];
   id delegate =
       [OCMockObject niceMockForProtocol:@protocol(ARDAppClientDelegate)];
   [[[delegate stub] andDo:^(NSInvocation *invocation) {
     connectedHandler();
-  }] appClient:[OCMArg any] didChangeConnectionState:RTCICEConnectionConnected];
+  }] appClient:[OCMArg any]
+      didChangeConnectionState:RTCIceConnectionStateConnected];
 
   return [[ARDAppClient alloc] initWithRoomServerClient:roomServerClient
                                        signalingChannel:signalingChannel
                                              turnClient:turnClient
                                                delegate:delegate];
 }
 
 // Tests that an ICE connection is established between two ARDAppClient objects
 // where one is set up as a caller and the other the answerer. Network
 // components are mocked out and messages are relayed directly from object to
-// object. It's expected that both clients reach the RTCICEConnectionConnected
-// state within a reasonable amount of time.
+// object. It's expected that both clients reach the
+// RTCIceConnectionStateConnected state within a reasonable amount of time.
 - (void)testSession {
   // Need block arguments here because we're setting up a callbacks before we
   // create the clients.
   ARDAppClient *caller = nil;
   ARDAppClient *answerer = nil;
   __block __weak ARDAppClient *weakCaller = nil;
   __block __weak ARDAppClient *weakAnswerer = nil;
   NSString *roomId = @"testRoom";
   NSString *callerId = @"testCallerId";
   NSString *answererId = @"testAnswererId";
 
   ARDTestExpectation *callerConnectionExpectation =
       [self expectationWithDescription:@"Caller PC connected."];
   ARDTestExpectation *answererConnectionExpectation =
       [self expectationWithDescription:@"Answerer PC connected."];
 
   caller = [self createAppClientForRoomId:roomId
                                  clientId:callerId
                               isInitiator:YES
                                  messages:[NSArray array]
                            messageHandler:^(ARDSignalingMessage *message) {
     ARDAppClient *strongAnswerer = weakAnswerer;
     [strongAnswerer channel:strongAnswerer.channel didReceiveMessage:message];
   } connectedHandler:^{
     [callerConnectionExpectation fulfill];
   }];
   // TODO(tkchin): Figure out why DTLS-SRTP constraint causes thread assertion
   // crash in Debug.
-  caller.defaultPeerConnectionConstraints = [[RTCMediaConstraints alloc] init];
+  caller.defaultPeerConnectionConstraints =
+      [[RTCMediaConstraints alloc] initWithMandatoryConstraints:nil
+                                            optionalConstraints:nil];
   weakCaller = caller;
 
   answerer = [self createAppClientForRoomId:roomId
                                    clientId:answererId
                                 isInitiator:NO
                                    messages:[NSArray array]
                              messageHandler:^(ARDSignalingMessage *message) {
     ARDAppClient *strongCaller = weakCaller;
     [strongCaller channel:strongCaller.channel didReceiveMessage:message];
   } connectedHandler:^{
     [answererConnectionExpectation fulfill];
   }];
   // TODO(tkchin): Figure out why DTLS-SRTP constraint causes thread assertion
   // crash in Debug.
   answerer.defaultPeerConnectionConstraints =
-      [[RTCMediaConstraints alloc] init];
+      [[RTCMediaConstraints alloc] initWithMandatoryConstraints:nil
+                                            optionalConstraints:nil];
   weakAnswerer = answerer;
 
   // Kick off connection.
   [caller connectToRoomWithId:roomId isLoopback:NO isAudioOnly:NO];
   [answerer connectToRoomWithId:roomId isLoopback:NO isAudioOnly:NO];
   [self waitForExpectationsWithTimeout:20 handler:^(NSError *error) {
     if (error) {
       NSLog(@"Expectations error: %@", error);
     }
   }];
 }
 
 @end
 
 @interface ARDSDPUtilsTest : ARDTestCase
 - (void)testPreferVideoCodec;
 @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];
   }
 }