From add9a847656878d0e93ee5276ae7fc333799dfdd Mon Sep 17 00:00:00 2001 From: "stanleyw@chromium.org" Date: Sat, 10 Mar 2012 11:16:15 +0000 Subject: Adding ONC pyauto test cases * Modified GetNetworkInfo automation provider so that remembered_networks returns a dictionary of the wifi object instead of the list of wifi service paths. * Added more onc test scenarios. * Add onc.py to test onc policy import. Change-Id: Ic79995c2296679ccc57553682d7714b40aa4d6eb BUG=None TEST=Run onc.py pyauto test and they should all pass in R19 Review URL: http://codereview.chromium.org/9609002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126029 0039d316-1c4b-4281-b951-d872f2087c98 --- .../testing_automation_provider_chromeos.cc | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'chrome/browser/automation') diff --git a/chrome/browser/automation/testing_automation_provider_chromeos.cc b/chrome/browser/automation/testing_automation_provider_chromeos.cc index 4e28b9f..f6c426f 100644 --- a/chrome/browser/automation/testing_automation_provider_chromeos.cc +++ b/chrome/browser/automation/testing_automation_provider_chromeos.cc @@ -62,6 +62,14 @@ DictionaryValue* GetNetworkInfoDict(const chromeos::Network* network) { return item; } +DictionaryValue* GetWifiInfoDict(const chromeos::WifiNetwork* wifi) { + DictionaryValue* item = GetNetworkInfoDict(wifi); + item->SetInteger("strength", wifi->strength()); + item->SetBoolean("encrypted", wifi->encrypted()); + item->SetString("encryption", wifi->GetEncryptionString()); + return item; +} + base::Value* GetProxySetting(Browser* browser, const std::string& setting_name) { std::string setting_path = "cros.session.proxy."; @@ -421,10 +429,7 @@ void TestingAutomationProvider::GetNetworkInfo(DictionaryValue* args, for (chromeos::WifiNetworkVector::const_iterator iter = wifi_networks.begin(); iter != wifi_networks.end(); ++iter) { const chromeos::WifiNetwork* wifi = *iter; - DictionaryValue* item = GetNetworkInfoDict(wifi); - item->SetInteger("strength", wifi->strength()); - item->SetBoolean("encrypted", wifi->encrypted()); - item->SetString("encryption", wifi->GetEncryptionString()); + DictionaryValue* item = GetWifiInfoDict(wifi); items->Set(wifi->service_path(), item); } return_value->Set("wifi_networks", items); @@ -460,14 +465,15 @@ void TestingAutomationProvider::GetNetworkInfo(DictionaryValue* args, // Remembered Wifi Networks. const chromeos::WifiNetworkVector& remembered_wifi = network_library->remembered_wifi_networks(); - ListValue* items = new ListValue; + DictionaryValue* remembered_wifi_items = new DictionaryValue; for (chromeos::WifiNetworkVector::const_iterator iter = remembered_wifi.begin(); iter != remembered_wifi.end(); ++iter) { const chromeos::WifiNetwork* wifi = *iter; - items->Append(base::Value::CreateStringValue(wifi->service_path())); + DictionaryValue* item = GetWifiInfoDict(wifi); + remembered_wifi_items->Set(wifi->service_path(), item); } - return_value->Set("remembered_wifi", items); + return_value->Set("remembered_wifi", remembered_wifi_items); AutomationJSONReply(this, reply_message).SendSuccess(return_value.get()); } -- cgit v1.1