grangier#188 - move image test case

tracyshen · Dec 31, 2014 · 26ba835 · 26ba835
1 parent 6009d44
commit 26ba835
Show file tree

Hide file tree

Showing 18 changed files with 24 additions and 5 deletions.
diff --git a/...ic_image/50850547cc7310bc53e30e802c6318f1 → ...ic_image/50850547cc7310bc53e30e802c6318f1 b/...ic_image/50850547cc7310bc53e30e802c6318f1 → ...ic_image/50850547cc7310bc53e30e802c6318f1
diff --git a/...es/test_basic_image/test_basic_image.html → ...es/test_basic_image/test_basic_image.html b/...es/test_basic_image/test_basic_image.html → ...es/test_basic_image/test_basic_image.html
diff --git a/...es/test_basic_image/test_basic_image.json → ...es/test_basic_image/test_basic_image.json b/...es/test_basic_image/test_basic_image.json → ...es/test_basic_image/test_basic_image.json
diff --git a/...css_class/test_known_image_css_class.html → ...css_class/test_known_image_css_class.html b/...css_class/test_known_image_css_class.html → ...css_class/test_known_image_css_class.html
diff --git a/...css_class/test_known_image_css_class.json → ...css_class/test_known_image_css_class.json b/...css_class/test_known_image_css_class.json → ...css_class/test_known_image_css_class.json
diff --git a/...image_css_id/test_known_image_css_id.html → ...image_css_id/test_known_image_css_id.html b/...image_css_id/test_known_image_css_id.html → ...image_css_id/test_known_image_css_id.html
diff --git a/...image_css_id/test_known_image_css_id.json → ...image_css_id/test_known_image_css_id.json b/...image_css_id/test_known_image_css_id.json → ...image_css_id/test_known_image_css_id.json
diff --git a/...ss/test_known_image_css_parent_class.html → ...ss/test_known_image_css_parent_class.html b/...ss/test_known_image_css_parent_class.html → ...ss/test_known_image_css_parent_class.html
diff --git a/...ss/test_known_image_css_parent_class.json → ...ss/test_known_image_css_parent_class.json b/...ss/test_known_image_css_parent_class.json → ...ss/test_known_image_css_parent_class.json
diff --git a/...nt_id/test_known_image_css_parent_id.html → ...nt_id/test_known_image_css_parent_id.html b/...nt_id/test_known_image_css_parent_id.html → ...nt_id/test_known_image_css_parent_id.html
diff --git a/...nt_id/test_known_image_css_parent_id.json → ...nt_id/test_known_image_css_parent_id.json b/...nt_id/test_known_image_css_parent_id.json → ...nt_id/test_known_image_css_parent_id.json
diff --git a/...empty_src/test_known_image_empty_src.html → ...empty_src/test_known_image_empty_src.html b/...empty_src/test_known_image_empty_src.html → ...empty_src/test_known_image_empty_src.html
diff --git a/...empty_src/test_known_image_empty_src.json → ...empty_src/test_known_image_empty_src.json b/...empty_src/test_known_image_empty_src.json → ...empty_src/test_known_image_empty_src.json
diff --git a/..._parent/test_known_image_name_parent.html → ..._parent/test_known_image_name_parent.html b/..._parent/test_known_image_name_parent.html → ..._parent/test_known_image_name_parent.html
diff --git a/..._parent/test_known_image_name_parent.json → ..._parent/test_known_image_name_parent.json b/..._parent/test_known_image_name_parent.json → ..._parent/test_known_image_name_parent.json
diff --git a/...est_opengraph_tag/test_opengraph_tag.html → ...est_opengraph_tag/test_opengraph_tag.html b/...est_opengraph_tag/test_opengraph_tag.html → ...est_opengraph_tag/test_opengraph_tag.html
diff --git a/...est_opengraph_tag/test_opengraph_tag.json → ...est_opengraph_tag/test_opengraph_tag.json b/...est_opengraph_tag/test_opengraph_tag.json → ...est_opengraph_tag/test_opengraph_tag.json
diff --git a/tests/extractors/images.py b/tests/extractors/images.py
@@ -43,7 +43,13 @@ class MockResponseImage(MockResponse):
     def image_content(self, req):
         md5_hash = hashlib.md5(req.get_full_url()).hexdigest()
         current_test = self.cls._get_current_testname()
-        path = os.path.join(CURRENT_PATH, "data", "images", current_test, md5_hash)
+        path = os.path.join(
+                os.path.dirname(CURRENT_PATH),
+                "data",
+                "extractors",
+                "images",
+                current_test,
+                md5_hash)
         path = os.path.abspath(path)
         f = open(path, 'rb')
         content = f.read()
@@ -52,7 +58,13 @@ def image_content(self, req):
 
     def html_content(self, req):
         current_test = self.cls._get_current_testname()
-        path = os.path.join(CURRENT_PATH, "data", "images", current_test, "%s.html" % current_test)
+        path = os.path.join(
+                os.path.dirname(CURRENT_PATH),
+                "data",
+                "extractors",
+                "images",
+                current_test,
+                "%s.html" % current_test)
         path = os.path.abspath(path)
         return FileHelper.loadResourceFile(path)
 
@@ -72,8 +84,15 @@ def loadData(self):
         """\
 
         """
-        suite, module, cls, func = self.id().split('.')
-        path = os.path.join(CURRENT_PATH, "data", module, func, "%s.json" % func)
+        test, suite, module, cls, func = self.id().split('.')
+        path = os.path.join(
+                os.path.dirname(CURRENT_PATH),
+                "data",
+                suite,
+                module,
+                func,
+                "%s.json" % func)
+
         path = os.path.abspath(path)
         content = FileHelper.loadResourceFile(path)
         self.data = json.loads(content)
@@ -158,7 +177,7 @@ def test_opengraph_tag(self):
 class ImageUtilsTests(unittest.TestCase):
 
     def setUp(self):
-        self.path = 'tests/data/images/test_basic_image/50850547cc7310bc53e30e802c6318f1'
+        self.path = 'tests/data/extractors/images/test_basic_image/50850547cc7310bc53e30e802c6318f1'
         self.expected_results = {
             'width': 476,
             'height': 317,