| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 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 |
| (...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 487 SctpDataMediaChannel::SendThresholdCallback(sock, 0); | 487 SctpDataMediaChannel::SendThresholdCallback(sock, 0); |
| 488 EXPECT_GT(channel1_ready_to_send_count(), prior_count); | 488 EXPECT_GT(channel1_ready_to_send_count(), prior_count); |
| 489 } | 489 } |
| 490 | 490 |
| 491 TEST_F(SctpDataMediaChannelTest, RefusesHighNumberedChannels) { | 491 TEST_F(SctpDataMediaChannelTest, RefusesHighNumberedChannels) { |
| 492 SetupConnectedChannels(); | 492 SetupConnectedChannels(); |
| 493 EXPECT_TRUE(AddStream(1022)); | 493 EXPECT_TRUE(AddStream(1022)); |
| 494 EXPECT_FALSE(AddStream(1023)); | 494 EXPECT_FALSE(AddStream(1023)); |
| 495 } | 495 } |
| 496 | 496 |
| 497 // Flaky on Linux and Windows. See webrtc:4453. | 497 // Flaky, see webrtc:4453. |
| 498 #if defined(WEBRTC_WIN) || defined(WEBRTC_LINUX) | 498 TEST_F(SctpDataMediaChannelTest, DISABLED_ReusesAStream) { |
| 499 #define MAYBE_ReusesAStream DISABLED_ReusesAStream | |
| 500 #else | |
| 501 #define MAYBE_ReusesAStream ReusesAStream | |
| 502 #endif | |
| 503 TEST_F(SctpDataMediaChannelTest, MAYBE_ReusesAStream) { | |
| 504 // Shut down channel 1, then open it up again for reuse. | 499 // Shut down channel 1, then open it up again for reuse. |
| 505 SetupConnectedChannels(); | 500 SetupConnectedChannels(); |
| 506 SendDataResult result; | 501 SendDataResult result; |
| 507 SignalChannelClosedObserver chan_2_sig_receiver; | 502 SignalChannelClosedObserver chan_2_sig_receiver; |
| 508 chan_2_sig_receiver.BindSelf(channel2()); | 503 chan_2_sig_receiver.BindSelf(channel2()); |
| 509 | 504 |
| 510 ASSERT_TRUE(SendData(channel1(), 1, "hello?", &result)); | 505 ASSERT_TRUE(SendData(channel1(), 1, "hello?", &result)); |
| 511 EXPECT_EQ(SDR_SUCCESS, result); | 506 EXPECT_EQ(SDR_SUCCESS, result); |
| 512 EXPECT_TRUE_WAIT(ReceivedData(receiver2(), 1, "hello?"), 1000); | 507 EXPECT_TRUE_WAIT(ReceivedData(receiver2(), 1, "hello?"), 1000); |
| 513 | 508 |
| 514 channel1()->RemoveSendStream(1); | 509 channel1()->RemoveSendStream(1); |
| 515 EXPECT_TRUE_WAIT(chan_2_sig_receiver.WasStreamClosed(1), 1000); | 510 EXPECT_TRUE_WAIT(chan_2_sig_receiver.WasStreamClosed(1), 1000); |
| 516 // Channel 1 is gone now. | 511 // Channel 1 is gone now. |
| 517 | 512 |
| 518 // Create a new channel 1. | 513 // Create a new channel 1. |
| 519 AddStream(1); | 514 AddStream(1); |
| 520 ASSERT_TRUE(SendData(channel1(), 1, "hi?", &result)); | 515 ASSERT_TRUE(SendData(channel1(), 1, "hi?", &result)); |
| 521 EXPECT_EQ(SDR_SUCCESS, result); | 516 EXPECT_EQ(SDR_SUCCESS, result); |
| 522 EXPECT_TRUE_WAIT(ReceivedData(receiver2(), 1, "hi?"), 1000); | 517 EXPECT_TRUE_WAIT(ReceivedData(receiver2(), 1, "hi?"), 1000); |
| 523 channel1()->RemoveSendStream(1); | 518 channel1()->RemoveSendStream(1); |
| 524 EXPECT_TRUE_WAIT(chan_2_sig_receiver.StreamCloseCount(1) == 2, 1000); | 519 EXPECT_TRUE_WAIT(chan_2_sig_receiver.StreamCloseCount(1) == 2, 1000); |
| 525 } | 520 } |
| 526 | 521 |
| 527 } // namespace cricket | 522 } // namespace cricket |
| OLD | NEW |