diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-19 23:57:25 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-19 23:57:25 +0000 |
| commit | 7d06e052d0bc4c5f83f44831a3cd044cd77bc3bf (patch) | |
| tree | 3cff065598add27c42ef7c80ffd0963b4c7b7882 /remoting/protocol | |
| parent | 3a7aec1685093c39af8483e0b29b0a93c356ccc4 (diff) | |
| download | chromium_src-7d06e052d0bc4c5f83f44831a3cd044cd77bc3bf.zip chromium_src-7d06e052d0bc4c5f83f44831a3cd044cd77bc3bf.tar.gz chromium_src-7d06e052d0bc4c5f83f44831a3cd044cd77bc3bf.tar.bz2 | |
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
Diffstat (limited to 'remoting/protocol')
| -rw-r--r-- | remoting/protocol/jingle_session_unittest.cc | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/remoting/protocol/jingle_session_unittest.cc b/remoting/protocol/jingle_session_unittest.cc index fb5f43a..8da6eff 100644 --- a/remoting/protocol/jingle_session_unittest.cc +++ b/remoting/protocol/jingle_session_unittest.cc @@ -548,23 +548,16 @@ class UDPChannelTester : public ChannelTesterBase { // Mac needs to implement X509Certificate::CreateSelfSigned to enable these // tests. -// TODO(hclam): Run these tests on Windows. -#if defined(USE_NSS) +#if defined(USE_NSS) || defined(OS_WIN) // Verify that we can create and destory server objects without a connection. TEST_F(JingleSessionTest, CreateAndDestoy) { - if (!base::CheckNSSVersion("3.12.8")) - return; - CreateServerPair(); } // Verify that incoming session can be rejected, and that the status // of the connection is set to CLOSED in this case. TEST_F(JingleSessionTest, RejectConnection) { - if (!base::CheckNSSVersion("3.12.8")) - return; - CreateServerPair(); // Reject incoming session. @@ -594,18 +587,12 @@ TEST_F(JingleSessionTest, RejectConnection) { // Verify that we can connect two endpoints. TEST_F(JingleSessionTest, Connect) { - if (!base::CheckNSSVersion("3.12.8")) - return; - CreateServerPair(); ASSERT_TRUE(InitiateConnection()); } // Verify that data can be transmitted over the event channel. TEST_F(JingleSessionTest, TestControlChannel) { - if (!base::CheckNSSVersion("3.12.8")) - return; - CreateServerPair(); ASSERT_TRUE(InitiateConnection()); scoped_refptr<TCPChannelTester> tester( @@ -621,9 +608,6 @@ TEST_F(JingleSessionTest, TestControlChannel) { // Verify that data can be transmitted over the video channel. TEST_F(JingleSessionTest, TestVideoChannel) { - if (!base::CheckNSSVersion("3.12.8")) - return; - CreateServerPair(); ASSERT_TRUE(InitiateConnection()); scoped_refptr<TCPChannelTester> tester( @@ -639,9 +623,6 @@ TEST_F(JingleSessionTest, TestVideoChannel) { // Verify that data can be transmitted over the event channel. TEST_F(JingleSessionTest, TestEventChannel) { - if (!base::CheckNSSVersion("3.12.8")) - return; - CreateServerPair(); ASSERT_TRUE(InitiateConnection()); scoped_refptr<TCPChannelTester> tester( @@ -657,9 +638,6 @@ TEST_F(JingleSessionTest, TestEventChannel) { // Verify that data can be transmitted over the video RTP channel. TEST_F(JingleSessionTest, TestVideoRtpChannel) { - if (!base::CheckNSSVersion("3.12.8")) - return; - CreateServerPair(); ASSERT_TRUE(InitiateConnection()); scoped_refptr<UDPChannelTester> tester( |