| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "ppapi/tests/test_host_resolver.h" | 5 #include "ppapi/tests/test_host_resolver.h" |
| 6 | 6 |
| 7 #include "ppapi/cpp/host_resolver.h" | 7 #include "ppapi/cpp/host_resolver.h" |
| 8 #include "ppapi/cpp/net_address.h" | 8 #include "ppapi/cpp/net_address.h" |
| 9 #include "ppapi/cpp/tcp_socket.h" | 9 #include "ppapi/cpp/tcp_socket.h" |
| 10 #include "ppapi/cpp/var.h" | 10 #include "ppapi/cpp/var.h" |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 ASSERT_EQ(num_bytes, callback.result()); | 78 ASSERT_EQ(num_bytes, callback.result()); |
| 79 *bytes_written = callback.result(); | 79 *bytes_written = callback.result(); |
| 80 PASS(); | 80 PASS(); |
| 81 } | 81 } |
| 82 | 82 |
| 83 std::string TestHostResolver::CheckHTTPResponse(pp::TCPSocket* socket, | 83 std::string TestHostResolver::CheckHTTPResponse(pp::TCPSocket* socket, |
| 84 const std::string& request, | 84 const std::string& request, |
| 85 const std::string& response) { | 85 const std::string& response) { |
| 86 int32_t rv = 0; | 86 int32_t rv = 0; |
| 87 ASSERT_SUBTEST_SUCCESS( | 87 ASSERT_SUBTEST_SUCCESS( |
| 88 SyncWrite(socket, request.c_str(), request.size(), &rv)); | 88 SyncWrite(socket, request.c_str(), static_cast<int32_t>(request.size()), |
| 89 &rv)); |
| 89 std::vector<char> response_buffer(response.size()); | 90 std::vector<char> response_buffer(response.size()); |
| 90 ASSERT_SUBTEST_SUCCESS( | 91 ASSERT_SUBTEST_SUCCESS( |
| 91 SyncRead(socket, &response_buffer[0], response.size(), &rv)); | 92 SyncRead(socket, &response_buffer[0], |
| 93 static_cast<int32_t>(response.size()), &rv)); |
| 92 std::string actual_response(&response_buffer[0], rv); | 94 std::string actual_response(&response_buffer[0], rv); |
| 93 if (response != actual_response) { | 95 if (response != actual_response) { |
| 94 return "CheckHTTPResponse failed, expected: " + response + | 96 return "CheckHTTPResponse failed, expected: " + response + |
| 95 ", actual: " + actual_response; | 97 ", actual: " + actual_response; |
| 96 } | 98 } |
| 97 PASS(); | 99 PASS(); |
| 98 } | 100 } |
| 99 | 101 |
| 100 std::string TestHostResolver::SyncResolve( | 102 std::string TestHostResolver::SyncResolve( |
| 101 pp::HostResolver* host_resolver, | 103 pp::HostResolver* host_resolver, |
| (...skipping 12 matching lines...) Expand all Loading... |
| 114 const PP_HostResolver_Hint& hint) { | 116 const PP_HostResolver_Hint& hint) { |
| 115 pp::HostResolver host_resolver(instance_); | 117 pp::HostResolver host_resolver(instance_); |
| 116 | 118 |
| 117 ASSERT_SUBTEST_SUCCESS(SyncResolve(&host_resolver, host_, port_, hint)); | 119 ASSERT_SUBTEST_SUCCESS(SyncResolve(&host_resolver, host_, port_, hint)); |
| 118 | 120 |
| 119 size_t size = host_resolver.GetNetAddressCount(); | 121 size_t size = host_resolver.GetNetAddressCount(); |
| 120 ASSERT_TRUE(size >= 1); | 122 ASSERT_TRUE(size >= 1); |
| 121 | 123 |
| 122 pp::NetAddress address; | 124 pp::NetAddress address; |
| 123 for (size_t i = 0; i < size; ++i) { | 125 for (size_t i = 0; i < size; ++i) { |
| 124 address = host_resolver.GetNetAddress(i); | 126 address = host_resolver.GetNetAddress(static_cast<uint32_t>(i)); |
| 125 ASSERT_NE(0, address.pp_resource()); | 127 ASSERT_NE(0, address.pp_resource()); |
| 126 | 128 |
| 127 pp::TCPSocket socket(instance_); | 129 pp::TCPSocket socket(instance_); |
| 128 ASSERT_SUBTEST_SUCCESS(SyncConnect(&socket, address)); | 130 ASSERT_SUBTEST_SUCCESS(SyncConnect(&socket, address)); |
| 129 ASSERT_SUBTEST_SUCCESS(CheckHTTPResponse(&socket, | 131 ASSERT_SUBTEST_SUCCESS(CheckHTTPResponse(&socket, |
| 130 "GET / HTTP/1.0\r\n\r\n", | 132 "GET / HTTP/1.0\r\n\r\n", |
| 131 "HTTP")); | 133 "HTTP")); |
| 132 socket.Close(); | 134 socket.Close(); |
| 133 } | 135 } |
| 134 | 136 |
| 135 address = host_resolver.GetNetAddress(size); | 137 address = host_resolver.GetNetAddress(static_cast<uint32_t>(size)); |
| 136 ASSERT_EQ(0, address.pp_resource()); | 138 ASSERT_EQ(0, address.pp_resource()); |
| 137 pp::Var canonical_name = host_resolver.GetCanonicalName(); | 139 pp::Var canonical_name = host_resolver.GetCanonicalName(); |
| 138 ASSERT_TRUE(canonical_name.is_string()); | 140 ASSERT_TRUE(canonical_name.is_string()); |
| 139 | 141 |
| 140 ASSERT_SUBTEST_SUCCESS(SyncResolve(&host_resolver, canonical_name.AsString(), | 142 ASSERT_SUBTEST_SUCCESS(SyncResolve(&host_resolver, canonical_name.AsString(), |
| 141 port_, hint)); | 143 port_, hint)); |
| 142 size = host_resolver.GetNetAddressCount(); | 144 size = host_resolver.GetNetAddressCount(); |
| 143 ASSERT_TRUE(size >= 1); | 145 ASSERT_TRUE(size >= 1); |
| 144 | 146 |
| 145 PASS(); | 147 PASS(); |
| (...skipping 14 matching lines...) Expand all Loading... |
| 160 hint.flags = PP_HOSTRESOLVER_FLAG_CANONNAME; | 162 hint.flags = PP_HOSTRESOLVER_FLAG_CANONNAME; |
| 161 return ParameterizedTestResolve(hint); | 163 return ParameterizedTestResolve(hint); |
| 162 } | 164 } |
| 163 | 165 |
| 164 std::string TestHostResolver::TestResolveIPv4() { | 166 std::string TestHostResolver::TestResolveIPv4() { |
| 165 PP_HostResolver_Hint hint; | 167 PP_HostResolver_Hint hint; |
| 166 hint.family = PP_NETADDRESS_FAMILY_IPV4; | 168 hint.family = PP_NETADDRESS_FAMILY_IPV4; |
| 167 hint.flags = PP_HOSTRESOLVER_FLAG_CANONNAME; | 169 hint.flags = PP_HOSTRESOLVER_FLAG_CANONNAME; |
| 168 return ParameterizedTestResolve(hint); | 170 return ParameterizedTestResolve(hint); |
| 169 } | 171 } |
| OLD | NEW |