Chromium Code Reviews| Index: chrome/browser/extensions/api/dial/dial_apitest.cc |
| diff --git a/chrome/browser/extensions/api/dial/dial_apitest.cc b/chrome/browser/extensions/api/dial/dial_apitest.cc |
| index 84798a3bb142d8a443be935ebd49c32cdc50d2ee..5a8685ce998591bf612b9329641c770db67996d9 100644 |
| --- a/chrome/browser/extensions/api/dial/dial_apitest.cc |
| +++ b/chrome/browser/extensions/api/dial/dial_apitest.cc |
| @@ -17,8 +17,9 @@ |
| using extensions::Extension; |
| using extensions::ResultCatcher; |
| - |
| -namespace dial = extensions::api::dial; |
| +using extensions::api::dial::DialDeviceData; |
| +using extensions::api::dial::DialDeviceDescriptionData; |
| +using extensions::api::dial::DialRegistry; |
| namespace { |
| @@ -52,11 +53,11 @@ IN_PROC_BROWSER_TEST_F(DialAPITest, MAYBE_DeviceListEvents) { |
| extensions::DialAPIFactory::GetInstance()->GetForBrowserContext( |
| profile()); |
| ASSERT_TRUE(api.get()); |
| - dial::DialRegistry::DeviceList devices; |
| + DialRegistry::DeviceList devices; |
| ResultCatcher catcher; |
| - dial::DialDeviceData device1; |
| + DialDeviceData device1; |
| device1.set_device_id("1"); |
| device1.set_label("1"); |
| device1.set_device_description_url(GURL("http://127.0.0.1/dd.xml")); |
| @@ -64,7 +65,7 @@ IN_PROC_BROWSER_TEST_F(DialAPITest, MAYBE_DeviceListEvents) { |
| devices.push_back(device1); |
| api->SendEventOnUIThread(devices); |
| - dial::DialDeviceData device2; |
| + DialDeviceData device2; |
| device2.set_device_id("2"); |
| device2.set_label("2"); |
| device2.set_device_description_url(GURL("http://127.0.0.2/dd.xml")); |
| @@ -72,7 +73,7 @@ IN_PROC_BROWSER_TEST_F(DialAPITest, MAYBE_DeviceListEvents) { |
| devices.push_back(device2); |
| api->SendEventOnUIThread(devices); |
| - dial::DialDeviceData device3; |
| + DialDeviceData device3; |
| device3.set_device_id("3"); |
| device3.set_label("3"); |
| device3.set_device_description_url(GURL("http://127.0.0.3/dd.xml")); |
| @@ -115,3 +116,22 @@ IN_PROC_BROWSER_TEST_F(DialAPITest, NonWhitelistedExtension) { |
| IN_PROC_BROWSER_TEST_F(DialAPITest, OnError) { |
| ASSERT_TRUE(RunExtensionSubtest("dial/experimental", "on_error.html")); |
| } |
| + |
| +IN_PROC_BROWSER_TEST_F(DialAPITest, FetchDeviceDescription) { |
| + scoped_refptr<extensions::DialAPI> api = |
| + extensions::DialAPIFactory::GetInstance()->GetForBrowserContext( |
| + profile()); |
| + ASSERT_TRUE(api.get()); |
|
Wez
2017/01/05 22:29:24
nit: Omit .get() when testing a ptr as bool.
mark a. foltz
2017/01/09 21:38:08
Done.
|
| + |
| + DialDeviceData test_device("testDeviceId", |
| + GURL("http://127.0.0.1/description.xml"), |
| + base::Time::Now()); |
| + test_device.set_label("testDevice"); |
| + |
| + DialDeviceDescriptionData test_description("<xml>testDescription</xml>", |
| + GURL("http://127.0.0.1/apps")); |
| + api->SetDeviceForTest(test_device, test_description); |
| + |
| + ASSERT_TRUE(RunExtensionSubtest("dial/experimental", |
| + "fetch_device_description.html")); |
|
Wez
2017/01/05 22:29:24
nit: Do we have any test cases for the API failing
mark a. foltz
2017/01/09 21:38:08
Added one.
|
| +} |