| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 #include <utility> | 11 #include <utility> |
| 12 #include <vector> | 12 #include <vector> |
| 13 | 13 |
| 14 #include "talk/session/media/channelmanager.h" | |
| 15 #include "talk/session/media/mediasession.h" | |
| 16 #include "webrtc/api/audiotrack.h" | 14 #include "webrtc/api/audiotrack.h" |
| 17 #include "webrtc/api/fakemediacontroller.h" | 15 #include "webrtc/api/fakemediacontroller.h" |
| 18 #include "webrtc/api/fakemetricsobserver.h" | 16 #include "webrtc/api/fakemetricsobserver.h" |
| 19 #include "webrtc/api/jsepicecandidate.h" | 17 #include "webrtc/api/jsepicecandidate.h" |
| 20 #include "webrtc/api/jsepsessiondescription.h" | 18 #include "webrtc/api/jsepsessiondescription.h" |
| 21 #include "webrtc/api/peerconnection.h" | 19 #include "webrtc/api/peerconnection.h" |
| 22 #include "webrtc/api/sctputils.h" | 20 #include "webrtc/api/sctputils.h" |
| 23 #include "webrtc/api/streamcollection.h" | 21 #include "webrtc/api/streamcollection.h" |
| 24 #include "webrtc/api/streamcollection.h" | 22 #include "webrtc/api/streamcollection.h" |
| 25 #include "webrtc/api/test/fakeconstraints.h" | 23 #include "webrtc/api/test/fakeconstraints.h" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 41 #include "webrtc/base/virtualsocketserver.h" | 39 #include "webrtc/base/virtualsocketserver.h" |
| 42 #include "webrtc/media/base/fakemediaengine.h" | 40 #include "webrtc/media/base/fakemediaengine.h" |
| 43 #include "webrtc/media/base/fakevideorenderer.h" | 41 #include "webrtc/media/base/fakevideorenderer.h" |
| 44 #include "webrtc/media/base/mediachannel.h" | 42 #include "webrtc/media/base/mediachannel.h" |
| 45 #include "webrtc/media/engine/fakewebrtccall.h" | 43 #include "webrtc/media/engine/fakewebrtccall.h" |
| 46 #include "webrtc/p2p/base/stunserver.h" | 44 #include "webrtc/p2p/base/stunserver.h" |
| 47 #include "webrtc/p2p/base/teststunserver.h" | 45 #include "webrtc/p2p/base/teststunserver.h" |
| 48 #include "webrtc/p2p/base/testturnserver.h" | 46 #include "webrtc/p2p/base/testturnserver.h" |
| 49 #include "webrtc/p2p/base/transportchannel.h" | 47 #include "webrtc/p2p/base/transportchannel.h" |
| 50 #include "webrtc/p2p/client/basicportallocator.h" | 48 #include "webrtc/p2p/client/basicportallocator.h" |
| 49 #include "webrtc/pc/channelmanager.h" |
| 50 #include "webrtc/pc/mediasession.h" |
| 51 | 51 |
| 52 #define MAYBE_SKIP_TEST(feature) \ | 52 #define MAYBE_SKIP_TEST(feature) \ |
| 53 if (!(feature())) { \ | 53 if (!(feature())) { \ |
| 54 LOG(LS_INFO) << "Feature disabled... skipping"; \ | 54 LOG(LS_INFO) << "Feature disabled... skipping"; \ |
| 55 return; \ | 55 return; \ |
| 56 } | 56 } |
| 57 | 57 |
| 58 using cricket::FakeVoiceMediaChannel; | 58 using cricket::FakeVoiceMediaChannel; |
| 59 using cricket::TransportInfo; | 59 using cricket::TransportInfo; |
| 60 using rtc::SocketAddress; | 60 using rtc::SocketAddress; |
| (...skipping 4215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4276 } | 4276 } |
| 4277 | 4277 |
| 4278 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test | 4278 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test |
| 4279 // currently fails because upon disconnection and reconnection OnIceComplete is | 4279 // currently fails because upon disconnection and reconnection OnIceComplete is |
| 4280 // called more than once without returning to IceGatheringGathering. | 4280 // called more than once without returning to IceGatheringGathering. |
| 4281 | 4281 |
| 4282 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests, | 4282 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests, |
| 4283 WebRtcSessionTest, | 4283 WebRtcSessionTest, |
| 4284 testing::Values(ALREADY_GENERATED, | 4284 testing::Values(ALREADY_GENERATED, |
| 4285 DTLS_IDENTITY_STORE)); | 4285 DTLS_IDENTITY_STORE)); |
| OLD | NEW |