summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authornirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-16 19:57:42 +0000
committernirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-16 19:57:42 +0000
commit1045b5449332f18c6d7bcfe2c0b772affcc6f8e9 (patch)
tree54f5ce6371e50d6aed756a3ddd681424f1e0423b /chrome
parentf5b7b3dcd9740865edc2f37a34c3613e0295ab1a (diff)
downloadchromium_src-1045b5449332f18c6d7bcfe2c0b772affcc6f8e9.zip
chromium_src-1045b5449332f18c6d7bcfe2c0b772affcc6f8e9.tar.gz
chromium_src-1045b5449332f18c6d7bcfe2c0b772affcc6f8e9.tar.bz2
Dom access checker test for Mac, Linux
BUG=35530 TEST=dom_checker should work and pass on mac & linux ui_tests --gtest_filter=DomCheckerTest.* --run-dom-checker-test Review URL: http://codereview.chromium.org/898002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41750 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/test/data/dom_checker/expected_failures_linux-file.txt16
-rw-r--r--chrome/test/data/dom_checker/expected_failures_mac-file.txt16
-rw-r--r--chrome/test/data/dom_checker/expected_failures_win-file.txt (renamed from chrome/test/data/dom_checker/expected_failures-file.txt)0
-rw-r--r--chrome/test/ui/dom_checker_uitest.cc10
4 files changed, 41 insertions, 1 deletions
diff --git a/chrome/test/data/dom_checker/expected_failures_linux-file.txt b/chrome/test/data/dom_checker/expected_failures_linux-file.txt
new file mode 100644
index 0000000..0e48ae4
--- /dev/null
+++ b/chrome/test/data/dom_checker/expected_failures_linux-file.txt
@@ -0,0 +1,16 @@
+# Expected failures when running from local disk.
+(blank).history.forward(0) call
+(blank).length read [value: 0]
+(blank).postMessage read [value: function () { [native code] }]
+(third-party).frames.length read [value: 2]
+(third-party).frames[0] probe [value: [object DOMWindow]]
+(third-party).history.forward(0) call
+(third-party).length read [value: 2]
+(third-party).postMessage read [value: function () { [native code] }]
+(third-party).window.length read [value: 2]
+(third-party).window[0] probe [value: [object DOMWindow]]
+document.domain = ''
+open() frame name lookup
+
+# Issue 38018
+(third-party).length read [value: 0]
diff --git a/chrome/test/data/dom_checker/expected_failures_mac-file.txt b/chrome/test/data/dom_checker/expected_failures_mac-file.txt
new file mode 100644
index 0000000..0e48ae4
--- /dev/null
+++ b/chrome/test/data/dom_checker/expected_failures_mac-file.txt
@@ -0,0 +1,16 @@
+# Expected failures when running from local disk.
+(blank).history.forward(0) call
+(blank).length read [value: 0]
+(blank).postMessage read [value: function () { [native code] }]
+(third-party).frames.length read [value: 2]
+(third-party).frames[0] probe [value: [object DOMWindow]]
+(third-party).history.forward(0) call
+(third-party).length read [value: 2]
+(third-party).postMessage read [value: function () { [native code] }]
+(third-party).window.length read [value: 2]
+(third-party).window[0] probe [value: [object DOMWindow]]
+document.domain = ''
+open() frame name lookup
+
+# Issue 38018
+(third-party).length read [value: 0]
diff --git a/chrome/test/data/dom_checker/expected_failures-file.txt b/chrome/test/data/dom_checker/expected_failures_win-file.txt
index 8abb808..8abb808 100644
--- a/chrome/test/data/dom_checker/expected_failures-file.txt
+++ b/chrome/test/data/dom_checker/expected_failures_win-file.txt
diff --git a/chrome/test/ui/dom_checker_uitest.cc b/chrome/test/ui/dom_checker_uitest.cc
index db28e07..2d5e2db 100644
--- a/chrome/test/ui/dom_checker_uitest.cc
+++ b/chrome/test/ui/dom_checker_uitest.cc
@@ -47,7 +47,15 @@ class DomCheckerTest : public UITest {
ResultsSet expected_failures, current_failures;
std::string failures_file = use_http ?
- "expected_failures-http.txt" : "expected_failures-file.txt";
+#if defined(OS_MACOSX)
+ "expected_failures_mac-http.txt" : "expected_failures_mac-file.txt";
+#elif defined(OS_LINUX)
+ "expected_failures_linux-http.txt" : "expected_failures_linux-file.txt";
+#elif defined(OS_WIN)
+ "expected_failures_win-http.txt" : "expected_failures_win-file.txt";
+#else
+ "" : "";
+#endif
GetExpectedFailures(failures_file, &expected_failures);