Adding 20-second timeout to Java and Objective-C tests.

talk/app/webrtc/objctests/RTCPeerConnectionTest.mm

Index: talk/app/webrtc/objctests/RTCPeerConnectionTest.mm
diff --git a/talk/app/webrtc/objctests/RTCPeerConnectionTest.mm b/talk/app/webrtc/objctests/RTCPeerConnectionTest.mm
index 050c9f4c95dd61acdacd6b23718e618373a4a88d..1b4412ee3146b6766b7ed040a52c04f057dd04aa 100644
--- a/talk/app/webrtc/objctests/RTCPeerConnectionTest.mm
+++ b/talk/app/webrtc/objctests/RTCPeerConnectionTest.mm
@@ -46,6 +46,8 @@
 #error "This file requires ARC support."
 #endif
 
+#define TIMEOUT_SECONDS 20

[tkchin_webrtc, 2015/09/25 15:40:32]

Avoid defines, prefer constants.
const NSTimeInterval kRTCPeerConnectionTestTimeout = 20;

[Taylor Brandstetter, 2015/09/25 18:01:57]

Ah. I wasn't sure how to avoid the constant having external linkage (since I
can't do the unnamed namespace trick in Objective-C). But having a long name is
a sensible workaround.

[tkchin_webrtc, 2015/09/25 19:51:03]

Yeh, this is a standard thing in ObjC - just add the class as a prefix to static
constants.

+
 @interface RTCFakeRenderer : NSObject <RTCVideoRenderer>
 @end
 
@@ -235,8 +237,10 @@
     [pcOffer addICECandidate:candidate];
   }
 
-  [offeringExpectations waitForAllExpectationsToBeSatisfied];
-  [answeringExpectations waitForAllExpectationsToBeSatisfied];
+  EXPECT_TRUE([offeringExpectations

[tkchin_webrtc, 2015/09/25 15:40:32]

Wouldn't this be a critical failure? Do we want ASSERT_TRUE? Since likely if
this fails everything else will too. No point waiting.

[Taylor Brandstetter, 2015/09/25 18:01:57]

Well, not necessarily. The last time this broke for me, it was because it was
expecting 2 ICE candidates and got 1, but everything else worked fine. Also, the
equivalent C++ end-to-end tests don't use ASSERT in this kind of situation.

[tkchin_webrtc, 2015/09/25 19:51:03]

Gotcha.

+      waitForAllExpectationsToBeSatisfiedWithTimeout:TIMEOUT_SECONDS]);
+  EXPECT_TRUE([answeringExpectations
+      waitForAllExpectationsToBeSatisfiedWithTimeout:TIMEOUT_SECONDS]);
 
   EXPECT_EQ(pcOffer.signalingState, RTCSignalingStable);
   EXPECT_EQ(pcAnswer.signalingState, RTCSignalingStable);
@@ -248,7 +252,8 @@
       [[RTCDataBuffer alloc] initWithData:textData isBinary:NO];
   [answeringExpectations expectMessage:[textData copy] isBinary:NO];
   EXPECT_TRUE([offeringExpectations.dataChannel sendData:buffer]);
-  [answeringExpectations waitForAllExpectationsToBeSatisfied];
+  EXPECT_TRUE([answeringExpectations
+      waitForAllExpectationsToBeSatisfiedWithTimeout:TIMEOUT_SECONDS]);
 
   // Test send and receive binary data
   const size_t byteLength = 5;
@@ -257,7 +262,8 @@
   buffer = [[RTCDataBuffer alloc] initWithData:byteData isBinary:YES];
   [answeringExpectations expectMessage:[byteData copy] isBinary:YES];
   EXPECT_TRUE([offeringExpectations.dataChannel sendData:buffer]);
-  [answeringExpectations waitForAllExpectationsToBeSatisfied];
+  EXPECT_TRUE([answeringExpectations
+      waitForAllExpectationsToBeSatisfiedWithTimeout:TIMEOUT_SECONDS]);
 
   [offeringExpectations expectStateChange:kRTCDataChannelStateClosing];
   [answeringExpectations expectStateChange:kRTCDataChannelStateClosing];
@@ -267,8 +273,10 @@
   [answeringExpectations.dataChannel close];
   [offeringExpectations.dataChannel close];
 
-  [offeringExpectations waitForAllExpectationsToBeSatisfied];
-  [answeringExpectations waitForAllExpectationsToBeSatisfied];
+  EXPECT_TRUE([offeringExpectations
+      waitForAllExpectationsToBeSatisfiedWithTimeout:TIMEOUT_SECONDS]);
+  EXPECT_TRUE([answeringExpectations
+      waitForAllExpectationsToBeSatisfiedWithTimeout:TIMEOUT_SECONDS]);
   // Don't need to listen to further state changes.
   // TODO(tkchin): figure out why Closed->Closing without this.
   offeringExpectations.dataChannel.delegate = nil;
@@ -288,8 +296,10 @@
   [pcOffer close];
   [pcAnswer close];
 
-  [offeringExpectations waitForAllExpectationsToBeSatisfied];
-  [answeringExpectations waitForAllExpectationsToBeSatisfied];
+  EXPECT_TRUE([offeringExpectations
+      waitForAllExpectationsToBeSatisfiedWithTimeout:TIMEOUT_SECONDS]);
+  EXPECT_TRUE([answeringExpectations
+      waitForAllExpectationsToBeSatisfiedWithTimeout:TIMEOUT_SECONDS]);
 
   capturer = nil;
   videoSource = nil;