Replace OncNetworkParser by the new ONC translator.

chrome/test/functional/chromeos_onc.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 
 import pyauto_functional  # must come before pyauto.
 import policy_base
 import pyauto
 
 
 class ChromeosONC(policy_base.PolicyTestBase):
   """
   Tests for Open Network Configuration (ONC).
 
   Open Network Configuration (ONC) files is a json dictionary
   that contains network configurations and is pulled via policies.
   These tests verify that ONC files that are formatted correctly
   add the network/certificate to the device.
   """
 
-  ONC_PATH = os.path.join(pyauto.PyUITest.DataDir(), 'chromeos', 'cros')
+  ONC_PATH = os.path.join(pyauto.PyUITest.ChromeOSDataDir(), 'network')
 
   def setUp(self):
     self.CleanupFlimflamDirsOnChromeOS()
     policy_base.PolicyTestBase.setUp(self)
     self.LoginWithTestAccount()
 
   def _ReadONCFileAndSet(self, filename):
     """Reads the specified ONC file and sends it as a policy.
 
     Inputs:
@@ skipping 37 matching lines @@
     # Error if wifi_expect_temp is not empty.
     self.assertFalse(wifi_expect_temp, 'The following networks '
                      'were not remembered: %s' % self.pformat(wifi_expect_temp))
 
   def testONCAddOpenWifi(self):
     """Test adding open network."""
     wifi_networks = {
         'ssid-none': '',
     }
 
-    self._ReadONCFileAndSet('network-wifi-none.onc')
+    self._ReadONCFileAndSet('toplevel_wifi_open.onc')
     self._VerifyRememberedWifiNetworks(wifi_networks)
 
   def testONCAddWEPWifi(self):
     """Test adding WEP network."""
     wifi_networks = {
         'ssid-wep': 'WEP',
     }
 
-    self._ReadONCFileAndSet('network-wifi-wep.onc')
+    self._ReadONCFileAndSet('toplevel_wifi_wep_proxy.onc')
     self._VerifyRememberedWifiNetworks(wifi_networks)
 
   def testONCAddPSKWifi(self):
     """Test adding WPA network."""
     wifi_networks = {
         'ssid-wpa': 'WPA',
     }
-    self._ReadONCFileAndSet('network-wifi-wpa.onc')
+    self._ReadONCFileAndSet('toplevel_wifi_wpa_psk.onc')
     self._VerifyRememberedWifiNetworks(wifi_networks)
 
   def testAddBacktoBackONC(self):
     """Test adding three different ONC files one after the other."""
     test_dict = {
-      'network-wifi-none.onc': { 'ssid-none': '' },
-      'network-wifi-wep.onc': { 'ssid-wep': 'WEP' },
-      'network-wifi-wpa.onc': { 'ssid-wpa': 'WPA' },
+      'toplevel_wifi_open.onc': { 'ssid-none': '' },
+      'toplevel_wifi_wep_proxy.onc': { 'ssid-wep': 'WEP' },
+      'toplevel_wifi_wpa_psk.onc': { 'ssid-wpa': 'WPA' },
     }
 
     for onc, wifi_networks in test_dict.iteritems():
       self._ReadONCFileAndSet(onc)
       self._VerifyRememberedWifiNetworks(wifi_networks)
 
   def testAddBacktoBackONC2(self):
     """Test adding three different ONC files one after the other.
 
     Due to inconsistent behaviors as addressed in crosbug.com/27862
     this test does not perform a network scan/verification between
     the setting of policies.
     """
 
     wifi_networks = {
       'ssid-wpa': 'WPA',
     }
 
-    self._ReadONCFileAndSet('network-wifi-none.onc')
-    self._ReadONCFileAndSet('network-wifi-wep.onc')
-    self._ReadONCFileAndSet('network-wifi-wpa.onc')
+    self._ReadONCFileAndSet('toplevel_wifi_open.onc')
+    self._ReadONCFileAndSet('toplevel_wifi_wep_proxy.onc')
+    self._ReadONCFileAndSet('toplevel_wifi_wpa_psk.onc')
 
     # Verify that only the most recent onc is updated.
     self._VerifyRememberedWifiNetworks(wifi_networks)
 
   def testAddONCWithUnknownFields(self):
     """Test adding an ONC file with unknown fields."""
     wifi_networks = {
         'ssid-none': '',
         'ssid-wpa': 'WPA'
     }
 
-    self._ReadONCFileAndSet('network-multiple-unknown.onc')
+    self._ReadONCFileAndSet('toplevel_with_unknown_fields.onc')
     self._VerifyRememberedWifiNetworks(wifi_networks)
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()