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 "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/logging.h" | 10 #include "chrome/test/chromedriver/logging.h" |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 ASSERT_EQ(2u, entries->GetSize()); | 94 ASSERT_EQ(2u, entries->GetSize()); |
95 ValidateLogEntry(entries.get(), 0, "SEVERE", "severe message"); | 95 ValidateLogEntry(entries.get(), 0, "SEVERE", "severe message"); |
96 ValidateLogEntry(entries.get(), 1, "DEBUG", "debug message"); | 96 ValidateLogEntry(entries.get(), 1, "DEBUG", "debug message"); |
97 } | 97 } |
98 | 98 |
99 TEST(Logging, CreatePerformanceLog) { | 99 TEST(Logging, CreatePerformanceLog) { |
100 Capabilities capabilities; | 100 Capabilities capabilities; |
101 capabilities.logging_prefs["performance"] = Log::kInfo; | 101 capabilities.logging_prefs["performance"] = Log::kInfo; |
102 capabilities.logging_prefs["browser"] = Log::kInfo; | 102 capabilities.logging_prefs["browser"] = Log::kInfo; |
103 | 103 |
104 ScopedVector<DevToolsEventListener> listeners; | 104 ScopedVector<DevToolsEventListener> devtools_listeners; |
105 ScopedVector<WebDriverLog> logs; | 105 ScopedVector<WebDriverLog> logs; |
106 Status status = CreateLogs(capabilities, &logs, &listeners); | 106 std::list<CommandListener*> command_listeners; |
| 107 Status status = CreateLogs(capabilities, &logs, &devtools_listeners, |
| 108 &command_listeners); |
107 ASSERT_TRUE(status.IsOk()); | 109 ASSERT_TRUE(status.IsOk()); |
108 ASSERT_EQ(2u, logs.size()); | 110 ASSERT_EQ(2u, logs.size()); |
109 ASSERT_EQ(2u, listeners.size()); | 111 ASSERT_EQ(2u, devtools_listeners.size()); |
| 112 ASSERT_EQ(1u, command_listeners.size()); |
110 ASSERT_EQ("performance", logs[0]->type()); | 113 ASSERT_EQ("performance", logs[0]->type()); |
111 ASSERT_EQ("browser", logs[1]->type()); | 114 ASSERT_EQ("browser", logs[1]->type()); |
112 } | 115 } |
113 | 116 |
114 TEST(Logging, IgnoreUnknownLogType) { | 117 TEST(Logging, IgnoreUnknownLogType) { |
115 Capabilities capabilities; | 118 Capabilities capabilities; |
116 capabilities.logging_prefs["gaga"] = Log::kInfo; | 119 capabilities.logging_prefs["gaga"] = Log::kInfo; |
117 | 120 |
118 ScopedVector<DevToolsEventListener> listeners; | 121 ScopedVector<DevToolsEventListener> devtools_listeners; |
119 ScopedVector<WebDriverLog> logs; | 122 ScopedVector<WebDriverLog> logs; |
120 Status status = CreateLogs(capabilities, &logs, &listeners); | 123 std::list<CommandListener*> command_listeners; |
| 124 Status status = CreateLogs(capabilities, &logs, &devtools_listeners, |
| 125 &command_listeners); |
121 EXPECT_TRUE(status.IsOk()); | 126 EXPECT_TRUE(status.IsOk()); |
122 ASSERT_EQ(1u, logs.size()); | 127 ASSERT_EQ(1u, logs.size()); |
123 ASSERT_EQ(1u, listeners.size()); | 128 ASSERT_EQ(1u, devtools_listeners.size()); |
| 129 ASSERT_EQ(0u, command_listeners.size()); |
124 ASSERT_EQ("browser", logs[0]->type()); | 130 ASSERT_EQ("browser", logs[0]->type()); |
125 } | 131 } |
126 | 132 |
127 TEST(Logging, DefaultLogs) { | 133 TEST(Logging, DefaultLogs) { |
128 Capabilities capabilities; | 134 Capabilities capabilities; |
129 | 135 |
130 ScopedVector<DevToolsEventListener> listeners; | 136 ScopedVector<DevToolsEventListener> devtools_listeners; |
131 ScopedVector<WebDriverLog> logs; | 137 ScopedVector<WebDriverLog> logs; |
132 Status status = CreateLogs(capabilities, &logs, &listeners); | 138 std::list<CommandListener*> command_listeners; |
| 139 Status status = CreateLogs(capabilities, &logs, &devtools_listeners, |
| 140 &command_listeners); |
133 EXPECT_TRUE(status.IsOk()); | 141 EXPECT_TRUE(status.IsOk()); |
134 ASSERT_EQ(1u, logs.size()); | 142 ASSERT_EQ(1u, logs.size()); |
135 ASSERT_EQ(1u, listeners.size()); | 143 ASSERT_EQ(1u, devtools_listeners.size()); |
| 144 ASSERT_EQ(0u, command_listeners.size()); |
136 ASSERT_EQ("browser", logs[0]->type()); | 145 ASSERT_EQ("browser", logs[0]->type()); |
137 } | 146 } |
138 | 147 |
139 TEST(Logging, GetFirstErrorMessage) { | 148 TEST(Logging, GetFirstErrorMessage) { |
140 WebDriverLog log(WebDriverLog::kBrowserType, Log::kAll); | 149 WebDriverLog log(WebDriverLog::kBrowserType, Log::kAll); |
141 std::string entry; | 150 std::string entry; |
142 | 151 |
143 entry = log.GetFirstErrorMessage(); | 152 entry = log.GetFirstErrorMessage(); |
144 ASSERT_TRUE(entry.empty()); | 153 ASSERT_TRUE(entry.empty()); |
145 | 154 |
146 log.AddEntry(Log::kInfo, "info message"); | 155 log.AddEntry(Log::kInfo, "info message"); |
147 log.AddEntry(Log::kError, "first error message"); | 156 log.AddEntry(Log::kError, "first error message"); |
148 log.AddEntry(Log::kDebug, "debug message"); | 157 log.AddEntry(Log::kDebug, "debug message"); |
149 log.AddEntry(Log::kError, "second error message"); | 158 log.AddEntry(Log::kError, "second error message"); |
150 | 159 |
151 entry = log.GetFirstErrorMessage(); | 160 entry = log.GetFirstErrorMessage(); |
152 ASSERT_EQ("first error message", entry); | 161 ASSERT_EQ("first error message", entry); |
153 } | 162 } |
OLD | NEW |