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

Side by Side Diff: third_party/WebKit/Source/web/tests/ActivityLoggerTest.cpp

Issue 2612903007: Migrate WTF::Vector::append() to ::push_back() [part 15 of N] (Closed)
Patch Set: Created 3 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "bindings/core/v8/ScriptController.h" 5 #include "bindings/core/v8/ScriptController.h"
6 #include "bindings/core/v8/ScriptSourceCode.h" 6 #include "bindings/core/v8/ScriptSourceCode.h"
7 #include "bindings/core/v8/V8Binding.h" 7 #include "bindings/core/v8/V8Binding.h"
8 #include "bindings/core/v8/V8DOMActivityLogger.h" 8 #include "bindings/core/v8/V8DOMActivityLogger.h"
9 #include "public/web/WebCache.h" 9 #include "public/web/WebCache.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
11 #include "web/WebLocalFrameImpl.h" 11 #include "web/WebLocalFrameImpl.h"
12 #include "web/tests/FrameTestHelpers.h" 12 #include "web/tests/FrameTestHelpers.h"
13 #include "wtf/Forward.h" 13 #include "wtf/Forward.h"
14 #include "wtf/PtrUtil.h" 14 #include "wtf/PtrUtil.h"
15 #include "wtf/text/Base64.h" 15 #include "wtf/text/Base64.h"
16 #include <v8.h> 16 #include <v8.h>
17 17
18 namespace blink { 18 namespace blink {
19 19
20 using blink::FrameTestHelpers::WebViewHelper; 20 using blink::FrameTestHelpers::WebViewHelper;
21 using blink::FrameTestHelpers::pumpPendingRequestsForFrameToLoad; 21 using blink::FrameTestHelpers::pumpPendingRequestsForFrameToLoad;
22 22
23 class TestActivityLogger : public V8DOMActivityLogger { 23 class TestActivityLogger : public V8DOMActivityLogger {
24 public: 24 public:
25 ~TestActivityLogger() override {} 25 ~TestActivityLogger() override {}
26 26
27 void logGetter(const String& apiName) override { 27 void logGetter(const String& apiName) override {
28 m_loggedActivities.append(apiName); 28 m_loggedActivities.push_back(apiName);
29 } 29 }
30 30
31 void logSetter(const String& apiName, 31 void logSetter(const String& apiName,
32 const v8::Local<v8::Value>& newValue) override { 32 const v8::Local<v8::Value>& newValue) override {
33 m_loggedActivities.append(apiName + " | " + 33 m_loggedActivities.push_back(
34 toCoreStringWithUndefinedOrNullCheck(newValue)); 34 apiName + " | " + toCoreStringWithUndefinedOrNullCheck(newValue));
35 } 35 }
36 36
37 void logMethod(const String& apiName, 37 void logMethod(const String& apiName,
38 int argc, 38 int argc,
39 const v8::Local<v8::Value>* argv) override { 39 const v8::Local<v8::Value>* argv) override {
40 String activityString = apiName; 40 String activityString = apiName;
41 for (int i = 0; i < argc; i++) 41 for (int i = 0; i < argc; i++)
42 activityString = activityString + " | " + 42 activityString = activityString + " | " +
43 toCoreStringWithUndefinedOrNullCheck(argv[i]); 43 toCoreStringWithUndefinedOrNullCheck(argv[i]);
44 m_loggedActivities.append(activityString); 44 m_loggedActivities.push_back(activityString);
45 } 45 }
46 46
47 void logEvent(const String& eventName, 47 void logEvent(const String& eventName,
48 int argc, 48 int argc,
49 const String* argv) override { 49 const String* argv) override {
50 String activityString = eventName; 50 String activityString = eventName;
51 for (int i = 0; i < argc; i++) { 51 for (int i = 0; i < argc; i++) {
52 activityString = activityString + " | " + argv[i]; 52 activityString = activityString + " | " + argv[i];
53 } 53 }
54 m_loggedActivities.append(activityString); 54 m_loggedActivities.push_back(activityString);
55 } 55 }
56 56
57 void clear() { m_loggedActivities.clear(); } 57 void clear() { m_loggedActivities.clear(); }
58 bool verifyActivities(const Vector<String>& expected) const { 58 bool verifyActivities(const Vector<String>& expected) const {
59 EXPECT_EQ(expected.size(), m_loggedActivities.size()); 59 EXPECT_EQ(expected.size(), m_loggedActivities.size());
60 for (size_t i = 0; i < std::min(expected.size(), m_loggedActivities.size()); 60 for (size_t i = 0; i < std::min(expected.size(), m_loggedActivities.size());
61 ++i) { 61 ++i) {
62 EXPECT_STREQ(expected[i].utf8().data(), 62 EXPECT_STREQ(expected[i].utf8().data(),
63 m_loggedActivities[i].utf8().data()); 63 m_loggedActivities[i].utf8().data());
64 } 64 }
(...skipping 21 matching lines...) Expand all
86 86
87 void executeScriptInMainWorld(const String& script) const { 87 void executeScriptInMainWorld(const String& script) const {
88 v8::HandleScope scope(v8::Isolate::GetCurrent()); 88 v8::HandleScope scope(v8::Isolate::GetCurrent());
89 m_scriptController->executeScriptInMainWorld(script); 89 m_scriptController->executeScriptInMainWorld(script);
90 pumpPendingRequestsForFrameToLoad(m_webViewHelper.webView()->mainFrame()); 90 pumpPendingRequestsForFrameToLoad(m_webViewHelper.webView()->mainFrame());
91 } 91 }
92 92
93 void executeScriptInIsolatedWorld(const String& script) const { 93 void executeScriptInIsolatedWorld(const String& script) const {
94 v8::HandleScope scope(v8::Isolate::GetCurrent()); 94 v8::HandleScope scope(v8::Isolate::GetCurrent());
95 HeapVector<ScriptSourceCode> sources; 95 HeapVector<ScriptSourceCode> sources;
96 sources.append(ScriptSourceCode(script)); 96 sources.push_back(ScriptSourceCode(script));
97 Vector<v8::Local<v8::Value>> results; 97 Vector<v8::Local<v8::Value>> results;
98 m_scriptController->executeScriptInIsolatedWorld(isolatedWorldId, sources, 98 m_scriptController->executeScriptInIsolatedWorld(isolatedWorldId, sources,
99 extensionGroup, 0); 99 extensionGroup, 0);
100 pumpPendingRequestsForFrameToLoad(m_webViewHelper.webView()->mainFrame()); 100 pumpPendingRequestsForFrameToLoad(m_webViewHelper.webView()->mainFrame());
101 } 101 }
102 102
103 bool verifyActivities(const String& activities) { 103 bool verifyActivities(const String& activities) {
104 Vector<String> activityVector; 104 Vector<String> activityVector;
105 activities.split("\n", activityVector); 105 activities.split("\n", activityVector);
106 return m_activityLogger->verifyActivities(activityVector); 106 return m_activityLogger->verifyActivities(activityVector);
(...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after
586 "blinkRequestResource | Script | data:text/html;charset=utf-8,D\n" 586 "blinkRequestResource | Script | data:text/html;charset=utf-8,D\n"
587 "blinkRequestResource | XMLHttpRequest | data:text/html;charset=utf-8,E\n" 587 "blinkRequestResource | XMLHttpRequest | data:text/html;charset=utf-8,E\n"
588 "blinkRequestResource | Image | data:text/html;charset=utf-8,B\n"; 588 "blinkRequestResource | Image | data:text/html;charset=utf-8,B\n";
589 executeScriptInMainWorld(code); 589 executeScriptInMainWorld(code);
590 ASSERT_TRUE(verifyActivities("")); 590 ASSERT_TRUE(verifyActivities(""));
591 executeScriptInIsolatedWorld(code); 591 executeScriptInIsolatedWorld(code);
592 ASSERT_TRUE(verifyActivities(expectedActivities)); 592 ASSERT_TRUE(verifyActivities(expectedActivities));
593 } 593 }
594 594
595 } // namespace blink 595 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebViewImpl.cpp ('k') | third_party/WebKit/Source/web/tests/FrameSerializerTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698