Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(656)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/web/tests/ActivityLoggerTest.cpp

Issue 355363002: Revert of Adds AL logging for Blink core events. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: manually fix conflict in Document.idl Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/html/HTMLScriptElement.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/tests/ActivityLoggerTest.cpp
diff --git a/Source/web/tests/ActivityLoggerTest.cpp b/Source/web/tests/ActivityLoggerTest.cpp
index a2cdc6db5aad6737c85dd4d3fd24bd159a315259..22fd2b92db20ee59cedcef49ee6ad843b59a4dff 100644
--- a/Source/web/tests/ActivityLoggerTest.cpp
+++ b/Source/web/tests/ActivityLoggerTest.cpp
@@ -78,7 +78,6 @@ protected:
void executeScriptInMainWorld(const String& script) const
{
m_scriptController->executeScriptInMainWorld(script);
- runPendingTasks();
}
void executeScriptInIsolatedWorld(const String& script) const
@@ -87,13 +86,12 @@ protected:
sources.append(ScriptSourceCode(script));
Vector<v8::Local<v8::Value> > results;
m_scriptController->executeScriptInIsolatedWorld(isolatedWorldId, sources, extensionGroup, 0);
- runPendingTasks();
}
bool verifyActivities(const String& activities)
{
Vector<String> activityVector;
- activities.split("\n", activityVector);
+ activities.split(";", activityVector);
return m_activityLogger->verifyActivities(activityVector);
}
@@ -117,10 +115,10 @@ TEST_F(ActivityLoggerTest, EventHandler)
"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"
+ "Element.innerHTML | <a onclick='do()'>test</a>;"
+ "blinkAddEventListener | A | click;"
+ "blinkAddEventListener | BODY | change;"
+ "blinkAddEventListener | LocalDOMWindow | focus;"
"blinkAddEventListener | BODY | onload";
executeScriptInMainWorld(code);
ASSERT_TRUE(verifyActivities(""));
@@ -128,184 +126,4 @@ TEST_F(ActivityLoggerTest, EventHandler)
ASSERT_TRUE(verifyActivities(expectedActivities));
}
-TEST_F(ActivityLoggerTest, ScriptElement)
-{
- v8::HandleScope scope(v8::Isolate::GetCurrent());
- 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"
- "HTMLScriptElement.src | data:text/html;charset=utf-8,\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, IFrameElement)
-{
- v8::HandleScope scope(v8::Isolate::GetCurrent());
- 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"
- "HTMLIFrameElement.src | | data:text/html;charset=utf-8,\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, AnchorElement)
-{
- v8::HandleScope scope(v8::Isolate::GetCurrent());
- 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"
- "HTMLAnchorElement.href | | data:text/css;charset=utf-8,\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, LinkElement)
-{
- v8::HandleScope scope(v8::Isolate::GetCurrent());
- 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"
- "HTMLLinkElement.href | data:text/css;charset=utf-8,\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, InputElement)
-{
- v8::HandleScope scope(v8::Isolate::GetCurrent());
- 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"
- "HTMLInputElement.formAction | data:text/html;charset=utf-8,\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, ButtonElement)
-{
- v8::HandleScope scope(v8::Isolate::GetCurrent());
- 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"
- "HTMLButtonElement.formAction | data:text/html;charset=utf-8,\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, FormElement)
-{
- v8::HandleScope scope(v8::Isolate::GetCurrent());
- 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"
- "HTMLFormElement.action | data:text/html;charset=utf-8,\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));
-}
-
} // namespace
« no previous file with comments | « Source/core/html/HTMLScriptElement.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698