Source/web/tests/ActivityLoggerTest.cpp - Issue 362073004: Revert of Refactoring activity logger.

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

Issue 362073004: Revert of Refactoring activity logger. Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: 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

Index: Source/web/tests/ActivityLoggerTest.cpp

diff --git a/Source/web/tests/ActivityLoggerTest.cpp b/Source/web/tests/ActivityLoggerTest.cpp

index ff4bafed2aad857c88b68ab330e5bfe84b9c9e3c..f770f69e4f22250a52d54196fd559f79711b455e 100644

--- a/Source/web/tests/ActivityLoggerTest.cpp

+++ b/Source/web/tests/ActivityLoggerTest.cpp

@@ -77,14 +77,12 @@

void executeScriptInMainWorld(const String& script) const

{

- v8::HandleScope scope(v8::Isolate::GetCurrent());

m_scriptController->executeScriptInMainWorld(script);

runPendingTasks();

}

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;

@@ -112,6 +110,7 @@

TEST_F(ActivityLoggerTest, EventHandler)

{

+ v8::HandleScope scope(v8::Isolate::GetCurrent());

const char* code =

"document.body.innerHTML = '<a onclick=\\\'do()\\\'>test</a>';"

"document.body.onchange = function(){};"

@@ -131,6 +130,7 @@

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>';"

@@ -144,6 +144,7 @@

"blinkAddElement | script | data:text/html;charset=utf-8,\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);

@@ -154,6 +155,7 @@

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>';"

@@ -167,6 +169,7 @@

"blinkAddElement | iframe | data:text/html;charset=utf-8,\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);

@@ -177,6 +180,7 @@

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>';"

@@ -190,6 +194,7 @@

"blinkAddElement | a | data:text/css;charset=utf-8,\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);

@@ -200,6 +205,7 @@

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>';"

@@ -214,6 +220,7 @@

"blinkAddElement | link | stylesheet | data:text/css;charset=utf-8,\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);

@@ -224,6 +231,7 @@

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>';"

@@ -238,6 +246,7 @@

"blinkAddElement | input | submit | data:text/html;charset=utf-8,\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);

@@ -248,6 +257,7 @@

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>';"

@@ -263,6 +273,7 @@

"blinkAddElement | button | submit | post | data:text/html;charset=utf-8,\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);

@@ -273,6 +284,7 @@

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>';"

@@ -287,6 +299,7 @@

"blinkAddElement | form | post | data:text/html;charset=utf-8,\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);

@@ -295,142 +308,4 @@

ASSERT_TRUE(verifyActivities(expectedActivities));

}

-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, 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, 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, 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, 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, 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));

} // namespace

« no previous file with comments | « Source/core/html/HTMLVideoElement.idl ('k') | no next file » | no next file with comments »