Commit 7d06e052 authored by hclam@chromium.org's avatar hclam@chromium.org

Enable JingleSessionTest on windows

TBR=wtc

BUG=67928
TEST=JingleSessionTest.* should pass on XP bot

Review URL: http://codereview.chromium.org/6338010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71875 0039d316-1c4b-4281-b951-d872f2087c98
parent 3a7aec16
...@@ -548,23 +548,16 @@ class UDPChannelTester : public ChannelTesterBase { ...@@ -548,23 +548,16 @@ class UDPChannelTester : public ChannelTesterBase {
// Mac needs to implement X509Certificate::CreateSelfSigned to enable these // Mac needs to implement X509Certificate::CreateSelfSigned to enable these
// tests. // tests.
// TODO(hclam): Run these tests on Windows. #if defined(USE_NSS) || defined(OS_WIN)
#if defined(USE_NSS)
// Verify that we can create and destory server objects without a connection. // Verify that we can create and destory server objects without a connection.
TEST_F(JingleSessionTest, CreateAndDestoy) { TEST_F(JingleSessionTest, CreateAndDestoy) {
if (!base::CheckNSSVersion("3.12.8"))
return;
CreateServerPair(); CreateServerPair();
} }
// Verify that incoming session can be rejected, and that the status // Verify that incoming session can be rejected, and that the status
// of the connection is set to CLOSED in this case. // of the connection is set to CLOSED in this case.
TEST_F(JingleSessionTest, RejectConnection) { TEST_F(JingleSessionTest, RejectConnection) {
if (!base::CheckNSSVersion("3.12.8"))
return;
CreateServerPair(); CreateServerPair();
// Reject incoming session. // Reject incoming session.
...@@ -594,18 +587,12 @@ TEST_F(JingleSessionTest, RejectConnection) { ...@@ -594,18 +587,12 @@ TEST_F(JingleSessionTest, RejectConnection) {
// Verify that we can connect two endpoints. // Verify that we can connect two endpoints.
TEST_F(JingleSessionTest, Connect) { TEST_F(JingleSessionTest, Connect) {
if (!base::CheckNSSVersion("3.12.8"))
return;
CreateServerPair(); CreateServerPair();
ASSERT_TRUE(InitiateConnection()); ASSERT_TRUE(InitiateConnection());
} }
// Verify that data can be transmitted over the event channel. // Verify that data can be transmitted over the event channel.
TEST_F(JingleSessionTest, TestControlChannel) { TEST_F(JingleSessionTest, TestControlChannel) {
if (!base::CheckNSSVersion("3.12.8"))
return;
CreateServerPair(); CreateServerPair();
ASSERT_TRUE(InitiateConnection()); ASSERT_TRUE(InitiateConnection());
scoped_refptr<TCPChannelTester> tester( scoped_refptr<TCPChannelTester> tester(
...@@ -621,9 +608,6 @@ TEST_F(JingleSessionTest, TestControlChannel) { ...@@ -621,9 +608,6 @@ TEST_F(JingleSessionTest, TestControlChannel) {
// Verify that data can be transmitted over the video channel. // Verify that data can be transmitted over the video channel.
TEST_F(JingleSessionTest, TestVideoChannel) { TEST_F(JingleSessionTest, TestVideoChannel) {
if (!base::CheckNSSVersion("3.12.8"))
return;
CreateServerPair(); CreateServerPair();
ASSERT_TRUE(InitiateConnection()); ASSERT_TRUE(InitiateConnection());
scoped_refptr<TCPChannelTester> tester( scoped_refptr<TCPChannelTester> tester(
...@@ -639,9 +623,6 @@ TEST_F(JingleSessionTest, TestVideoChannel) { ...@@ -639,9 +623,6 @@ TEST_F(JingleSessionTest, TestVideoChannel) {
// Verify that data can be transmitted over the event channel. // Verify that data can be transmitted over the event channel.
TEST_F(JingleSessionTest, TestEventChannel) { TEST_F(JingleSessionTest, TestEventChannel) {
if (!base::CheckNSSVersion("3.12.8"))
return;
CreateServerPair(); CreateServerPair();
ASSERT_TRUE(InitiateConnection()); ASSERT_TRUE(InitiateConnection());
scoped_refptr<TCPChannelTester> tester( scoped_refptr<TCPChannelTester> tester(
...@@ -657,9 +638,6 @@ TEST_F(JingleSessionTest, TestEventChannel) { ...@@ -657,9 +638,6 @@ TEST_F(JingleSessionTest, TestEventChannel) {
// Verify that data can be transmitted over the video RTP channel. // Verify that data can be transmitted over the video RTP channel.
TEST_F(JingleSessionTest, TestVideoRtpChannel) { TEST_F(JingleSessionTest, TestVideoRtpChannel) {
if (!base::CheckNSSVersion("3.12.8"))
return;
CreateServerPair(); CreateServerPair();
ASSERT_TRUE(InitiateConnection()); ASSERT_TRUE(InitiateConnection());
scoped_refptr<UDPChannelTester> tester( scoped_refptr<UDPChannelTester> tester(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment