OLD | NEW |
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 "base/memory/scoped_ptr.h" | 5 #include "remoting/host/server_log_entry_host.h" |
| 6 |
| 7 #include <memory> |
| 8 |
6 #include "base/strings/stringize_macros.h" | 9 #include "base/strings/stringize_macros.h" |
7 #include "build/build_config.h" | 10 #include "build/build_config.h" |
8 #include "remoting/host/server_log_entry_host.h" | |
9 #include "remoting/signaling/server_log_entry.h" | 11 #include "remoting/signaling/server_log_entry.h" |
10 #include "remoting/signaling/server_log_entry_unittest.h" | 12 #include "remoting/signaling/server_log_entry_unittest.h" |
11 #include "testing/gtest/include/gtest/gtest.h" | 13 #include "testing/gtest/include/gtest/gtest.h" |
12 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h" | 14 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h" |
13 | 15 |
14 using buzz::XmlAttr; | 16 using buzz::XmlAttr; |
15 using buzz::XmlElement; | 17 using buzz::XmlElement; |
16 | 18 |
17 namespace remoting { | 19 namespace remoting { |
18 | 20 |
19 TEST(ServerLogEntryHostTest, MakeForSessionStateChange) { | 21 TEST(ServerLogEntryHostTest, MakeForSessionStateChange) { |
20 scoped_ptr<ServerLogEntry> entry(MakeLogEntryForSessionStateChange(true)); | 22 std::unique_ptr<ServerLogEntry> entry( |
21 scoped_ptr<XmlElement> stanza = entry->ToStanza(); | 23 MakeLogEntryForSessionStateChange(true)); |
| 24 std::unique_ptr<XmlElement> stanza = entry->ToStanza(); |
22 std::string error; | 25 std::string error; |
23 std::map<std::string, std::string> key_value_pairs; | 26 std::map<std::string, std::string> key_value_pairs; |
24 key_value_pairs["role"] = "host"; | 27 key_value_pairs["role"] = "host"; |
25 key_value_pairs["event-name"] = "session-state"; | 28 key_value_pairs["event-name"] = "session-state"; |
26 key_value_pairs["session-state"] = "connected"; | 29 key_value_pairs["session-state"] = "connected"; |
27 std::set<std::string> keys; | 30 std::set<std::string> keys; |
28 ASSERT_TRUE(VerifyStanza(key_value_pairs, keys, stanza.get(), &error)) | 31 ASSERT_TRUE(VerifyStanza(key_value_pairs, keys, stanza.get(), &error)) |
29 << error; | 32 << error; |
30 } | 33 } |
31 | 34 |
32 TEST(ServerLogEntryHostTest, MakeForHeartbeat) { | 35 TEST(ServerLogEntryHostTest, MakeForHeartbeat) { |
33 scoped_ptr<ServerLogEntry> entry(MakeLogEntryForHeartbeat()); | 36 std::unique_ptr<ServerLogEntry> entry(MakeLogEntryForHeartbeat()); |
34 scoped_ptr<XmlElement> stanza = entry->ToStanza(); | 37 std::unique_ptr<XmlElement> stanza = entry->ToStanza(); |
35 std::string error; | 38 std::string error; |
36 std::map<std::string, std::string> key_value_pairs; | 39 std::map<std::string, std::string> key_value_pairs; |
37 key_value_pairs["role"] = "host"; | 40 key_value_pairs["role"] = "host"; |
38 key_value_pairs["event-name"] = "heartbeat"; | 41 key_value_pairs["event-name"] = "heartbeat"; |
39 std::set<std::string> keys; | 42 std::set<std::string> keys; |
40 ASSERT_TRUE(VerifyStanza(key_value_pairs, keys, stanza.get(), &error)) | 43 ASSERT_TRUE(VerifyStanza(key_value_pairs, keys, stanza.get(), &error)) |
41 << error; | 44 << error; |
42 } | 45 } |
43 | 46 |
44 TEST(ServerLogEntryHostTest, AddHostFields) { | 47 TEST(ServerLogEntryHostTest, AddHostFields) { |
45 scoped_ptr<ServerLogEntry> entry(MakeLogEntryForSessionStateChange(true)); | 48 std::unique_ptr<ServerLogEntry> entry( |
| 49 MakeLogEntryForSessionStateChange(true)); |
46 AddHostFieldsToLogEntry(entry.get()); | 50 AddHostFieldsToLogEntry(entry.get()); |
47 scoped_ptr<XmlElement> stanza = entry->ToStanza(); | 51 std::unique_ptr<XmlElement> stanza = entry->ToStanza(); |
48 std::string error; | 52 std::string error; |
49 std::map<std::string, std::string> key_value_pairs; | 53 std::map<std::string, std::string> key_value_pairs; |
50 key_value_pairs["role"] = "host"; | 54 key_value_pairs["role"] = "host"; |
51 key_value_pairs["event-name"] = "session-state"; | 55 key_value_pairs["event-name"] = "session-state"; |
52 key_value_pairs["session-state"] = "connected"; | 56 key_value_pairs["session-state"] = "connected"; |
53 std::set<std::string> keys; | 57 std::set<std::string> keys; |
54 keys.insert("cpu"); | 58 keys.insert("cpu"); |
55 #if defined(OS_WIN) | 59 #if defined(OS_WIN) |
56 key_value_pairs["os-name"] = "Windows"; | 60 key_value_pairs["os-name"] = "Windows"; |
57 keys.insert("os-version"); | 61 keys.insert("os-version"); |
(...skipping 12 matching lines...) Expand all Loading... |
70 // silently converts undefined values). | 74 // silently converts undefined values). |
71 #ifndef VERSION | 75 #ifndef VERSION |
72 #error VERSION must be defined | 76 #error VERSION must be defined |
73 #endif | 77 #endif |
74 key_value_pairs["host-version"] = STRINGIZE(VERSION); | 78 key_value_pairs["host-version"] = STRINGIZE(VERSION); |
75 ASSERT_TRUE(VerifyStanza(key_value_pairs, keys, stanza.get(), &error)) << | 79 ASSERT_TRUE(VerifyStanza(key_value_pairs, keys, stanza.get(), &error)) << |
76 error; | 80 error; |
77 } | 81 } |
78 | 82 |
79 TEST(ServerLogEntryHostTest, AddModeField1) { | 83 TEST(ServerLogEntryHostTest, AddModeField1) { |
80 scoped_ptr<ServerLogEntry> entry(MakeLogEntryForSessionStateChange(true)); | 84 std::unique_ptr<ServerLogEntry> entry( |
| 85 MakeLogEntryForSessionStateChange(true)); |
81 entry->AddModeField(ServerLogEntry::IT2ME); | 86 entry->AddModeField(ServerLogEntry::IT2ME); |
82 scoped_ptr<XmlElement> stanza = entry->ToStanza(); | 87 std::unique_ptr<XmlElement> stanza = entry->ToStanza(); |
83 std::string error; | 88 std::string error; |
84 std::map<std::string, std::string> key_value_pairs; | 89 std::map<std::string, std::string> key_value_pairs; |
85 key_value_pairs["role"] = "host"; | 90 key_value_pairs["role"] = "host"; |
86 key_value_pairs["event-name"] = "session-state"; | 91 key_value_pairs["event-name"] = "session-state"; |
87 key_value_pairs["session-state"] = "connected"; | 92 key_value_pairs["session-state"] = "connected"; |
88 key_value_pairs["mode"] = "it2me"; | 93 key_value_pairs["mode"] = "it2me"; |
89 std::set<std::string> keys; | 94 std::set<std::string> keys; |
90 ASSERT_TRUE(VerifyStanza(key_value_pairs, keys, stanza.get(), &error)) << | 95 ASSERT_TRUE(VerifyStanza(key_value_pairs, keys, stanza.get(), &error)) << |
91 error; | 96 error; |
92 } | 97 } |
93 | 98 |
94 TEST(ServerLogEntryHostTest, AddModeField2) { | 99 TEST(ServerLogEntryHostTest, AddModeField2) { |
95 scoped_ptr<ServerLogEntry> entry(MakeLogEntryForSessionStateChange(true)); | 100 std::unique_ptr<ServerLogEntry> entry( |
| 101 MakeLogEntryForSessionStateChange(true)); |
96 entry->AddModeField(ServerLogEntry::ME2ME); | 102 entry->AddModeField(ServerLogEntry::ME2ME); |
97 scoped_ptr<XmlElement> stanza = entry->ToStanza(); | 103 std::unique_ptr<XmlElement> stanza = entry->ToStanza(); |
98 std::string error; | 104 std::string error; |
99 std::map<std::string, std::string> key_value_pairs; | 105 std::map<std::string, std::string> key_value_pairs; |
100 key_value_pairs["role"] = "host"; | 106 key_value_pairs["role"] = "host"; |
101 key_value_pairs["event-name"] = "session-state"; | 107 key_value_pairs["event-name"] = "session-state"; |
102 key_value_pairs["session-state"] = "connected"; | 108 key_value_pairs["session-state"] = "connected"; |
103 key_value_pairs["mode"] = "me2me"; | 109 key_value_pairs["mode"] = "me2me"; |
104 std::set<std::string> keys; | 110 std::set<std::string> keys; |
105 ASSERT_TRUE(VerifyStanza(key_value_pairs, keys, stanza.get(), &error)) << | 111 ASSERT_TRUE(VerifyStanza(key_value_pairs, keys, stanza.get(), &error)) << |
106 error; | 112 error; |
107 } | 113 } |
108 | 114 |
109 } // namespace remoting | 115 } // namespace remoting |
OLD | NEW |