Browse Source

[2298] modify check_XML_URL_PATH() in test_do_GET()

pass a single itentifier of each item to the check_XML_URL_PATH()
method as a URI.
Naoki Kambe 12 years ago
parent
commit
5d84f9da82
1 changed files with 7 additions and 14 deletions
  1. 7 14
      src/bin/stats/tests/b10-stats-httpd_test.py

+ 7 - 14
src/bin/stats/tests/b10-stats-httpd_test.py

@@ -210,12 +210,9 @@ class TestHttpHandler(unittest.TestCase):
         self.assertEqual(len(self.stats_httpd.httpd), 1)
         self.assertEqual(len(self.stats_httpd.httpd), 1)
         self.assertEqual((self.address, self.port), self.stats_httpd.http_addrs[0])
         self.assertEqual((self.address, self.port), self.stats_httpd.http_addrs[0])
 
 
-        def check_XML_URL_PATH(mod=None, item=None):
-            url_path = stats_httpd.XML_URL_PATH
-            if mod is not None:
-                url_path = url_path + '/' + mod
-                if item is not None:
-                    url_path = url_path + '/' + item
+        def check_XML_URL_PATH(path=''):
+            url_path = '%s/%s' % (stats_httpd.XML_URL_PATH, path)
+            url_path = urllib.parse.quote(url_path)
             self.client.putrequest('GET', url_path)
             self.client.putrequest('GET', url_path)
             self.client.endheaders()
             self.client.endheaders()
             response = self.client.getresponse()
             response = self.client.getresponse()
@@ -248,14 +245,10 @@ class TestHttpHandler(unittest.TestCase):
                 else:
                 else:
                     self.assertEqual(attr['value'], value)
                     self.assertEqual(attr['value'], value)
 
 
-         # URL is '/bind10/statistics/xml'
-        check_XML_URL_PATH(mod=None, item=None)
-        for m in DUMMY_DATA:
-            # URL is '/bind10/statistics/xml/Module'
-            check_XML_URL_PATH(mod=m)
-            for k in DUMMY_DATA[m].keys():
-                # URL is '/bind10/statistics/xml/Module/Item'
-                check_XML_URL_PATH(mod=m, item=k)
+        # URL is '/bind10/statistics/xml'
+        check_XML_URL_PATH()
+        for path in stats_httpd.item_name_list(DUMMY_DATA, ''):
+            check_XML_URL_PATH(path)
 
 
         def check_XSD_URL_PATH():
         def check_XSD_URL_PATH():
             url_path = stats_httpd.XSD_URL_PATH
             url_path = stats_httpd.XSD_URL_PATH