| OLD | NEW |
| 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 <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include <memory> |
| 8 #include <vector> |
| 9 |
| 7 #include "base/format_macros.h" | 10 #include "base/format_macros.h" |
| 8 #include "base/macros.h" | 11 #include "base/macros.h" |
| 9 #include "base/strings/stringprintf.h" | 12 #include "base/strings/stringprintf.h" |
| 10 #include "base/values.h" | 13 #include "base/values.h" |
| 11 #include "chrome/test/chromedriver/capabilities.h" | 14 #include "chrome/test/chromedriver/capabilities.h" |
| 12 #include "chrome/test/chromedriver/chrome/devtools_event_listener.h" | 15 #include "chrome/test/chromedriver/chrome/devtools_event_listener.h" |
| 13 #include "chrome/test/chromedriver/chrome/log.h" | 16 #include "chrome/test/chromedriver/chrome/log.h" |
| 14 #include "chrome/test/chromedriver/chrome/status.h" | 17 #include "chrome/test/chromedriver/chrome/status.h" |
| 15 #include "chrome/test/chromedriver/command_listener.h" | 18 #include "chrome/test/chromedriver/command_listener.h" |
| 16 #include "chrome/test/chromedriver/logging.h" | 19 #include "chrome/test/chromedriver/logging.h" |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 ValidateLogEntry(entries.get(), 0, "SEVERE", "severe message"); | 105 ValidateLogEntry(entries.get(), 0, "SEVERE", "severe message"); |
| 103 ValidateLogEntry(entries.get(), 1, "DEBUG", "debug message"); | 106 ValidateLogEntry(entries.get(), 1, "DEBUG", "debug message"); |
| 104 } | 107 } |
| 105 | 108 |
| 106 TEST(Logging, CreatePerformanceLog) { | 109 TEST(Logging, CreatePerformanceLog) { |
| 107 Capabilities capabilities; | 110 Capabilities capabilities; |
| 108 Session session("test"); | 111 Session session("test"); |
| 109 capabilities.logging_prefs["performance"] = Log::kInfo; | 112 capabilities.logging_prefs["performance"] = Log::kInfo; |
| 110 capabilities.logging_prefs["browser"] = Log::kInfo; | 113 capabilities.logging_prefs["browser"] = Log::kInfo; |
| 111 | 114 |
| 112 ScopedVector<DevToolsEventListener> devtools_listeners; | 115 std::vector<std::unique_ptr<DevToolsEventListener>> devtools_listeners; |
| 113 ScopedVector<WebDriverLog> logs; | 116 std::vector<std::unique_ptr<WebDriverLog>> logs; |
| 114 ScopedVector<CommandListener> command_listeners; | 117 std::vector<std::unique_ptr<CommandListener>> command_listeners; |
| 115 Status status = CreateLogs(capabilities, &session, &logs, &devtools_listeners, | 118 Status status = CreateLogs(capabilities, &session, &logs, &devtools_listeners, |
| 116 &command_listeners); | 119 &command_listeners); |
| 117 ASSERT_TRUE(status.IsOk()); | 120 ASSERT_TRUE(status.IsOk()); |
| 118 ASSERT_EQ(2u, logs.size()); | 121 ASSERT_EQ(2u, logs.size()); |
| 119 ASSERT_EQ(2u, devtools_listeners.size()); | 122 ASSERT_EQ(2u, devtools_listeners.size()); |
| 120 ASSERT_EQ(1u, command_listeners.size()); | 123 ASSERT_EQ(1u, command_listeners.size()); |
| 121 ASSERT_EQ("performance", logs[0]->type()); | 124 ASSERT_EQ("performance", logs[0]->type()); |
| 122 ASSERT_EQ("browser", logs[1]->type()); | 125 ASSERT_EQ("browser", logs[1]->type()); |
| 123 } | 126 } |
| 124 | 127 |
| 125 TEST(Logging, IgnoreUnknownLogType) { | 128 TEST(Logging, IgnoreUnknownLogType) { |
| 126 Capabilities capabilities; | 129 Capabilities capabilities; |
| 127 Session session("test"); | 130 Session session("test"); |
| 128 capabilities.logging_prefs["gaga"] = Log::kInfo; | 131 capabilities.logging_prefs["gaga"] = Log::kInfo; |
| 129 | 132 |
| 130 ScopedVector<DevToolsEventListener> devtools_listeners; | 133 std::vector<std::unique_ptr<DevToolsEventListener>> devtools_listeners; |
| 131 ScopedVector<WebDriverLog> logs; | 134 std::vector<std::unique_ptr<WebDriverLog>> logs; |
| 132 ScopedVector<CommandListener> command_listeners; | 135 std::vector<std::unique_ptr<CommandListener>> command_listeners; |
| 133 Status status = CreateLogs(capabilities, &session, &logs, &devtools_listeners, | 136 Status status = CreateLogs(capabilities, &session, &logs, &devtools_listeners, |
| 134 &command_listeners); | 137 &command_listeners); |
| 135 EXPECT_TRUE(status.IsOk()); | 138 EXPECT_TRUE(status.IsOk()); |
| 136 ASSERT_EQ(1u, logs.size()); | 139 ASSERT_EQ(1u, logs.size()); |
| 137 ASSERT_EQ(1u, devtools_listeners.size()); | 140 ASSERT_EQ(1u, devtools_listeners.size()); |
| 138 ASSERT_EQ(0u, command_listeners.size()); | 141 ASSERT_EQ(0u, command_listeners.size()); |
| 139 ASSERT_EQ("browser", logs[0]->type()); | 142 ASSERT_EQ("browser", logs[0]->type()); |
| 140 } | 143 } |
| 141 | 144 |
| 142 TEST(Logging, DefaultLogs) { | 145 TEST(Logging, DefaultLogs) { |
| 143 Capabilities capabilities; | 146 Capabilities capabilities; |
| 144 Session session("test"); | 147 Session session("test"); |
| 145 | 148 |
| 146 ScopedVector<DevToolsEventListener> devtools_listeners; | 149 std::vector<std::unique_ptr<DevToolsEventListener>> devtools_listeners; |
| 147 ScopedVector<WebDriverLog> logs; | 150 std::vector<std::unique_ptr<WebDriverLog>> logs; |
| 148 ScopedVector<CommandListener> command_listeners; | 151 std::vector<std::unique_ptr<CommandListener>> command_listeners; |
| 149 Status status = CreateLogs(capabilities, &session, &logs, &devtools_listeners, | 152 Status status = CreateLogs(capabilities, &session, &logs, &devtools_listeners, |
| 150 &command_listeners); | 153 &command_listeners); |
| 151 EXPECT_TRUE(status.IsOk()); | 154 EXPECT_TRUE(status.IsOk()); |
| 152 ASSERT_EQ(1u, logs.size()); | 155 ASSERT_EQ(1u, logs.size()); |
| 153 ASSERT_EQ(1u, devtools_listeners.size()); | 156 ASSERT_EQ(1u, devtools_listeners.size()); |
| 154 ASSERT_EQ(0u, command_listeners.size()); | 157 ASSERT_EQ(0u, command_listeners.size()); |
| 155 ASSERT_EQ("browser", logs[0]->type()); | 158 ASSERT_EQ("browser", logs[0]->type()); |
| 156 } | 159 } |
| 157 | 160 |
| 158 TEST(Logging, GetFirstErrorMessage) { | 161 TEST(Logging, GetFirstErrorMessage) { |
| (...skipping 16 matching lines...) Expand all Loading... |
| 175 WebDriverLog log(WebDriverLog::kBrowserType, Log::kAll); | 178 WebDriverLog log(WebDriverLog::kBrowserType, Log::kAll); |
| 176 for (size_t i = 0; i < internal::kMaxReturnedEntries; i++) | 179 for (size_t i = 0; i < internal::kMaxReturnedEntries; i++) |
| 177 log.AddEntry(Log::kInfo, base::StringPrintf("%" PRIuS, i)); | 180 log.AddEntry(Log::kInfo, base::StringPrintf("%" PRIuS, i)); |
| 178 log.AddEntry(Log::kError, "the 1st error is in the 2nd batch"); | 181 log.AddEntry(Log::kError, "the 1st error is in the 2nd batch"); |
| 179 ASSERT_EQ("the 1st error is in the 2nd batch", log.GetFirstErrorMessage()); | 182 ASSERT_EQ("the 1st error is in the 2nd batch", log.GetFirstErrorMessage()); |
| 180 std::unique_ptr<base::ListValue> entries = log.GetAndClearEntries(); | 183 std::unique_ptr<base::ListValue> entries = log.GetAndClearEntries(); |
| 181 ASSERT_EQ(internal::kMaxReturnedEntries, entries->GetSize()); | 184 ASSERT_EQ(internal::kMaxReturnedEntries, entries->GetSize()); |
| 182 entries = log.GetAndClearEntries(); | 185 entries = log.GetAndClearEntries(); |
| 183 ASSERT_EQ(1u, entries->GetSize()); | 186 ASSERT_EQ(1u, entries->GetSize()); |
| 184 } | 187 } |
| OLD | NEW |