| Index: chrome/test/chromedriver/logging_unittest.cc
|
| diff --git a/chrome/test/chromedriver/logging_unittest.cc b/chrome/test/chromedriver/logging_unittest.cc
|
| index 7912b6360eff526784122fce4ed6cf0f74ec77cf..53b627bf4331b3f55d65182dcdfd91cbe5d358f2 100644
|
| --- a/chrome/test/chromedriver/logging_unittest.cc
|
| +++ b/chrome/test/chromedriver/logging_unittest.cc
|
| @@ -7,6 +7,7 @@
|
| #include "chrome/test/chromedriver/chrome/devtools_event_listener.h"
|
| #include "chrome/test/chromedriver/chrome/log.h"
|
| #include "chrome/test/chromedriver/chrome/status.h"
|
| +#include "chrome/test/chromedriver/command_listener.h"
|
| #include "chrome/test/chromedriver/logging.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -101,12 +102,15 @@ TEST(Logging, CreatePerformanceLog) {
|
| capabilities.logging_prefs["performance"] = Log::kInfo;
|
| capabilities.logging_prefs["browser"] = Log::kInfo;
|
|
|
| - ScopedVector<DevToolsEventListener> listeners;
|
| + ScopedVector<DevToolsEventListener> devtools_listeners;
|
| ScopedVector<WebDriverLog> logs;
|
| - Status status = CreateLogs(capabilities, &logs, &listeners);
|
| + ScopedVector<CommandListener> command_listeners;
|
| + Status status = CreateLogs(capabilities, &logs, &devtools_listeners,
|
| + &command_listeners);
|
| ASSERT_TRUE(status.IsOk());
|
| ASSERT_EQ(2u, logs.size());
|
| - ASSERT_EQ(2u, listeners.size());
|
| + ASSERT_EQ(2u, devtools_listeners.size());
|
| + ASSERT_EQ(1u, command_listeners.size());
|
| ASSERT_EQ("performance", logs[0]->type());
|
| ASSERT_EQ("browser", logs[1]->type());
|
| }
|
| @@ -115,24 +119,30 @@ TEST(Logging, IgnoreUnknownLogType) {
|
| Capabilities capabilities;
|
| capabilities.logging_prefs["gaga"] = Log::kInfo;
|
|
|
| - ScopedVector<DevToolsEventListener> listeners;
|
| + ScopedVector<DevToolsEventListener> devtools_listeners;
|
| ScopedVector<WebDriverLog> logs;
|
| - Status status = CreateLogs(capabilities, &logs, &listeners);
|
| + ScopedVector<CommandListener> command_listeners;
|
| + Status status = CreateLogs(capabilities, &logs, &devtools_listeners,
|
| + &command_listeners);
|
| EXPECT_TRUE(status.IsOk());
|
| ASSERT_EQ(1u, logs.size());
|
| - ASSERT_EQ(1u, listeners.size());
|
| + ASSERT_EQ(1u, devtools_listeners.size());
|
| + ASSERT_EQ(0u, command_listeners.size());
|
| ASSERT_EQ("browser", logs[0]->type());
|
| }
|
|
|
| TEST(Logging, DefaultLogs) {
|
| Capabilities capabilities;
|
|
|
| - ScopedVector<DevToolsEventListener> listeners;
|
| + ScopedVector<DevToolsEventListener> devtools_listeners;
|
| ScopedVector<WebDriverLog> logs;
|
| - Status status = CreateLogs(capabilities, &logs, &listeners);
|
| + ScopedVector<CommandListener> command_listeners;
|
| + Status status = CreateLogs(capabilities, &logs, &devtools_listeners,
|
| + &command_listeners);
|
| EXPECT_TRUE(status.IsOk());
|
| ASSERT_EQ(1u, logs.size());
|
| - ASSERT_EQ(1u, listeners.size());
|
| + ASSERT_EQ(1u, devtools_listeners.size());
|
| + ASSERT_EQ(0u, command_listeners.size());
|
| ASSERT_EQ("browser", logs[0]->type());
|
| }
|
|
|
|
|