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

Side by Side Diff: chrome/test/chromedriver/logging_unittest.cc

Issue 353063005: [ChromeDriver] Subscribe PerformanceLogger to CommandListener interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removing unnecessary check in test Created 6 years, 5 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
« no previous file with comments | « chrome/test/chromedriver/logging.cc ('k') | chrome/test/chromedriver/performance_logger.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "base/values.h" 5 #include "base/values.h"
6 #include "chrome/test/chromedriver/capabilities.h" 6 #include "chrome/test/chromedriver/capabilities.h"
7 #include "chrome/test/chromedriver/chrome/devtools_event_listener.h" 7 #include "chrome/test/chromedriver/chrome/devtools_event_listener.h"
8 #include "chrome/test/chromedriver/chrome/log.h" 8 #include "chrome/test/chromedriver/chrome/log.h"
9 #include "chrome/test/chromedriver/chrome/status.h" 9 #include "chrome/test/chromedriver/chrome/status.h"
10 #include "chrome/test/chromedriver/command_listener.h"
10 #include "chrome/test/chromedriver/logging.h" 11 #include "chrome/test/chromedriver/logging.h"
11 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
12 13
13 namespace { 14 namespace {
14 15
15 const char* const kAllWdLevels[] = { 16 const char* const kAllWdLevels[] = {
16 "ALL", "DEBUG", "INFO", "WARNING", "SEVERE", "OFF" 17 "ALL", "DEBUG", "INFO", "WARNING", "SEVERE", "OFF"
17 }; 18 };
18 19
19 } 20 }
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 ASSERT_EQ(2u, entries->GetSize()); 95 ASSERT_EQ(2u, entries->GetSize());
95 ValidateLogEntry(entries.get(), 0, "SEVERE", "severe message"); 96 ValidateLogEntry(entries.get(), 0, "SEVERE", "severe message");
96 ValidateLogEntry(entries.get(), 1, "DEBUG", "debug message"); 97 ValidateLogEntry(entries.get(), 1, "DEBUG", "debug message");
97 } 98 }
98 99
99 TEST(Logging, CreatePerformanceLog) { 100 TEST(Logging, CreatePerformanceLog) {
100 Capabilities capabilities; 101 Capabilities capabilities;
101 capabilities.logging_prefs["performance"] = Log::kInfo; 102 capabilities.logging_prefs["performance"] = Log::kInfo;
102 capabilities.logging_prefs["browser"] = Log::kInfo; 103 capabilities.logging_prefs["browser"] = Log::kInfo;
103 104
104 ScopedVector<DevToolsEventListener> listeners; 105 ScopedVector<DevToolsEventListener> devtools_listeners;
105 ScopedVector<WebDriverLog> logs; 106 ScopedVector<WebDriverLog> logs;
106 Status status = CreateLogs(capabilities, &logs, &listeners); 107 ScopedVector<CommandListener> command_listeners;
108 Status status = CreateLogs(capabilities, &logs, &devtools_listeners,
109 &command_listeners);
107 ASSERT_TRUE(status.IsOk()); 110 ASSERT_TRUE(status.IsOk());
108 ASSERT_EQ(2u, logs.size()); 111 ASSERT_EQ(2u, logs.size());
109 ASSERT_EQ(2u, listeners.size()); 112 ASSERT_EQ(2u, devtools_listeners.size());
113 ASSERT_EQ(1u, command_listeners.size());
110 ASSERT_EQ("performance", logs[0]->type()); 114 ASSERT_EQ("performance", logs[0]->type());
111 ASSERT_EQ("browser", logs[1]->type()); 115 ASSERT_EQ("browser", logs[1]->type());
112 } 116 }
113 117
114 TEST(Logging, IgnoreUnknownLogType) { 118 TEST(Logging, IgnoreUnknownLogType) {
115 Capabilities capabilities; 119 Capabilities capabilities;
116 capabilities.logging_prefs["gaga"] = Log::kInfo; 120 capabilities.logging_prefs["gaga"] = Log::kInfo;
117 121
118 ScopedVector<DevToolsEventListener> listeners; 122 ScopedVector<DevToolsEventListener> devtools_listeners;
119 ScopedVector<WebDriverLog> logs; 123 ScopedVector<WebDriverLog> logs;
120 Status status = CreateLogs(capabilities, &logs, &listeners); 124 ScopedVector<CommandListener> command_listeners;
125 Status status = CreateLogs(capabilities, &logs, &devtools_listeners,
126 &command_listeners);
121 EXPECT_TRUE(status.IsOk()); 127 EXPECT_TRUE(status.IsOk());
122 ASSERT_EQ(1u, logs.size()); 128 ASSERT_EQ(1u, logs.size());
123 ASSERT_EQ(1u, listeners.size()); 129 ASSERT_EQ(1u, devtools_listeners.size());
130 ASSERT_EQ(0u, command_listeners.size());
124 ASSERT_EQ("browser", logs[0]->type()); 131 ASSERT_EQ("browser", logs[0]->type());
125 } 132 }
126 133
127 TEST(Logging, DefaultLogs) { 134 TEST(Logging, DefaultLogs) {
128 Capabilities capabilities; 135 Capabilities capabilities;
129 136
130 ScopedVector<DevToolsEventListener> listeners; 137 ScopedVector<DevToolsEventListener> devtools_listeners;
131 ScopedVector<WebDriverLog> logs; 138 ScopedVector<WebDriverLog> logs;
132 Status status = CreateLogs(capabilities, &logs, &listeners); 139 ScopedVector<CommandListener> command_listeners;
140 Status status = CreateLogs(capabilities, &logs, &devtools_listeners,
141 &command_listeners);
133 EXPECT_TRUE(status.IsOk()); 142 EXPECT_TRUE(status.IsOk());
134 ASSERT_EQ(1u, logs.size()); 143 ASSERT_EQ(1u, logs.size());
135 ASSERT_EQ(1u, listeners.size()); 144 ASSERT_EQ(1u, devtools_listeners.size());
145 ASSERT_EQ(0u, command_listeners.size());
136 ASSERT_EQ("browser", logs[0]->type()); 146 ASSERT_EQ("browser", logs[0]->type());
137 } 147 }
138 148
139 TEST(Logging, GetFirstErrorMessage) { 149 TEST(Logging, GetFirstErrorMessage) {
140 WebDriverLog log(WebDriverLog::kBrowserType, Log::kAll); 150 WebDriverLog log(WebDriverLog::kBrowserType, Log::kAll);
141 std::string entry; 151 std::string entry;
142 152
143 entry = log.GetFirstErrorMessage(); 153 entry = log.GetFirstErrorMessage();
144 ASSERT_TRUE(entry.empty()); 154 ASSERT_TRUE(entry.empty());
145 155
146 log.AddEntry(Log::kInfo, "info message"); 156 log.AddEntry(Log::kInfo, "info message");
147 log.AddEntry(Log::kError, "first error message"); 157 log.AddEntry(Log::kError, "first error message");
148 log.AddEntry(Log::kDebug, "debug message"); 158 log.AddEntry(Log::kDebug, "debug message");
149 log.AddEntry(Log::kError, "second error message"); 159 log.AddEntry(Log::kError, "second error message");
150 160
151 entry = log.GetFirstErrorMessage(); 161 entry = log.GetFirstErrorMessage();
152 ASSERT_EQ("first error message", entry); 162 ASSERT_EQ("first error message", entry);
153 } 163 }
OLDNEW
« no previous file with comments | « chrome/test/chromedriver/logging.cc ('k') | chrome/test/chromedriver/performance_logger.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698