Commit 0f501056 authored by phoglund@chromium.org's avatar phoglund@chromium.org

Renaming remaining WebRTC browser tests.

Will require https://codereview.chromium.org/137793008 to land shortly
after this landing to avoid missing to run tests.

R=tommi@chromium.org
NOTRY=True

Review URL: https://codereview.chromium.org/137753004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245523 0039d316-1c4b-4281-b951-d872f2087c98
parent 73feb188
...@@ -89,7 +89,7 @@ static base::FilePath GetTestDataDir() { ...@@ -89,7 +89,7 @@ static base::FilePath GetTestDataDir() {
// 50 / 100 in level. Also go into the playback tab, right-click Speakers, // 50 / 100 in level. Also go into the playback tab, right-click Speakers,
// and set that level to 50 / 100. Otherwise you will get distortion in // and set that level to 50 / 100. Otherwise you will get distortion in
// the recording. // the recording.
class WebrtcAudioQualityBrowserTest : public WebRtcTestBase { class WebRtcAudioQualityBrowserTest : public WebRtcTestBase {
public: public:
virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
PeerConnectionServerRunner::KillAllPeerConnectionServersOnCurrentSystem(); PeerConnectionServerRunner::KillAllPeerConnectionServersOnCurrentSystem();
...@@ -377,7 +377,7 @@ bool RunPesq(const base::FilePath& reference_file, ...@@ -377,7 +377,7 @@ bool RunPesq(const base::FilePath& reference_file,
#define MAYBE_MANUAL_TestAudioQuality DISABLED_MANUAL_TestAudioQuality #define MAYBE_MANUAL_TestAudioQuality DISABLED_MANUAL_TestAudioQuality
#endif #endif
IN_PROC_BROWSER_TEST_F(WebrtcAudioQualityBrowserTest, IN_PROC_BROWSER_TEST_F(WebRtcAudioQualityBrowserTest,
MAYBE_MANUAL_TestAudioQuality) { MAYBE_MANUAL_TestAudioQuality) {
#if defined(OS_WIN) #if defined(OS_WIN)
if (base::win::GetVersion() < base::win::VERSION_VISTA) { if (base::win::GetVersion() < base::win::VERSION_VISTA) {
......
...@@ -38,7 +38,7 @@ static const char kMainWebrtcTestHtmlPage[] = ...@@ -38,7 +38,7 @@ static const char kMainWebrtcTestHtmlPage[] =
// Top-level integration test for WebRTC. Requires a real webcam and microphone // Top-level integration test for WebRTC. Requires a real webcam and microphone
// on the running system. This test is not meant to run in the main browser // on the running system. This test is not meant to run in the main browser
// test suite since normal tester machines do not have webcams. // test suite since normal tester machines do not have webcams.
class WebrtcBrowserTest : public WebRtcTestBase { class WebRtcBrowserTest : public WebRtcTestBase {
public: public:
virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
PeerConnectionServerRunner::KillAllPeerConnectionServersOnCurrentSystem(); PeerConnectionServerRunner::KillAllPeerConnectionServersOnCurrentSystem();
...@@ -156,7 +156,7 @@ class WebrtcBrowserTest : public WebRtcTestBase { ...@@ -156,7 +156,7 @@ class WebrtcBrowserTest : public WebRtcTestBase {
PeerConnectionServerRunner peerconnection_server_; PeerConnectionServerRunner peerconnection_server_;
}; };
IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
MANUAL_RunsAudioVideoWebRTCCallInTwoTabs) { MANUAL_RunsAudioVideoWebRTCCallInTwoTabs) {
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
ASSERT_TRUE(peerconnection_server_.Start()); ASSERT_TRUE(peerconnection_server_.Start());
...@@ -179,7 +179,7 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, ...@@ -179,7 +179,7 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest,
ASSERT_TRUE(peerconnection_server_.Stop()); ASSERT_TRUE(peerconnection_server_.Stop());
} }
IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MANUAL_CpuUsage15Seconds) { IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, MANUAL_CpuUsage15Seconds) {
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
ASSERT_TRUE(peerconnection_server_.Start()); ASSERT_TRUE(peerconnection_server_.Start());
...@@ -227,7 +227,7 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MANUAL_CpuUsage15Seconds) { ...@@ -227,7 +227,7 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MANUAL_CpuUsage15Seconds) {
ASSERT_TRUE(peerconnection_server_.Stop()); ASSERT_TRUE(peerconnection_server_.Stop());
} }
IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetrics) { MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetrics) {
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
ASSERT_TRUE(peerconnection_server_.Start()); ASSERT_TRUE(peerconnection_server_.Start());
...@@ -275,7 +275,7 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, ...@@ -275,7 +275,7 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest,
ASSERT_TRUE(peerconnection_server_.Stop()); ASSERT_TRUE(peerconnection_server_.Stop());
} }
IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, TestWebAudioMediaStream) { IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, TestWebAudioMediaStream) {
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
GURL url(embedded_test_server()->GetURL("/webrtc/webaudio_crash.html")); GURL url(embedded_test_server()->GetURL("/webrtc/webaudio_crash.html"));
ui_test_utils::NavigateToURL(browser(), url); ui_test_utils::NavigateToURL(browser(), url);
......
...@@ -47,7 +47,7 @@ static base::FilePath GetTestDataDir() { ...@@ -47,7 +47,7 @@ static base::FilePath GetTestDataDir() {
// Test that the typing detection feature works. // Test that the typing detection feature works.
// You must have the src-internal solution in your .gclient to put the required // You must have the src-internal solution in your .gclient to put the required
// pyauto_private directory into chrome/test/data/. // pyauto_private directory into chrome/test/data/.
class WebrtcTypingDetectionBrowserTest : public WebRtcTestBase { class WebRtcTypingDetectionBrowserTest : public WebRtcTestBase {
public: public:
// TODO(phoglund): clean up duplication from audio quality browser test when // TODO(phoglund): clean up duplication from audio quality browser test when
// this test is complete and is proven to work. // this test is complete and is proven to work.
...@@ -107,7 +107,7 @@ class WebrtcTypingDetectionBrowserTest : public WebRtcTestBase { ...@@ -107,7 +107,7 @@ class WebrtcTypingDetectionBrowserTest : public WebRtcTestBase {
}; };
// TODO(phoglund): enable when fully implemented. // TODO(phoglund): enable when fully implemented.
IN_PROC_BROWSER_TEST_F(WebrtcTypingDetectionBrowserTest, IN_PROC_BROWSER_TEST_F(WebRtcTypingDetectionBrowserTest,
DISABLED_MANUAL_TestTypingDetection) { DISABLED_MANUAL_TestTypingDetection) {
// TODO(phoglund): make this use embedded_test_server when that test server // TODO(phoglund): make this use embedded_test_server when that test server
// can handle files > ~400Kb. // can handle files > ~400Kb.
......
...@@ -93,9 +93,9 @@ static const char kPyWebSocketPortNumber[] = "12221"; ...@@ -93,9 +93,9 @@ static const char kPyWebSocketPortNumber[] = "12221";
// frame_analyzer. Both tools can be found under third_party/webrtc/tools. The // frame_analyzer. Both tools can be found under third_party/webrtc/tools. The
// test also runs a stand alone Python implementation of a WebSocket server // test also runs a stand alone Python implementation of a WebSocket server
// (pywebsocket) and a barcode_decoder script. // (pywebsocket) and a barcode_decoder script.
class WebrtcVideoQualityBrowserTest : public WebRtcTestBase { class WebRtcVideoQualityBrowserTest : public WebRtcTestBase {
public: public:
WebrtcVideoQualityBrowserTest() WebRtcVideoQualityBrowserTest()
: pywebsocket_server_(0), : pywebsocket_server_(0),
environment_(base::Environment::Create()) {} environment_(base::Environment::Create()) {}
...@@ -316,7 +316,7 @@ class WebrtcVideoQualityBrowserTest : public WebRtcTestBase { ...@@ -316,7 +316,7 @@ class WebrtcVideoQualityBrowserTest : public WebRtcTestBase {
scoped_ptr<base::Environment> environment_; scoped_ptr<base::Environment> environment_;
}; };
IN_PROC_BROWSER_TEST_F(WebrtcVideoQualityBrowserTest, IN_PROC_BROWSER_TEST_F(WebRtcVideoQualityBrowserTest,
MANUAL_TestVGAVideoQuality) { MANUAL_TestVGAVideoQuality) {
ASSERT_GE(TestTimeouts::action_max_timeout().InSeconds(), 150) << ASSERT_GE(TestTimeouts::action_max_timeout().InSeconds(), 150) <<
"This is a long-running test; you must specify " "This is a long-running test; you must specify "
......
...@@ -140,15 +140,15 @@ static const int64 FAKE_TIME_STAMP = 3600000; ...@@ -140,15 +140,15 @@ static const int64 FAKE_TIME_STAMP = 3600000;
#if defined(OS_WIN) #if defined(OS_WIN)
// All tests are flaky on Windows: crbug.com/277322. // All tests are flaky on Windows: crbug.com/277322.
#define MAYBE_WebRTCInternalsBrowserTest DISABLED_WebRTCInternalsBrowserTest #define MAYBE_WebRtcInternalsBrowserTest DISABLED_WebRtcInternalsBrowserTest
#else #else
#define MAYBE_WebRTCInternalsBrowserTest WebRTCInternalsBrowserTest #define MAYBE_WebRtcInternalsBrowserTest WebRtcInternalsBrowserTest
#endif #endif
class MAYBE_WebRTCInternalsBrowserTest: public ContentBrowserTest { class MAYBE_WebRtcInternalsBrowserTest: public ContentBrowserTest {
public: public:
MAYBE_WebRTCInternalsBrowserTest() {} MAYBE_WebRtcInternalsBrowserTest() {}
virtual ~MAYBE_WebRTCInternalsBrowserTest() {} virtual ~MAYBE_WebRtcInternalsBrowserTest() {}
virtual void SetUpOnMainThread() OVERRIDE { virtual void SetUpOnMainThread() OVERRIDE {
// We need fake devices in this test since we want to run on naked VMs. We // We need fake devices in this test since we want to run on naked VMs. We
...@@ -476,7 +476,7 @@ class MAYBE_WebRTCInternalsBrowserTest: public ContentBrowserTest { ...@@ -476,7 +476,7 @@ class MAYBE_WebRTCInternalsBrowserTest: public ContentBrowserTest {
} }
}; };
IN_PROC_BROWSER_TEST_F(MAYBE_WebRTCInternalsBrowserTest, IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest,
AddAndRemovePeerConnection) { AddAndRemovePeerConnection) {
GURL url("chrome://webrtc-internals"); GURL url("chrome://webrtc-internals");
NavigateToURL(shell(), url); NavigateToURL(shell(), url);
...@@ -498,7 +498,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRTCInternalsBrowserTest, ...@@ -498,7 +498,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRTCInternalsBrowserTest,
VerifyNoElementWithId(pc_2.getIdString()); VerifyNoElementWithId(pc_2.getIdString());
} }
IN_PROC_BROWSER_TEST_F(MAYBE_WebRTCInternalsBrowserTest, IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest,
UpdateAllPeerConnections) { UpdateAllPeerConnections) {
GURL url("chrome://webrtc-internals"); GURL url("chrome://webrtc-internals");
NavigateToURL(shell(), url); NavigateToURL(shell(), url);
...@@ -516,7 +516,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRTCInternalsBrowserTest, ...@@ -516,7 +516,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRTCInternalsBrowserTest,
VerifyPeerConnectionEntry(pc_1); VerifyPeerConnectionEntry(pc_1);
} }
IN_PROC_BROWSER_TEST_F(MAYBE_WebRTCInternalsBrowserTest, UpdatePeerConnection) { IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, UpdatePeerConnection) {
GURL url("chrome://webrtc-internals"); GURL url("chrome://webrtc-internals");
NavigateToURL(shell(), url); NavigateToURL(shell(), url);
...@@ -553,7 +553,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRTCInternalsBrowserTest, UpdatePeerConnection) { ...@@ -553,7 +553,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRTCInternalsBrowserTest, UpdatePeerConnection) {
} }
// Tests that adding random named stats updates the dataSeries and graphs. // Tests that adding random named stats updates the dataSeries and graphs.
IN_PROC_BROWSER_TEST_F(MAYBE_WebRTCInternalsBrowserTest, AddStats) { IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, AddStats) {
GURL url("chrome://webrtc-internals"); GURL url("chrome://webrtc-internals");
NavigateToURL(shell(), url); NavigateToURL(shell(), url);
...@@ -579,7 +579,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRTCInternalsBrowserTest, AddStats) { ...@@ -579,7 +579,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRTCInternalsBrowserTest, AddStats) {
} }
// Tests that the bandwidth estimation values are drawn on a single graph. // Tests that the bandwidth estimation values are drawn on a single graph.
IN_PROC_BROWSER_TEST_F(MAYBE_WebRTCInternalsBrowserTest, BweCompoundGraph) { IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, BweCompoundGraph) {
GURL url("chrome://webrtc-internals"); GURL url("chrome://webrtc-internals");
NavigateToURL(shell(), url); NavigateToURL(shell(), url);
...@@ -619,7 +619,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRTCInternalsBrowserTest, BweCompoundGraph) { ...@@ -619,7 +619,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRTCInternalsBrowserTest, BweCompoundGraph) {
// Tests that the total packet/byte count is converted to count per second, // Tests that the total packet/byte count is converted to count per second,
// and the converted data is drawn. // and the converted data is drawn.
IN_PROC_BROWSER_TEST_F(MAYBE_WebRTCInternalsBrowserTest, ConvertedGraphs) { IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, ConvertedGraphs) {
GURL url("chrome://webrtc-internals"); GURL url("chrome://webrtc-internals");
NavigateToURL(shell(), url); NavigateToURL(shell(), url);
...@@ -661,7 +661,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRTCInternalsBrowserTest, ConvertedGraphs) { ...@@ -661,7 +661,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRTCInternalsBrowserTest, ConvertedGraphs) {
// Timing out on ARM linux bot: http://crbug.com/238490 // Timing out on ARM linux bot: http://crbug.com/238490
// Disabling due to failure on Linux, Mac, Win: http://crbug.com/272413 // Disabling due to failure on Linux, Mac, Win: http://crbug.com/272413
// Sanity check of the page content under a real PeerConnection call. // Sanity check of the page content under a real PeerConnection call.
IN_PROC_BROWSER_TEST_F(MAYBE_WebRTCInternalsBrowserTest, IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest,
DISABLED_WithRealPeerConnectionCall) { DISABLED_WithRealPeerConnectionCall) {
// Start a peerconnection call in the first window. // Start a peerconnection call in the first window.
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
...@@ -744,7 +744,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRTCInternalsBrowserTest, ...@@ -744,7 +744,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRTCInternalsBrowserTest,
EXPECT_GT(count, 0); EXPECT_GT(count, 0);
} }
IN_PROC_BROWSER_TEST_F(MAYBE_WebRTCInternalsBrowserTest, CreatePageDump) { IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, CreatePageDump) {
GURL url("chrome://webrtc-internals"); GURL url("chrome://webrtc-internals");
NavigateToURL(shell(), url); NavigateToURL(shell(), url);
...@@ -789,7 +789,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRTCInternalsBrowserTest, CreatePageDump) { ...@@ -789,7 +789,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRTCInternalsBrowserTest, CreatePageDump) {
VerifyStatsDump(dump.get(), pc_0, type, id, stats); VerifyStatsDump(dump.get(), pc_0, type, id, stats);
} }
IN_PROC_BROWSER_TEST_F(MAYBE_WebRTCInternalsBrowserTest, UpdateGetUserMedia) { IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcInternalsBrowserTest, UpdateGetUserMedia) {
GURL url("chrome://webrtc-internals"); GURL url("chrome://webrtc-internals");
NavigateToURL(shell(), url); NavigateToURL(shell(), url);
......
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