OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2012 Google Inc. | 3 * Copyright 2012 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, |
(...skipping 1067 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1078 observer_.ice_gathering_state_, | 1078 observer_.ice_gathering_state_, |
1079 kIceCandidatesTimeout); | 1079 kIceCandidatesTimeout); |
1080 EXPECT_TRUE_WAIT(observer_.oncandidatesready_, kIceCandidatesTimeout); | 1080 EXPECT_TRUE_WAIT(observer_.oncandidatesready_, kIceCandidatesTimeout); |
1081 EXPECT_EQ_WAIT(PeerConnectionInterface::kIceGatheringComplete, | 1081 EXPECT_EQ_WAIT(PeerConnectionInterface::kIceGatheringComplete, |
1082 observer_.ice_gathering_state_, | 1082 observer_.ice_gathering_state_, |
1083 kIceCandidatesTimeout); | 1083 kIceCandidatesTimeout); |
1084 | 1084 |
1085 std::string sdp; | 1085 std::string sdp; |
1086 offer->ToString(&sdp); | 1086 offer->ToString(&sdp); |
1087 SessionDescriptionInterface* desc = | 1087 SessionDescriptionInterface* desc = |
1088 webrtc::CreateSessionDescription(JsepSessionDescription::kAnswer, sdp); | 1088 webrtc::CreateSessionDescription( |
| 1089 JsepSessionDescription::kAnswer, sdp, nullptr); |
1089 ASSERT_TRUE(desc != NULL); | 1090 ASSERT_TRUE(desc != NULL); |
1090 SetRemoteDescriptionWithoutError(desc); | 1091 SetRemoteDescriptionWithoutError(desc); |
1091 | 1092 |
1092 EXPECT_EQ_WAIT(PeerConnectionInterface::kIceConnectionChecking, | 1093 EXPECT_EQ_WAIT(PeerConnectionInterface::kIceConnectionChecking, |
1093 observer_.ice_connection_state_, | 1094 observer_.ice_connection_state_, |
1094 kIceCandidatesTimeout); | 1095 kIceCandidatesTimeout); |
1095 | 1096 |
1096 // The ice connection state is "Connected" too briefly to catch in a test. | 1097 // The ice connection state is "Connected" too briefly to catch in a test. |
1097 EXPECT_EQ_WAIT(PeerConnectionInterface::kIceConnectionCompleted, | 1098 EXPECT_EQ_WAIT(PeerConnectionInterface::kIceConnectionCompleted, |
1098 observer_.ice_connection_state_, | 1099 observer_.ice_connection_state_, |
(...skipping 2784 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3883 // terminated. The offer creation may or may not have succeeded, but we | 3884 // terminated. The offer creation may or may not have succeeded, but we |
3884 // must have received a notification which, so the only invalid state | 3885 // must have received a notification which, so the only invalid state |
3885 // is kInit. | 3886 // is kInit. |
3886 EXPECT_NE(WebRtcSessionCreateSDPObserverForTest::kInit, o->state()); | 3887 EXPECT_NE(WebRtcSessionCreateSDPObserverForTest::kInit, o->state()); |
3887 } | 3888 } |
3888 } | 3889 } |
3889 | 3890 |
3890 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test | 3891 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test |
3891 // currently fails because upon disconnection and reconnection OnIceComplete is | 3892 // currently fails because upon disconnection and reconnection OnIceComplete is |
3892 // called more than once without returning to IceGatheringGathering. | 3893 // called more than once without returning to IceGatheringGathering. |
OLD | NEW |