- Launch DOM checker in the subdirectory 'dom_checker/', as specified by its

  configuration.
- Use the cleaned up version of the error message that DOM checker generates.
- Remove <!-- NOP --> from test failure messages reported by DOM checker.
- Update the expected failures files as a result of these changes.
- Disable the test temporarily as this will require a Buildbot change and
  restart.
Review URL: http://codereview.chromium.org/53064

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12538 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 32 insertions, 8 deletions

diff --git a/chrome/test/data/dom_checker/automation.js b/chrome/test/data/dom_checker/automation.js
index b902b6b..8b0cb05 100644
--- a/chrome/test/data/dom_checker/automation.js
+++ b/chrome/test/data/dom_checker/automation.js
@@ -21,6 +21,9 @@ Automation.prototype.GetTestCount = function() {
 }
 
 Automation.prototype.AddFailure = function(test) {
+  // Remove any '<!-- NOP -->' that was inserted by DOM checker.
+  test = test.replace(/<!-- NOP -->/, '');
+
   this.failures.push(test);
 }
 
diff --git a/chrome/test/data/dom_checker/dom_checker.html b/chrome/test/data/dom_checker/dom_checker.html
index 003bf43..7fcccb6 100644
--- a/chrome/test/data/dom_checker/dom_checker.html
+++ b/chrome/test/data/dom_checker/dom_checker.html
@@ -438,11 +438,12 @@ function GOOD(x) {
 /* Log test failure. */
 function BAD(x) {
   automation.IncrementTestCount();
-  automation.AddFailure(x);
 
   bad++;
   x = x.replace('frames[0].frames[0]','(blank)').replace('frames[0]','(third-party)');
   log('<font color=red>CHECK FAILED : ' + x + ' is possible!</font>');
+
+  automation.AddFailure(x);
 }
 
 
diff --git a/chrome/test/data/dom_checker/expected_failures-file.txt b/chrome/test/data/dom_checker/expected_failures-file.txt
index 3f8ca6d..2ea9bea 100644
--- a/chrome/test/data/dom_checker/expected_failures-file.txt
+++ b/chrome/test/data/dom_checker/expected_failures-file.txt
@@ -1,6 +1,15 @@
 # Expected failures when running from local disk.
-frames[0].history.forward(0) call
-frames[0].length read [value: 0]
-frames[0].postMessage read [value: function () { [native code] }]
-open() frame name lookup
+(blank).history.forward(0) call
+(blank).length read [value: 0]
+(blank).location.assign('about:blank') call
+(blank).location.replace('about:blank') call
+(blank).postMessage read [value: function () { [native code] }]
+(third-party).frames.length read [value: 2]
+(third-party).frames[0] probe [value: [object global]]
+(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 global]]
 document.domain = ''
+open() frame name lookup
diff --git a/chrome/test/data/dom_checker/expected_failures-http.txt b/chrome/test/data/dom_checker/expected_failures-http.txt
index 043ea11..cddf5a6 100644
--- a/chrome/test/data/dom_checker/expected_failures-http.txt
+++ b/chrome/test/data/dom_checker/expected_failures-http.txt
@@ -1,5 +1,16 @@
 # Expected failures when running over HTTP.
-frames[0].history.forward(0) call
-frames[0].length read [value: 0]
-frames[0].postMessage read [value: function () { [native code] }]
+(blank).document.location write (readback)
+(blank).history.forward(0) call
+(blank).length read [value: 0]
+(blank).location write (readback)
+(blank).location.assign('about:blank') call
+(blank).location.replace('about:blank') call
+(blank).postMessage read [value: function () { [native code] }]
+(third-party).frames.length read [value: 2]
+(third-party).frames[0] probe [value: [object global]]
+(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 global]]
 open() frame name lookup