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

talk/app/webrtc/objctests/RTCPeerConnectionTest.mm

 /*
  * libjingle
  * Copyright 2013 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 28 matching lines @@
 #import "RTCVideoRenderer.h"
 #import "RTCVideoTrack.h"
 
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/ssladapter.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #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
 
 @implementation RTCFakeRenderer
 
 - (void)setSize:(CGSize)size {}
 - (void)renderFrame:(RTCI420Frame*)frame {}
 
 @end
 
@@ skipping 169 matching lines @@
 
   for (RTCICECandidate* candidate in offeringExpectations
            .releaseReceivedICECandidates) {
     [pcAnswer addICECandidate:candidate];
   }
   for (RTCICECandidate* candidate in answeringExpectations
            .releaseReceivedICECandidates) {
     [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);
 
   // Test send and receive UTF-8 text
   NSString* text = @"你好";
   NSData* textData = [text dataUsingEncoding:NSUTF8StringEncoding];
   RTCDataBuffer* buffer =
       [[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;
   char bytes[byteLength] = {1, 2, 3, 4, 5};
   NSData* byteData = [NSData dataWithBytes:bytes length:byteLength];
   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];
   [offeringExpectations expectStateChange:kRTCDataChannelStateClosed];
   [answeringExpectations expectStateChange:kRTCDataChannelStateClosed];
 
   [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;
   answeringExpectations.dataChannel.delegate = nil;
 
   // Let the audio feedback run for 2s to allow human testing and to ensure
   // things stabilize.  TODO(fischman): replace seconds with # of video frames,
   // when we have video flowing.
   [[NSRunLoop currentRunLoop]
       runUntilDate:[NSDate dateWithTimeIntervalSinceNow:2]];
 
   [offeringExpectations expectICEConnectionChange:RTCICEConnectionClosed];
   [answeringExpectations expectICEConnectionChange:RTCICEConnectionClosed];
   [offeringExpectations expectSignalingChange:RTCSignalingClosed];
   [answeringExpectations expectSignalingChange:RTCSignalingClosed];
 
   [pcOffer close];
   [pcAnswer close];
 
-  [offeringExpectations waitForAllExpectationsToBeSatisfied];
-  [answeringExpectations waitForAllExpectationsToBeSatisfied];
+  EXPECT_TRUE([offeringExpectations
+      waitForAllExpectationsToBeSatisfiedWithTimeout:TIMEOUT_SECONDS]);
+  EXPECT_TRUE([answeringExpectations
+      waitForAllExpectationsToBeSatisfiedWithTimeout:TIMEOUT_SECONDS]);
 
   capturer = nil;
   videoSource = nil;
   pcOffer = nil;
   pcAnswer = nil;
   // TODO(fischman): be stricter about shutdown checks; ensure thread
   // counts return to where they were before the test kicked off, and
   // that all objects have in fact shut down.
 }
 
@@ skipping 13 matching lines @@
     // factory outlives RTCPeerConnection:dealloc.
     // See https://code.google.com/p/webrtc/issues/detail?id=3100.
     RTCPeerConnectionFactory* factory = [[RTCPeerConnectionFactory alloc] init];
     @autoreleasepool {
       RTCPeerConnectionTest* pcTest = [[RTCPeerConnectionTest alloc] init];
       [pcTest testCompleteSessionWithFactory:factory];
     }
     rtc::CleanupSSL();
   }
 }