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 1329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1340 rtc::scoped_refptr<webrtc::FakeMetricsObserver> | 1340 rtc::scoped_refptr<webrtc::FakeMetricsObserver> |
1341 init_observer = new rtc::RefCountedObject<webrtc::FakeMetricsObserver>(); | 1341 init_observer = new rtc::RefCountedObject<webrtc::FakeMetricsObserver>(); |
1342 initializing_client()->pc()->RegisterUMAObserver(init_observer); | 1342 initializing_client()->pc()->RegisterUMAObserver(init_observer); |
1343 LocalP2PTest(); | 1343 LocalP2PTest(); |
1344 | 1344 |
1345 EXPECT_EQ_WAIT( | 1345 EXPECT_EQ_WAIT( |
1346 rtc::SSLStreamAdapter::GetDefaultSslCipher(rtc::SSL_PROTOCOL_DTLS_10), | 1346 rtc::SSLStreamAdapter::GetDefaultSslCipher(rtc::SSL_PROTOCOL_DTLS_10), |
1347 initializing_client()->GetDtlsCipherStats(), | 1347 initializing_client()->GetDtlsCipherStats(), |
1348 kMaxWaitForStatsMs); | 1348 kMaxWaitForStatsMs); |
1349 EXPECT_EQ( | 1349 EXPECT_EQ( |
1350 rtc::SSLStreamAdapter::GetDefaultSslCipher(rtc::SSL_PROTOCOL_DTLS_10), | 1350 init_observer->GetEnumCounter( |
1351 init_observer->GetStringHistogramSample(webrtc::kAudioSslCipher)); | 1351 webrtc::kEnumCounterAudioSslCipher, |
1352 webrtc::GetCipherType(rtc::SSLStreamAdapter::GetDefaultSslCipher( | |
1353 rtc::SSL_PROTOCOL_DTLS_10))), | |
1354 1); | |
joachim
2015/09/18 22:24:25
Shouldn't this be EXPECT_EQ(1, ...) here and below
guoweis_webrtc
2015/09/22 19:59:39
Done.
| |
1352 | 1355 |
1353 EXPECT_EQ_WAIT( | 1356 EXPECT_EQ_WAIT( |
1354 kDefaultSrtpCipher, | 1357 kDefaultSrtpCipher, |
1355 initializing_client()->GetSrtpCipherStats(), | 1358 initializing_client()->GetSrtpCipherStats(), |
1356 kMaxWaitForStatsMs); | 1359 kMaxWaitForStatsMs); |
1357 EXPECT_EQ( | 1360 EXPECT_EQ( |
1358 kDefaultSrtpCipher, | 1361 init_observer->GetEnumCounter(webrtc::kEnumCounterAudioSrtpCipher, |
1359 init_observer->GetStringHistogramSample(webrtc::kAudioSrtpCipher)); | 1362 webrtc::GetCipherType(kDefaultSrtpCipher)), |
1363 1); | |
1360 } | 1364 } |
1361 | 1365 |
1362 // Test that DTLS 1.2 is used if both ends support it. | 1366 // Test that DTLS 1.2 is used if both ends support it. |
1363 TEST_F(JsepPeerConnectionP2PTestClient, GetDtls12Both) { | 1367 TEST_F(JsepPeerConnectionP2PTestClient, GetDtls12Both) { |
1364 PeerConnectionFactory::Options init_options; | 1368 PeerConnectionFactory::Options init_options; |
1365 init_options.ssl_max_version = rtc::SSL_PROTOCOL_DTLS_12; | 1369 init_options.ssl_max_version = rtc::SSL_PROTOCOL_DTLS_12; |
1366 PeerConnectionFactory::Options recv_options; | 1370 PeerConnectionFactory::Options recv_options; |
1367 recv_options.ssl_max_version = rtc::SSL_PROTOCOL_DTLS_12; | 1371 recv_options.ssl_max_version = rtc::SSL_PROTOCOL_DTLS_12; |
1368 ASSERT_TRUE(CreateTestClients(NULL, &init_options, NULL, &recv_options)); | 1372 ASSERT_TRUE(CreateTestClients(NULL, &init_options, NULL, &recv_options)); |
1369 rtc::scoped_refptr<webrtc::FakeMetricsObserver> | 1373 rtc::scoped_refptr<webrtc::FakeMetricsObserver> |
1370 init_observer = new rtc::RefCountedObject<webrtc::FakeMetricsObserver>(); | 1374 init_observer = new rtc::RefCountedObject<webrtc::FakeMetricsObserver>(); |
1371 initializing_client()->pc()->RegisterUMAObserver(init_observer); | 1375 initializing_client()->pc()->RegisterUMAObserver(init_observer); |
1372 LocalP2PTest(); | 1376 LocalP2PTest(); |
1373 | 1377 |
1374 EXPECT_EQ_WAIT( | 1378 EXPECT_EQ_WAIT( |
1375 rtc::SSLStreamAdapter::GetDefaultSslCipher(rtc::SSL_PROTOCOL_DTLS_12), | 1379 rtc::SSLStreamAdapter::GetDefaultSslCipher(rtc::SSL_PROTOCOL_DTLS_12), |
1376 initializing_client()->GetDtlsCipherStats(), | 1380 initializing_client()->GetDtlsCipherStats(), |
1377 kMaxWaitForStatsMs); | 1381 kMaxWaitForStatsMs); |
1378 EXPECT_EQ( | 1382 EXPECT_EQ( |
1379 rtc::SSLStreamAdapter::GetDefaultSslCipher(rtc::SSL_PROTOCOL_DTLS_12), | 1383 init_observer->GetEnumCounter( |
1380 init_observer->GetStringHistogramSample(webrtc::kAudioSslCipher)); | 1384 webrtc::kEnumCounterAudioSslCipher, |
1385 webrtc::GetCipherType(rtc::SSLStreamAdapter::GetDefaultSslCipher( | |
1386 rtc::SSL_PROTOCOL_DTLS_12))), | |
1387 1); | |
1381 | 1388 |
1382 EXPECT_EQ_WAIT( | 1389 EXPECT_EQ_WAIT( |
1383 kDefaultSrtpCipher, | 1390 kDefaultSrtpCipher, |
1384 initializing_client()->GetSrtpCipherStats(), | 1391 initializing_client()->GetSrtpCipherStats(), |
1385 kMaxWaitForStatsMs); | 1392 kMaxWaitForStatsMs); |
1386 EXPECT_EQ( | 1393 EXPECT_EQ( |
1387 kDefaultSrtpCipher, | 1394 init_observer->GetEnumCounter(webrtc::kEnumCounterAudioSrtpCipher, |
1388 init_observer->GetStringHistogramSample(webrtc::kAudioSrtpCipher)); | 1395 webrtc::GetCipherType(kDefaultSrtpCipher)), |
1396 1); | |
1389 } | 1397 } |
1390 | 1398 |
1391 // Test that DTLS 1.0 is used if the initator supports DTLS 1.2 and the | 1399 // Test that DTLS 1.0 is used if the initator supports DTLS 1.2 and the |
1392 // received supports 1.0. | 1400 // received supports 1.0. |
1393 TEST_F(JsepPeerConnectionP2PTestClient, GetDtls12Init) { | 1401 TEST_F(JsepPeerConnectionP2PTestClient, GetDtls12Init) { |
1394 PeerConnectionFactory::Options init_options; | 1402 PeerConnectionFactory::Options init_options; |
1395 init_options.ssl_max_version = rtc::SSL_PROTOCOL_DTLS_12; | 1403 init_options.ssl_max_version = rtc::SSL_PROTOCOL_DTLS_12; |
1396 PeerConnectionFactory::Options recv_options; | 1404 PeerConnectionFactory::Options recv_options; |
1397 recv_options.ssl_max_version = rtc::SSL_PROTOCOL_DTLS_10; | 1405 recv_options.ssl_max_version = rtc::SSL_PROTOCOL_DTLS_10; |
1398 ASSERT_TRUE(CreateTestClients(NULL, &init_options, NULL, &recv_options)); | 1406 ASSERT_TRUE(CreateTestClients(NULL, &init_options, NULL, &recv_options)); |
1399 rtc::scoped_refptr<webrtc::FakeMetricsObserver> | 1407 rtc::scoped_refptr<webrtc::FakeMetricsObserver> |
1400 init_observer = new rtc::RefCountedObject<webrtc::FakeMetricsObserver>(); | 1408 init_observer = new rtc::RefCountedObject<webrtc::FakeMetricsObserver>(); |
1401 initializing_client()->pc()->RegisterUMAObserver(init_observer); | 1409 initializing_client()->pc()->RegisterUMAObserver(init_observer); |
1402 LocalP2PTest(); | 1410 LocalP2PTest(); |
1403 | 1411 |
1404 EXPECT_EQ_WAIT( | 1412 EXPECT_EQ_WAIT( |
1405 rtc::SSLStreamAdapter::GetDefaultSslCipher(rtc::SSL_PROTOCOL_DTLS_10), | 1413 rtc::SSLStreamAdapter::GetDefaultSslCipher(rtc::SSL_PROTOCOL_DTLS_10), |
1406 initializing_client()->GetDtlsCipherStats(), | 1414 initializing_client()->GetDtlsCipherStats(), |
1407 kMaxWaitForStatsMs); | 1415 kMaxWaitForStatsMs); |
1408 EXPECT_EQ( | 1416 EXPECT_EQ( |
1409 rtc::SSLStreamAdapter::GetDefaultSslCipher(rtc::SSL_PROTOCOL_DTLS_10), | 1417 init_observer->GetEnumCounter( |
1410 init_observer->GetStringHistogramSample(webrtc::kAudioSslCipher)); | 1418 webrtc::kEnumCounterAudioSslCipher, |
1419 webrtc::GetCipherType(rtc::SSLStreamAdapter::GetDefaultSslCipher( | |
1420 rtc::SSL_PROTOCOL_DTLS_10))), | |
1421 1); | |
1411 | 1422 |
1412 EXPECT_EQ_WAIT( | 1423 EXPECT_EQ_WAIT( |
1413 kDefaultSrtpCipher, | 1424 kDefaultSrtpCipher, |
1414 initializing_client()->GetSrtpCipherStats(), | 1425 initializing_client()->GetSrtpCipherStats(), |
1415 kMaxWaitForStatsMs); | 1426 kMaxWaitForStatsMs); |
1416 EXPECT_EQ( | 1427 EXPECT_EQ( |
1417 kDefaultSrtpCipher, | 1428 init_observer->GetEnumCounter(webrtc::kEnumCounterAudioSrtpCipher, |
1418 init_observer->GetStringHistogramSample(webrtc::kAudioSrtpCipher)); | 1429 webrtc::GetCipherType(kDefaultSrtpCipher)), |
1430 1); | |
1419 } | 1431 } |
1420 | 1432 |
1421 // Test that DTLS 1.0 is used if the initator supports DTLS 1.0 and the | 1433 // Test that DTLS 1.0 is used if the initator supports DTLS 1.0 and the |
1422 // received supports 1.2. | 1434 // received supports 1.2. |
1423 TEST_F(JsepPeerConnectionP2PTestClient, GetDtls12Recv) { | 1435 TEST_F(JsepPeerConnectionP2PTestClient, GetDtls12Recv) { |
1424 PeerConnectionFactory::Options init_options; | 1436 PeerConnectionFactory::Options init_options; |
1425 init_options.ssl_max_version = rtc::SSL_PROTOCOL_DTLS_10; | 1437 init_options.ssl_max_version = rtc::SSL_PROTOCOL_DTLS_10; |
1426 PeerConnectionFactory::Options recv_options; | 1438 PeerConnectionFactory::Options recv_options; |
1427 recv_options.ssl_max_version = rtc::SSL_PROTOCOL_DTLS_12; | 1439 recv_options.ssl_max_version = rtc::SSL_PROTOCOL_DTLS_12; |
1428 ASSERT_TRUE(CreateTestClients(NULL, &init_options, NULL, &recv_options)); | 1440 ASSERT_TRUE(CreateTestClients(NULL, &init_options, NULL, &recv_options)); |
1429 rtc::scoped_refptr<webrtc::FakeMetricsObserver> | 1441 rtc::scoped_refptr<webrtc::FakeMetricsObserver> |
1430 init_observer = new rtc::RefCountedObject<webrtc::FakeMetricsObserver>(); | 1442 init_observer = new rtc::RefCountedObject<webrtc::FakeMetricsObserver>(); |
1431 initializing_client()->pc()->RegisterUMAObserver(init_observer); | 1443 initializing_client()->pc()->RegisterUMAObserver(init_observer); |
1432 LocalP2PTest(); | 1444 LocalP2PTest(); |
1433 | 1445 |
1434 EXPECT_EQ_WAIT( | 1446 EXPECT_EQ_WAIT( |
1435 rtc::SSLStreamAdapter::GetDefaultSslCipher(rtc::SSL_PROTOCOL_DTLS_10), | 1447 rtc::SSLStreamAdapter::GetDefaultSslCipher(rtc::SSL_PROTOCOL_DTLS_10), |
1436 initializing_client()->GetDtlsCipherStats(), | 1448 initializing_client()->GetDtlsCipherStats(), |
1437 kMaxWaitForStatsMs); | 1449 kMaxWaitForStatsMs); |
1438 EXPECT_EQ( | 1450 EXPECT_EQ( |
1439 rtc::SSLStreamAdapter::GetDefaultSslCipher(rtc::SSL_PROTOCOL_DTLS_10), | 1451 init_observer->GetEnumCounter( |
1440 init_observer->GetStringHistogramSample(webrtc::kAudioSslCipher)); | 1452 webrtc::kEnumCounterAudioSslCipher, |
1453 webrtc::GetCipherType(rtc::SSLStreamAdapter::GetDefaultSslCipher( | |
1454 rtc::SSL_PROTOCOL_DTLS_10))), | |
1455 1); | |
1441 | 1456 |
1442 EXPECT_EQ_WAIT( | 1457 EXPECT_EQ_WAIT( |
1443 kDefaultSrtpCipher, | 1458 kDefaultSrtpCipher, |
1444 initializing_client()->GetSrtpCipherStats(), | 1459 initializing_client()->GetSrtpCipherStats(), |
1445 kMaxWaitForStatsMs); | 1460 kMaxWaitForStatsMs); |
1446 EXPECT_EQ( | 1461 EXPECT_EQ( |
1447 kDefaultSrtpCipher, | 1462 init_observer->GetEnumCounter(webrtc::kEnumCounterAudioSrtpCipher, |
1448 init_observer->GetStringHistogramSample(webrtc::kAudioSrtpCipher)); | 1463 webrtc::GetCipherType(kDefaultSrtpCipher)), |
1464 1); | |
1449 } | 1465 } |
1450 | 1466 |
1451 // This test sets up a call between two parties with audio, video and data. | 1467 // This test sets up a call between two parties with audio, video and data. |
1452 TEST_F(JsepPeerConnectionP2PTestClient, LocalP2PTestDataChannel) { | 1468 TEST_F(JsepPeerConnectionP2PTestClient, LocalP2PTestDataChannel) { |
1453 FakeConstraints setup_constraints; | 1469 FakeConstraints setup_constraints; |
1454 setup_constraints.SetAllowRtpDataChannels(); | 1470 setup_constraints.SetAllowRtpDataChannels(); |
1455 ASSERT_TRUE(CreateTestClients(&setup_constraints, &setup_constraints)); | 1471 ASSERT_TRUE(CreateTestClients(&setup_constraints, &setup_constraints)); |
1456 initializing_client()->CreateDataChannel(); | 1472 initializing_client()->CreateDataChannel(); |
1457 LocalP2PTest(); | 1473 LocalP2PTest(); |
1458 ASSERT_TRUE(initializing_client()->data_channel() != NULL); | 1474 ASSERT_TRUE(initializing_client()->data_channel() != NULL); |
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1620 // TODO(holmer): Disabled due to sometimes crashing on buildbots. | 1636 // TODO(holmer): Disabled due to sometimes crashing on buildbots. |
1621 // See issue webrtc/2378. | 1637 // See issue webrtc/2378. |
1622 TEST_F(JsepPeerConnectionP2PTestClient, | 1638 TEST_F(JsepPeerConnectionP2PTestClient, |
1623 DISABLED_LocalP2PTestWithVideoDecoderFactory) { | 1639 DISABLED_LocalP2PTestWithVideoDecoderFactory) { |
1624 ASSERT_TRUE(CreateTestClients()); | 1640 ASSERT_TRUE(CreateTestClients()); |
1625 EnableVideoDecoderFactory(); | 1641 EnableVideoDecoderFactory(); |
1626 LocalP2PTest(); | 1642 LocalP2PTest(); |
1627 } | 1643 } |
1628 | 1644 |
1629 #endif // if !defined(THREAD_SANITIZER) | 1645 #endif // if !defined(THREAD_SANITIZER) |
OLD | NEW |