OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2013 Google Inc. | 3 * Copyright 2013 Google Inc. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
11 * this list of conditions and the following disclaimer in the documentation | 11 * this list of conditions and the following disclaimer in the documentation |
12 * and/or other materials provided with the distribution. | 12 * and/or other materials provided with the distribution. |
13 * 3. The name of the author may not be used to endorse or promote products | 13 * 3. The name of the author may not be used to endorse or promote products |
14 * derived from this software without specific prior written permission. | 14 * derived from this software without specific prior written permission. |
15 * | 15 * |
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED | 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED |
17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF |
18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO | 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO |
19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; |
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, |
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR |
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 */ | 26 */ |
27 | 27 |
28 #include "talk/app/webrtc/test/peerconnectiontestwrapper.h" | 28 #include "talk/app/webrtc/test/peerconnectiontestwrapper.h" |
29 #include "talk/app/webrtc/test/mockpeerconnectionobservers.h" | 29 #include "talk/app/webrtc/test/mockpeerconnectionobservers.h" |
| 30 #ifdef WEBRTC_ANDROID |
| 31 #include "talk/app/webrtc/test/androidtestinitializer.h" |
| 32 #endif |
30 #include "webrtc/base/gunit.h" | 33 #include "webrtc/base/gunit.h" |
31 #include "webrtc/base/logging.h" | 34 #include "webrtc/base/logging.h" |
32 #include "webrtc/base/ssladapter.h" | 35 #include "webrtc/base/ssladapter.h" |
33 #include "webrtc/base/sslstreamadapter.h" | 36 #include "webrtc/base/sslstreamadapter.h" |
34 #include "webrtc/base/stringencode.h" | 37 #include "webrtc/base/stringencode.h" |
35 #include "webrtc/base/stringutils.h" | 38 #include "webrtc/base/stringutils.h" |
36 | 39 |
37 #define MAYBE_SKIP_TEST(feature) \ | 40 #define MAYBE_SKIP_TEST(feature) \ |
38 if (!(feature())) { \ | 41 if (!(feature())) { \ |
39 LOG(LS_INFO) << "Feature disabled... skipping"; \ | 42 LOG(LS_INFO) << "Feature disabled... skipping"; \ |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 public testing::Test { | 110 public testing::Test { |
108 public: | 111 public: |
109 typedef std::vector<rtc::scoped_refptr<DataChannelInterface> > | 112 typedef std::vector<rtc::scoped_refptr<DataChannelInterface> > |
110 DataChannelList; | 113 DataChannelList; |
111 | 114 |
112 PeerConnectionEndToEndTest() | 115 PeerConnectionEndToEndTest() |
113 : caller_(new rtc::RefCountedObject<PeerConnectionTestWrapper>( | 116 : caller_(new rtc::RefCountedObject<PeerConnectionTestWrapper>( |
114 "caller")), | 117 "caller")), |
115 callee_(new rtc::RefCountedObject<PeerConnectionTestWrapper>( | 118 callee_(new rtc::RefCountedObject<PeerConnectionTestWrapper>( |
116 "callee")) { | 119 "callee")) { |
| 120 #ifdef WEBRTC_ANDROID |
| 121 webrtc::InitializeAndroidObjects(); |
| 122 #endif |
117 } | 123 } |
118 | 124 |
119 void CreatePcs() { | 125 void CreatePcs() { |
120 CreatePcs(NULL); | 126 CreatePcs(NULL); |
121 } | 127 } |
122 | 128 |
123 void CreatePcs(const MediaConstraintsInterface* pc_constraints) { | 129 void CreatePcs(const MediaConstraintsInterface* pc_constraints) { |
124 EXPECT_TRUE(caller_->CreatePc(pc_constraints)); | 130 EXPECT_TRUE(caller_->CreatePc(pc_constraints)); |
125 EXPECT_TRUE(callee_->CreatePc(pc_constraints)); | 131 EXPECT_TRUE(callee_->CreatePc(pc_constraints)); |
126 PeerConnectionTestWrapper::Connect(caller_.get(), callee_.get()); | 132 PeerConnectionTestWrapper::Connect(caller_.get(), callee_.get()); |
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
421 WaitForDataChannelsToOpen(caller_dc, callee_signaled_data_channels_, 0); | 427 WaitForDataChannelsToOpen(caller_dc, callee_signaled_data_channels_, 0); |
422 // This removes the reference to the remote data channel that we hold. | 428 // This removes the reference to the remote data channel that we hold. |
423 callee_signaled_data_channels_.clear(); | 429 callee_signaled_data_channels_.clear(); |
424 caller_dc->Close(); | 430 caller_dc->Close(); |
425 EXPECT_EQ_WAIT(DataChannelInterface::kClosed, caller_dc->state(), kMaxWait); | 431 EXPECT_EQ_WAIT(DataChannelInterface::kClosed, caller_dc->state(), kMaxWait); |
426 | 432 |
427 // Wait for a bit longer so the remote data channel will receive the | 433 // Wait for a bit longer so the remote data channel will receive the |
428 // close message and be destroyed. | 434 // close message and be destroyed. |
429 rtc::Thread::Current()->ProcessMessages(100); | 435 rtc::Thread::Current()->ProcessMessages(100); |
430 } | 436 } |
OLD | NEW |