summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-15 16:51:27 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-15 16:51:27 +0000
commitd0e1f478dfbe9e4672d0c756c5bd793d60cc2587 (patch)
treebff9a89bc0d2278bc7843c2cbb93787a9a4331f7 /chrome/test
parent27af0b74daa2da89ef1ded021c19e99b8ed076f0 (diff)
downloadchromium_src-d0e1f478dfbe9e4672d0c756c5bd793d60cc2587.zip
chromium_src-d0e1f478dfbe9e4672d0c756c5bd793d60cc2587.tar.gz
chromium_src-d0e1f478dfbe9e4672d0c756c5bd793d60cc2587.tar.bz2
Move chrome/test/automated_ui_tests to chrome/test/reliability
TBR=jcivelli BUG=90905 Review URL: http://codereview.chromium.org/7888063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101309 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/reliability/automated_ui_test_base.cc (renamed from chrome/test/automated_ui_tests/automated_ui_test_base.cc)3
-rw-r--r--chrome/test/reliability/automated_ui_test_base.h (renamed from chrome/test/automated_ui_tests/automated_ui_test_base.h)6
-rw-r--r--chrome/test/reliability/automated_ui_test_interactive_test.cc (renamed from chrome/test/automated_ui_tests/automated_ui_test_interactive_test.cc)2
-rw-r--r--chrome/test/reliability/automated_ui_test_test.cc (renamed from chrome/test/automated_ui_tests/automated_ui_test_test.cc)4
-rw-r--r--chrome/test/reliability/automated_ui_tests.cc (renamed from chrome/test/automated_ui_tests/automated_ui_tests.cc)2
-rw-r--r--chrome/test/reliability/automated_ui_tests.h (renamed from chrome/test/automated_ui_tests/automated_ui_tests.h)8
6 files changed, 13 insertions, 12 deletions
diff --git a/chrome/test/automated_ui_tests/automated_ui_test_base.cc b/chrome/test/reliability/automated_ui_test_base.cc
index 73e36d4..1fa7d8b 100644
--- a/chrome/test/automated_ui_tests/automated_ui_test_base.cc
+++ b/chrome/test/reliability/automated_ui_test_base.cc
@@ -2,10 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/test/reliability/automated_ui_test_base.h"
+
#include "base/test/test_timeouts.h"
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/ui/view_ids.h"
-#include "chrome/test/automated_ui_tests/automated_ui_test_base.h"
#include "chrome/test/automation/automation_proxy.h"
#include "chrome/test/automation/browser_proxy.h"
#include "chrome/test/automation/tab_proxy.h"
diff --git a/chrome/test/automated_ui_tests/automated_ui_test_base.h b/chrome/test/reliability/automated_ui_test_base.h
index 192d74d..eefc24a 100644
--- a/chrome/test/automated_ui_tests/automated_ui_test_base.h
+++ b/chrome/test/reliability/automated_ui_test_base.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_TEST_AUTOMATED_UI_TESTS_AUTOMATED_UI_TEST_BASE_H_
-#define CHROME_TEST_AUTOMATED_UI_TESTS_AUTOMATED_UI_TEST_BASE_H_
+#ifndef CHROME_TEST_RELIABILITY_AUTOMATED_UI_TEST_BASE_H_
+#define CHROME_TEST_RELIABILITY_AUTOMATED_UI_TEST_BASE_H_
#pragma once
#include <string>
@@ -159,4 +159,4 @@ class AutomatedUITestBase : public UITest {
DISALLOW_COPY_AND_ASSIGN(AutomatedUITestBase);
};
-#endif // CHROME_TEST_AUTOMATED_UI_TESTS_AUTOMATED_UI_TEST_BASE_H_
+#endif // CHROME_TEST_RELIABILITY_AUTOMATED_UI_TEST_BASE_H_
diff --git a/chrome/test/automated_ui_tests/automated_ui_test_interactive_test.cc b/chrome/test/reliability/automated_ui_test_interactive_test.cc
index 161faff..1879485 100644
--- a/chrome/test/automated_ui_tests/automated_ui_test_interactive_test.cc
+++ b/chrome/test/reliability/automated_ui_test_interactive_test.cc
@@ -4,10 +4,10 @@
#include "base/test/test_timeouts.h"
#include "base/threading/platform_thread.h"
-#include "chrome/test/automated_ui_tests/automated_ui_test_base.h"
#include "chrome/test/automation/automation_proxy.h"
#include "chrome/test/automation/browser_proxy.h"
#include "chrome/test/automation/tab_proxy.h"
+#include "chrome/test/reliability/automated_ui_test_base.h"
#include "chrome/test/ui/ui_test.h"
TEST_F(AutomatedUITestBase, DragOut) {
diff --git a/chrome/test/automated_ui_tests/automated_ui_test_test.cc b/chrome/test/reliability/automated_ui_test_test.cc
index faf420c..307caf5 100644
--- a/chrome/test/automated_ui_tests/automated_ui_test_test.cc
+++ b/chrome/test/reliability/automated_ui_test_test.cc
@@ -4,10 +4,10 @@
#include "chrome/app/chrome_command_ids.h"
#include "chrome/common/url_constants.h"
-#include "chrome/test/automated_ui_tests/automated_ui_test_base.h"
#include "chrome/test/automation/automation_proxy.h"
#include "chrome/test/automation/browser_proxy.h"
#include "chrome/test/automation/tab_proxy.h"
+#include "chrome/test/reliability/automated_ui_test_base.h"
#include "chrome/test/ui/ui_test.h"
#include "googleurl/src/gurl.h"
#include "net/base/net_util.h"
@@ -129,7 +129,7 @@ TEST_F(AutomatedUITestBase, MAYBE_CloseTab) {
ASSERT_EQ(1, tab_count);
}
-// Flakiness tracked here: crbug.com/96049
+// Flakiness tracked there: http://crbug.com/96049.
TEST_F(AutomatedUITestBase, FLAKY_OpenBrowserWindow) {
int num_browser_windows;
int tab_count;
diff --git a/chrome/test/automated_ui_tests/automated_ui_tests.cc b/chrome/test/reliability/automated_ui_tests.cc
index e59a73c..ca5cad2 100644
--- a/chrome/test/automated_ui_tests/automated_ui_tests.cc
+++ b/chrome/test/reliability/automated_ui_tests.cc
@@ -29,11 +29,11 @@
#include "chrome/common/env_vars.h"
#include "chrome/common/libxml_utils.h"
#include "chrome/common/url_constants.h"
-#include "chrome/test/automated_ui_tests/automated_ui_tests.h"
#include "chrome/test/automation/automation_proxy.h"
#include "chrome/test/automation/browser_proxy.h"
#include "chrome/test/automation/tab_proxy.h"
#include "chrome/test/automation/window_proxy.h"
+#include "chrome/test/reliability/automated_ui_tests.h"
#include "chrome/test/ui/ui_test.h"
#include "googleurl/src/gurl.h"
#include "ui/base/keycodes/keyboard_codes.h"
diff --git a/chrome/test/automated_ui_tests/automated_ui_tests.h b/chrome/test/reliability/automated_ui_tests.h
index e6345e9..60cba72 100644
--- a/chrome/test/automated_ui_tests/automated_ui_tests.h
+++ b/chrome/test/reliability/automated_ui_tests.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_TEST_AUTOMATED_UI_TESTS_AUTOMATED_UI_TESTS_H_
-#define CHROME_TEST_AUTOMATED_UI_TESTS_AUTOMATED_UI_TESTS_H_
+#ifndef CHROME_TEST_RELIABILITY_AUTOMATED_UI_TESTS_H_
+#define CHROME_TEST_RELIABILITY_AUTOMATED_UI_TESTS_H_
#pragma once
// This takes an input file of commands, which consist of a series of
@@ -103,7 +103,7 @@
#include <string>
-#include "chrome/test/automated_ui_tests/automated_ui_test_base.h"
+#include "chrome/test/reliability/automated_ui_test_base.h"
#include "chrome/test/ui/ui_test.h"
#include "ui/base/keycodes/keyboard_codes.h"
@@ -396,4 +396,4 @@ class AutomatedUITest : public AutomatedUITestBase {
DISALLOW_COPY_AND_ASSIGN(AutomatedUITest);
};
-#endif // CHROME_TEST_AUTOMATED_UI_TESTS_AUTOMATED_UI_TESTS_H_
+#endif // CHROME_TEST_RELIABILITY_AUTOMATED_UI_TESTS_H_