Fixing ActivityLogger tests that were failing due to asynchronous handling of data: URLs.

Source/web/tests/ActivityLoggerTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "FrameTestHelpers.h"
 #include "bindings/core/v8/ScriptController.h"
 #include "bindings/core/v8/V8DOMActivityLogger.h"
 #include "web/WebLocalFrameImpl.h"
 #include "wtf/Forward.h"
 #include "wtf/text/Base64.h"
 #include <gtest/gtest.h>
 #include <v8.h>
 
 using WebCore::ScriptController;
 using WebCore::ScriptSourceCode;
 using WebCore::V8DOMActivityLogger;
 using WebCore::toCoreStringWithUndefinedOrNullCheck;
 using blink::FrameTestHelpers::WebViewHelper;
-using blink::FrameTestHelpers::runPendingTasks;
+using blink::FrameTestHelpers::pumpPendingRequestsDoNotUse;
 
 namespace {
 
 class TestActivityLogger : public V8DOMActivityLogger {
 public:
     virtual ~TestActivityLogger() { }
 
     void logGetter(const String& apiName) OVERRIDE
     {
         m_loggedActivities.append(apiName);
@@ skipping 40 matching lines @@
         m_activityLogger = new TestActivityLogger();
         V8DOMActivityLogger::setActivityLogger(isolatedWorldId, String(), adoptPtr(m_activityLogger));
         m_webViewHelper.initialize(true);
         m_scriptController = &m_webViewHelper.webViewImpl()->mainFrameImpl()->frame()->script();
     }
 
     void executeScriptInMainWorld(const String& script) const
     {
         v8::HandleScope scope(v8::Isolate::GetCurrent());
         m_scriptController->executeScriptInMainWorld(script);
-        runPendingTasks();
+        pumpPendingRequestsDoNotUse(m_webViewHelper.webViewImpl()->mainFrame());

[jochen (gone - plz use gerrit), 2014/07/09 09:26:34]

why are you using a method that says "DoNotUse"? Can you add the person that
named the method like this as reviewer please?

     }
 
     void executeScriptInIsolatedWorld(const String& script) const
     {
         v8::HandleScope scope(v8::Isolate::GetCurrent());
         Vector<ScriptSourceCode> sources;
         sources.append(ScriptSourceCode(script));
         Vector<v8::Local<v8::Value> > results;
         m_scriptController->executeScriptInIsolatedWorld(isolatedWorldId, sources, extensionGroup, 0);
-        runPendingTasks();
+        pumpPendingRequestsDoNotUse(m_webViewHelper.webViewImpl()->mainFrame());
     }
 
     bool verifyActivities(const String& activities)
     {
         Vector<String> activityVector;
         activities.split("\n", activityVector);
         return m_activityLogger->verifyActivities(activityVector);
     }
 
 private:
     static const int isolatedWorldId = 1;
     static const int extensionGroup = 0;
 
     WebViewHelper m_webViewHelper;
     ScriptController* m_scriptController;
     // TestActivityLogger is owned by a static table within V8DOMActivityLogger
     // and should be alive as long as not overwritten.
     TestActivityLogger* m_activityLogger;
 };
 
-TEST_F(ActivityLoggerTest, DISABLED_EventHandler)
+TEST_F(ActivityLoggerTest, EventHandler)
 {
     const char* code =
         "document.body.innerHTML = '<a onclick=\\\'do()\\\'>test</a>';"
         "document.body.onchange = function(){};"
         "document.body.setAttribute('onfocus', 'fnc()');"
         "document.body.addEventListener('onload', function(){});";
     const char* expectedActivities =
         "blinkAddEventListener | A | click\n"
         "blinkAddElement | a | \n"
         "blinkAddEventListener | BODY | change\n"
         "blinkAddEventListener | LocalDOMWindow | focus\n"
         "blinkAddEventListener | BODY | onload";
     executeScriptInMainWorld(code);
     ASSERT_TRUE(verifyActivities(""));
     executeScriptInIsolatedWorld(code);
     ASSERT_TRUE(verifyActivities(expectedActivities));
 }
 
-TEST_F(ActivityLoggerTest, DISABLED_ScriptElement)
+TEST_F(ActivityLoggerTest, ScriptElement)
 {
     const char* code =
         "document.body.innerHTML = '<script src=\\\'data:text/html;charset=utf-8,\\\'></script>';"
         "document.body.innerHTML = '<script>console.log(\\\'test\\\')</script>';"
         "var script = document.createElement('script');"
         "document.body.appendChild(script);"
         "script = document.createElement('script');"
         "script.src = 'data:text/html;charset=utf-8,';"
         "document.body.appendChild(script);"
         "document.write('<body><script src=\\\'data:text/html;charset=utf-8,\\\'></script></body>');";
     const char* expectedActivities =
         "blinkAddElement | script | data:text/html;charset=utf-8,\n"
         "blinkAddElement | script | \n"
         "blinkAddElement | script | \n"
         "blinkAddElement | script | data:text/html;charset=utf-8,\n"
         "blinkAddElement | script | data:text/html;charset=utf-8,";
     executeScriptInMainWorld(code);
     ASSERT_TRUE(verifyActivities(""));
     executeScriptInIsolatedWorld(code);
     ASSERT_TRUE(verifyActivities(expectedActivities));
 }
 
-TEST_F(ActivityLoggerTest, DISABLED_IFrameElement)
+TEST_F(ActivityLoggerTest, IFrameElement)
 {
     const char* code =
         "document.body.innerHTML = '<iframe src=\\\'data:text/html;charset=utf-8,\\\'></iframe>';"
         "document.body.innerHTML = '<iframe></iframe>';"
         "var iframe = document.createElement('iframe');"
         "document.body.appendChild(iframe);"
         "iframe = document.createElement('iframe');"
         "iframe.src = 'data:text/html;charset=utf-8,';"
         "document.body.appendChild(iframe);"
         "document.write('<body><iframe src=\\\'data:text/html;charset=utf-8,\\\'></iframe></body>');";
     const char* expectedActivities =
         "blinkAddElement | iframe | data:text/html;charset=utf-8,\n"
         "blinkAddElement | iframe | \n"
         "blinkAddElement | iframe | \n"
         "blinkAddElement | iframe | data:text/html;charset=utf-8,\n"
         "blinkAddElement | iframe | data:text/html;charset=utf-8,";
     executeScriptInMainWorld(code);
     ASSERT_TRUE(verifyActivities(""));
     executeScriptInIsolatedWorld(code);
     ASSERT_TRUE(verifyActivities(expectedActivities));
 }
 
-TEST_F(ActivityLoggerTest, DISABLED_AnchorElement)
+TEST_F(ActivityLoggerTest, AnchorElement)
 {
     const char* code =
         "document.body.innerHTML = '<a href=\\\'data:text/css;charset=utf-8,\\\'></a>';"
         "document.body.innerHTML = '<a></a>';"
         "var a = document.createElement('a');"
         "document.body.appendChild(a);"
         "a = document.createElement('a');"
         "a.href = 'data:text/css;charset=utf-8,';"
         "document.body.appendChild(a);"
         "document.write('<body><a href=\\\'data:text/css;charset=utf-8,\\\'></a></body>');";
     const char* expectedActivities =
         "blinkAddElement | a | data:text/css;charset=utf-8,\n"
         "blinkAddElement | a | \n"
         "blinkAddElement | a | \n"
         "blinkAddElement | a | data:text/css;charset=utf-8,\n"
         "blinkAddElement | a | data:text/css;charset=utf-8,";
     executeScriptInMainWorld(code);
     ASSERT_TRUE(verifyActivities(""));
     executeScriptInIsolatedWorld(code);
     ASSERT_TRUE(verifyActivities(expectedActivities));
 }
 
-TEST_F(ActivityLoggerTest, DISABLED_LinkElement)
+TEST_F(ActivityLoggerTest, LinkElement)
 {
     const char* code =
         "document.body.innerHTML = '<link rel=\\\'stylesheet\\\' href=\\\'data:text/css;charset=utf-8,\\\'></link>';"
         "document.body.innerHTML = '<link></link>';"
         "var link = document.createElement('link');"
         "document.body.appendChild(link);"
         "link = document.createElement('link');"
         "link.rel = 'stylesheet';"
         "link.href = 'data:text/css;charset=utf-8,';"
         "document.body.appendChild(link);"
         "document.write('<body><link rel=\\\'stylesheet\\\' href=\\\'data:text/css;charset=utf-8,\\\'></link></body>');";
     const char* expectedActivities =
         "blinkAddElement | link | stylesheet | data:text/css;charset=utf-8,\n"
         "blinkAddElement | link |  | \n"
         "blinkAddElement | link |  | \n"
         "blinkAddElement | link | stylesheet | data:text/css;charset=utf-8,\n"
         "blinkAddElement | link | stylesheet | data:text/css;charset=utf-8,";
     executeScriptInMainWorld(code);
     ASSERT_TRUE(verifyActivities(""));
     executeScriptInIsolatedWorld(code);
     ASSERT_TRUE(verifyActivities(expectedActivities));
 }
 
-TEST_F(ActivityLoggerTest, DISABLED_InputElement)
+TEST_F(ActivityLoggerTest, InputElement)
 {
     const char* code =
         "document.body.innerHTML = '<input type=\\\'submit\\\' formaction=\\\'data:text/html;charset=utf-8,\\\'></input>';"
         "document.body.innerHTML = '<input></input>';"
         "var input = document.createElement('input');"
         "document.body.appendChild(input);"
         "input = document.createElement('input');"
         "input.type = 'submit';"
         "input.formAction = 'data:text/html;charset=utf-8,';"
         "document.body.appendChild(input);"
         "document.write('<body><input type=\\\'submit\\\' formaction=\\\'data:text/html;charset=utf-8,\\\'></input></body>');";
     const char* expectedActivities =
         "blinkAddElement | input | submit | data:text/html;charset=utf-8,\n"
         "blinkAddElement | input |  | \n"
         "blinkAddElement | input |  | \n"
         "blinkAddElement | input | submit | data:text/html;charset=utf-8,\n"
         "blinkAddElement | input | submit | data:text/html;charset=utf-8,";
     executeScriptInMainWorld(code);
     ASSERT_TRUE(verifyActivities(""));
     executeScriptInIsolatedWorld(code);
     ASSERT_TRUE(verifyActivities(expectedActivities));
 }
 
-TEST_F(ActivityLoggerTest, DISABLED_ButtonElement)
+TEST_F(ActivityLoggerTest, ButtonElement)
 {
     const char* code =
         "document.body.innerHTML = '<button type=\\\'submit\\\' formmethod=\\\'post\\\' formaction=\\\'data:text/html;charset=utf-8,\\\'></input>';"
         "document.body.innerHTML = '<button></button>';"
         "var button = document.createElement('button');"
         "document.body.appendChild(button);"
         "button = document.createElement('button');"
         "button.type = 'submit';"
         "button.formMethod = 'post';"
         "button.formAction = 'data:text/html;charset=utf-8,';"
         "document.body.appendChild(button);"
         "document.write('<body><button type=\\\'submit\\\' formmethod=\\\'post\\\' formaction=\\\'data:text/html;charset=utf-8,\\\'></button></body>');";
     const char* expectedActivities =
         "blinkAddElement | button | submit | post | data:text/html;charset=utf-8,\n"
         "blinkAddElement | button |  |  | \n"
         "blinkAddElement | button |  |  | \n"
         "blinkAddElement | button | submit | post | data:text/html;charset=utf-8,\n"
         "blinkAddElement | button | submit | post | data:text/html;charset=utf-8,";
     executeScriptInMainWorld(code);
     ASSERT_TRUE(verifyActivities(""));
     executeScriptInIsolatedWorld(code);
     ASSERT_TRUE(verifyActivities(expectedActivities));
 }
 
-TEST_F(ActivityLoggerTest, DISABLED_FormElement)
+TEST_F(ActivityLoggerTest, FormElement)
 {
     const char* code =
         "document.body.innerHTML = '<form method=\\\'post\\\' action=\\\'data:text/html;charset=utf-8,\\\'></form>';"
         "document.body.innerHTML = '<form></form>';"
         "var form = document.createElement('form');"
         "document.body.appendChild(form);"
         "form = document.createElement('form');"
         "form.method = 'post';"
         "form.action = 'data:text/html;charset=utf-8,';"
         "document.body.appendChild(form);"
         "document.write('<body><form method=\\\'post\\\' action=\\\'data:text/html;charset=utf-8,\\\'></form></body>');";
     const char* expectedActivities =
         "blinkAddElement | form | post | data:text/html;charset=utf-8,\n"
         "blinkAddElement | form |  | \n"
         "blinkAddElement | form |  | \n"
         "blinkAddElement | form | post | data:text/html;charset=utf-8,\n"
         "blinkAddElement | form | post | data:text/html;charset=utf-8,";
     executeScriptInMainWorld(code);
     ASSERT_TRUE(verifyActivities(""));
     executeScriptInIsolatedWorld(code);
     ASSERT_TRUE(verifyActivities(expectedActivities));
 }
 
-TEST_F(ActivityLoggerTest, DISABLED_IFrameSrcAttribute)
+TEST_F(ActivityLoggerTest, IFrameSrcAttribute)
 {
     const char* code =
         "document.body.innerHTML = '<iframe src=\\\'data:text/html;charset=utf-8,A\\\'></iframe>';"
         "var iframe = document.getElementsByTagName('iframe')[0];"
         "iframe.src = 'data:text/html;charset=utf-8,B';"
         "iframe.setAttribute('src', 'data:text/html;charset=utf-8,C');"
         "iframe.setAttributeNS('', 'src', 'data:text/html;charset=utf-8,D');"
         "var attr = document.createAttribute('src');"
         "attr.value = 'data:text/html;charset=utf-8,E';"
         "iframe.setAttributeNode(attr);";
     const char* expectedActivities =
         "blinkAddElement | iframe | data:text/html;charset=utf-8,A\n"
         "blinkSetAttribute | iframe | src | data:text/html;charset=utf-8,A | data:text/html;charset=utf-8,B\n"
         "blinkSetAttribute | iframe | src | data:text/html;charset=utf-8,B | data:text/html;charset=utf-8,C\n"
         "blinkSetAttribute | iframe | src | data:text/html;charset=utf-8,C | data:text/html;charset=utf-8,D\n"
         "blinkSetAttribute | iframe | src | data:text/html;charset=utf-8,D | data:text/html;charset=utf-8,E";
     executeScriptInMainWorld(code);
     ASSERT_TRUE(verifyActivities(""));
     executeScriptInIsolatedWorld(code);
     ASSERT_TRUE(verifyActivities(expectedActivities));
 }
 
-TEST_F(ActivityLoggerTest, DISABLED_AnchorHrefAttribute)
+TEST_F(ActivityLoggerTest, AnchorHrefAttribute)
 {
     const char* code =
         "document.body.innerHTML = '<a href=\\\'data:text/html;charset=utf-8,A\\\'></a>';"
         "var a = document.getElementsByTagName('a')[0];"
         "a.href = 'data:text/html;charset=utf-8,B';"
         "a.setAttribute('href', 'data:text/html;charset=utf-8,C');"
         "a.setAttributeNS('', 'href', 'data:text/html;charset=utf-8,D');"
         "var attr = document.createAttribute('href');"
         "attr.value = 'data:text/html;charset=utf-8,E';"
         "a.setAttributeNode(attr);";
     const char* expectedActivities =
         "blinkAddElement | a | data:text/html;charset=utf-8,A\n"
         "blinkSetAttribute | a | href | data:text/html;charset=utf-8,A | data:text/html;charset=utf-8,B\n"
         "blinkSetAttribute | a | href | data:text/html;charset=utf-8,B | data:text/html;charset=utf-8,C\n"
         "blinkSetAttribute | a | href | data:text/html;charset=utf-8,C | data:text/html;charset=utf-8,D\n"
         "blinkSetAttribute | a | href | data:text/html;charset=utf-8,D | data:text/html;charset=utf-8,E";
     executeScriptInMainWorld(code);
     ASSERT_TRUE(verifyActivities(""));
     executeScriptInIsolatedWorld(code);
     ASSERT_TRUE(verifyActivities(expectedActivities));
 }
 
-TEST_F(ActivityLoggerTest, DISABLED_LinkHrefAttribute)
+TEST_F(ActivityLoggerTest, LinkHrefAttribute)
 {
     const char* code =
         "document.body.innerHTML = '<link rel=\\\'stylesheet\\\' href=\\\'data:text/css;charset=utf-8,A\\\'></link>';"
         "var link = document.getElementsByTagName('link')[0];"
         "link.href = 'data:text/css;charset=utf-8,B';"
         "link.setAttribute('href', 'data:text/css;charset=utf-8,C');"
         "link.setAttributeNS('', 'href', 'data:text/css;charset=utf-8,D');"
         "var attr = document.createAttribute('href');"
         "attr.value = 'data:text/css;charset=utf-8,E';"
         "link.setAttributeNode(attr);";
     const char* expectedActivities =
         "blinkAddElement | link | stylesheet | data:text/css;charset=utf-8,A\n"
         "blinkSetAttribute | link | href | data:text/css;charset=utf-8,A | data:text/css;charset=utf-8,B\n"
         "blinkSetAttribute | link | href | data:text/css;charset=utf-8,B | data:text/css;charset=utf-8,C\n"
         "blinkSetAttribute | link | href | data:text/css;charset=utf-8,C | data:text/css;charset=utf-8,D\n"
         "blinkSetAttribute | link | href | data:text/css;charset=utf-8,D | data:text/css;charset=utf-8,E";
     executeScriptInMainWorld(code);
     ASSERT_TRUE(verifyActivities(""));
     executeScriptInIsolatedWorld(code);
     ASSERT_TRUE(verifyActivities(expectedActivities));
 }
 
-TEST_F(ActivityLoggerTest, DISABLED_InputFormActionAttribute)
+TEST_F(ActivityLoggerTest, InputFormActionAttribute)
 {
     const char* code =
         "document.body.innerHTML = '<input type=\\\'button\\\' formaction=\\\'data:text/html;charset=utf-8,A\\\'></input>';"
         "var input = document.getElementsByTagName('input')[0];"
         "input.formAction = 'data:text/html;charset=utf-8,B';"
         "input.setAttribute('formaction', 'data:text/html;charset=utf-8,C');"
         "input.setAttributeNS('', 'formaction', 'data:text/html;charset=utf-8,D');"
         "var attr = document.createAttribute('formaction');"
         "attr.value = 'data:text/html;charset=utf-8,E';"
         "input.setAttributeNode(attr);";
     const char* expectedActivities =
         "blinkAddElement | input | button | data:text/html;charset=utf-8,A\n"
         "blinkSetAttribute | input | formaction | data:text/html;charset=utf-8,A | data:text/html;charset=utf-8,B\n"
         "blinkSetAttribute | input | formaction | data:text/html;charset=utf-8,B | data:text/html;charset=utf-8,C\n"
         "blinkSetAttribute | input | formaction | data:text/html;charset=utf-8,C | data:text/html;charset=utf-8,D\n"
         "blinkSetAttribute | input | formaction | data:text/html;charset=utf-8,D | data:text/html;charset=utf-8,E";
     executeScriptInMainWorld(code);
     ASSERT_TRUE(verifyActivities(""));
     executeScriptInIsolatedWorld(code);
     ASSERT_TRUE(verifyActivities(expectedActivities));
 }
 
-TEST_F(ActivityLoggerTest, DISABLED_ButtonFormActionAttribute)
+TEST_F(ActivityLoggerTest, ButtonFormActionAttribute)
 {
     const char* code =
         "document.body.innerHTML = '<button type=\\\'submit\\\' formmethod=\\\'post\\\' formaction=\\\'data:text/html;charset=utf-8,A\\\'></input>';"
         "var button = document.getElementsByTagName('button')[0];"
         "button.formAction = 'data:text/html;charset=utf-8,B';"
         "button.setAttribute('formaction', 'data:text/html;charset=utf-8,C');"
         "button.setAttributeNS('', 'formaction', 'data:text/html;charset=utf-8,D');"
         "var attr = document.createAttribute('formaction');"
         "attr.value = 'data:text/html;charset=utf-8,E';"
         "button.setAttributeNode(attr);";
     const char* expectedActivities =
         "blinkAddElement | button | submit | post | data:text/html;charset=utf-8,A\n"
         "blinkSetAttribute | button | formaction | data:text/html;charset=utf-8,A | data:text/html;charset=utf-8,B\n"
         "blinkSetAttribute | button | formaction | data:text/html;charset=utf-8,B | data:text/html;charset=utf-8,C\n"
         "blinkSetAttribute | button | formaction | data:text/html;charset=utf-8,C | data:text/html;charset=utf-8,D\n"
         "blinkSetAttribute | button | formaction | data:text/html;charset=utf-8,D | data:text/html;charset=utf-8,E";
     executeScriptInMainWorld(code);
     ASSERT_TRUE(verifyActivities(""));
     executeScriptInIsolatedWorld(code);
     ASSERT_TRUE(verifyActivities(expectedActivities));
 }
 
-TEST_F(ActivityLoggerTest, DISABLED_FormActionAttribute)
+TEST_F(ActivityLoggerTest, FormActionAttribute)
 {
     const char* code =
         "document.body.innerHTML = '<form action=\\\'data:text/html;charset=utf-8,A\\\'></form>';"
         "var form = document.getElementsByTagName('form')[0];"
         "form.action = 'data:text/html;charset=utf-8,B';"
         "form.setAttribute('action', 'data:text/html;charset=utf-8,C');"
         "form.setAttributeNS('', 'action', 'data:text/html;charset=utf-8,D');"
         "var attr = document.createAttribute('action');"
         "attr.value = 'data:text/html;charset=utf-8,E';"
         "form.setAttributeNode(attr);";
     const char* expectedActivities =
         "blinkAddElement | form |  | data:text/html;charset=utf-8,A\n"
         "blinkSetAttribute | form | action | data:text/html;charset=utf-8,A | data:text/html;charset=utf-8,B\n"
         "blinkSetAttribute | form | action | data:text/html;charset=utf-8,B | data:text/html;charset=utf-8,C\n"
         "blinkSetAttribute | form | action | data:text/html;charset=utf-8,C | data:text/html;charset=utf-8,D\n"
         "blinkSetAttribute | form | action | data:text/html;charset=utf-8,D | data:text/html;charset=utf-8,E";
     executeScriptInMainWorld(code);
     ASSERT_TRUE(verifyActivities(""));
     executeScriptInIsolatedWorld(code);
     ASSERT_TRUE(verifyActivities(expectedActivities));
 }
 
-TEST_F(ActivityLoggerTest, DISABLED_LocalDOMWindowAttribute)
+TEST_F(ActivityLoggerTest, LocalDOMWindowAttribute)
 {
     const char* code =
         "location.href = 'data:text/html;charset=utf-8,A';"
         "location.assign('data:text/html;charset=utf-8,B');"
         "location.replace('data:text/html;charset=utf-8,C');"
         "location.protocol = 'protocol';"
         "location.pathname = 'pathname';"
         "location.search = 'search';"
         "location.hash = 'hash';"
         "location.href = 'about:blank';";
     const char* expectedActivities =
         "blinkSetAttribute | LocalDOMWindow | url | about:blank | data:text/html;charset=utf-8,A\n"
         "blinkSetAttribute | LocalDOMWindow | url | about:blank | data:text/html;charset=utf-8,B\n"
         "blinkSetAttribute | LocalDOMWindow | url | about:blank | data:text/html;charset=utf-8,C\n"
         "blinkSetAttribute | LocalDOMWindow | url | about:blank | protocol:blank\n"
         "blinkSetAttribute | LocalDOMWindow | url | about:blank | about:pathname\n"
         "blinkSetAttribute | LocalDOMWindow | url | about:blank | about:blank?search\n"
         "blinkSetAttribute | LocalDOMWindow | url | about:blank | about:blank#hash\n"
         "blinkSetAttribute | LocalDOMWindow | url | about:blank#hash | about:blank\n";
     executeScriptInMainWorld(code);
     ASSERT_TRUE(verifyActivities(""));
     executeScriptInIsolatedWorld(code);
     ASSERT_TRUE(verifyActivities(expectedActivities));
 }
 
 } // namespace