code refactor the test code #22

pyexcel-webwares · Jun 22, 2017 · 8a5ba38 · 8a5ba38
1 parent a68a339
commit 8a5ba38
Showing 1 changed file with 16 additions and 24 deletions.
diff --git a/tests/test_upload_n_download_excel.py b/tests/test_upload_n_download_excel.py
@@ -76,37 +76,29 @@ def test_no_file_type(self):
         eq_(response.status_code, 400)
 
     def test_override_file_name(self):
-        for file_type in FILE_TYPE_MIME_TABLE.keys():
-            file_name = 'override_file_name'
-            url_encoded_file_name = quote(file_name)
-            response = self.app.post('/file_name/%s/%s' % (file_type,
-                                                           file_name))
-            eq_(response.content_type, FILE_TYPE_MIME_TABLE[file_type])
-            eq_(response.headers.get("Content-Disposition", None),
-                ("attachment; filename=%s.%s;filename*=utf-8''%s.%s"
-                 % (url_encoded_file_name, file_type,
-                    url_encoded_file_name, file_type)))
+        file_name = 'override_file_name'
+        url_encoded_file_name = quote(file_name)
+        self._download_and_verify_file_name(
+            file_name, url_encoded_file_name)
 
     def test_unicode_file_name(self):
-        for file_type in FILE_TYPE_MIME_TABLE.keys():
-            file_name = u'中文文件名'
-            url_encoded_file_name = quote(file_name.encode('utf-8'))
-            response = self.app.post('/file_name/%s/%s' % (file_type,
-                                                           file_name))
-            eq_(response.content_type, FILE_TYPE_MIME_TABLE[file_type])
-            eq_(response.headers.get("Content-Disposition", None),
-                ("attachment; filename=%s.%s;filename*=utf-8''%s.%s"
-                 % (url_encoded_file_name, file_type,
-                    url_encoded_file_name, file_type)))
+        file_name = u'中文文件名'
+        url_encoded_file_name = quote(file_name.encode('utf-8'))
+        self._download_and_verify_file_name(
+            file_name, url_encoded_file_name)
 
     def test_utf8_file_name(self):
+        file_name = '中文文件名'
+        url_encoded_file_name = quote(file_name)
+        self._download_and_verify_file_name(
+            file_name, url_encoded_file_name)
+
+    def _download_and_verify_file_name(self, file_name, expected_file_name):
         for file_type in FILE_TYPE_MIME_TABLE.keys():
-            file_name = '中文文件名'
-            url_encoded_file_name = quote(file_name)
             response = self.app.post('/file_name/%s/%s' % (file_type,
                                                            file_name))
             eq_(response.content_type, FILE_TYPE_MIME_TABLE[file_type])
             eq_(response.headers.get("Content-Disposition", None),
                 ("attachment; filename=%s.%s;filename*=utf-8''%s.%s"
-                 % (url_encoded_file_name, file_type,
-                    url_encoded_file_name, file_type)))
+                 % (expected_file_name, file_type,
+                    expected_file_name, file_type)))