| 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 #import <Cocoa/Cocoa.h> | 5 #import <Cocoa/Cocoa.h> |
| 6 #include <stdint.h> | 6 #include <stdint.h> |
| 7 | 7 |
| 8 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" | 8 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/mac/scoped_nsobject.h" | 10 #include "base/mac/scoped_nsobject.h" |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 base::Bind(&ServiceDiscoveryClientMacTest::OnResolveComplete, | 120 base::Bind(&ServiceDiscoveryClientMacTest::OnResolveComplete, |
| 121 base::Unretained(this))); | 121 base::Unretained(this))); |
| 122 | 122 |
| 123 const uint8_t record_bytes[] = {2, 'a', 'b', 3, 'd', '=', 'e'}; | 123 const uint8_t record_bytes[] = {2, 'a', 'b', 3, 'd', '=', 'e'}; |
| 124 base::scoped_nsobject<TestNSNetService> test_service([[TestNSNetService alloc] | 124 base::scoped_nsobject<TestNSNetService> test_service([[TestNSNetService alloc] |
| 125 initWithData:[[NSData alloc] initWithBytes:record_bytes | 125 initWithData:[[NSData alloc] initWithBytes:record_bytes |
| 126 length:arraysize(record_bytes)]]); | 126 length:arraysize(record_bytes)]]); |
| 127 | 127 |
| 128 const std::string kIp = "2001:4860:4860::8844"; | 128 const std::string kIp = "2001:4860:4860::8844"; |
| 129 const uint16_t kPort = 4321; | 129 const uint16_t kPort = 4321; |
| 130 net::IPAddressNumber ip_address; | 130 net::IPAddress ip_address; |
| 131 ASSERT_TRUE(net::ParseIPLiteralToNumber(kIp, &ip_address)); | 131 ASSERT_TRUE(net::IPAddress::FromIPLiteral(kIp, &ip_address)); |
| 132 net::IPEndPoint endpoint(ip_address, kPort); | 132 net::IPEndPoint endpoint(ip_address, kPort); |
| 133 net::SockaddrStorage storage; | 133 net::SockaddrStorage storage; |
| 134 ASSERT_TRUE(endpoint.ToSockAddr(storage.addr, &storage.addr_len)); | 134 ASSERT_TRUE(endpoint.ToSockAddr(storage.addr, &storage.addr_len)); |
| 135 NSData* discoveryHost = | 135 NSData* discoveryHost = |
| 136 [NSData dataWithBytes:storage.addr length:storage.addr_len]; | 136 [NSData dataWithBytes:storage.addr length:storage.addr_len]; |
| 137 NSArray* addresses = @[ discoveryHost ]; | 137 NSArray* addresses = @[ discoveryHost ]; |
| 138 [test_service setAddresses:addresses]; | 138 [test_service setAddresses:addresses]; |
| 139 | 139 |
| 140 ServiceResolverImplMac* resolver_impl = | 140 ServiceResolverImplMac* resolver_impl = |
| 141 static_cast<ServiceResolverImplMac*>(resolver.get()); | 141 static_cast<ServiceResolverImplMac*>(resolver.get()); |
| 142 resolver_impl->GetContainerForTesting()->SetServiceForTesting( | 142 resolver_impl->GetContainerForTesting()->SetServiceForTesting( |
| 143 test_service.release()); | 143 test_service.release()); |
| 144 resolver->StartResolving(); | 144 resolver->StartResolving(); |
| 145 | 145 |
| 146 resolver_impl->GetContainerForTesting()->OnResolveUpdate( | 146 resolver_impl->GetContainerForTesting()->OnResolveUpdate( |
| 147 ServiceResolver::STATUS_SUCCESS); | 147 ServiceResolver::STATUS_SUCCESS); |
| 148 | 148 |
| 149 base::MessageLoop::current()->RunUntilIdle(); | 149 base::MessageLoop::current()->RunUntilIdle(); |
| 150 | 150 |
| 151 EXPECT_EQ(1, num_resolves_); | 151 EXPECT_EQ(1, num_resolves_); |
| 152 EXPECT_EQ(2u, last_service_description_.metadata.size()); | 152 EXPECT_EQ(2u, last_service_description_.metadata.size()); |
| 153 EXPECT_EQ(ip_address, last_service_description_.ip_address); | 153 EXPECT_EQ(ip_address, last_service_description_.ip_address); |
| 154 EXPECT_EQ(kPort, last_service_description_.address.port()); | 154 EXPECT_EQ(kPort, last_service_description_.address.port()); |
| 155 EXPECT_EQ(kIp, last_service_description_.address.host()); | 155 EXPECT_EQ(kIp, last_service_description_.address.host()); |
| 156 } | 156 } |
| 157 | 157 |
| 158 } // namespace local_discovery | 158 } // namespace local_discovery |
| OLD | NEW |