unittest: remove file type from test module names and data dirs

Will add excel test code and samples later, no need to have separate folders for different file types.

unittest: remove file type from test module names and data dirs
Will add excel test code and samples later, no need to have separate folders for different file types.
Christian Herdtweck · Philippe Lagadec
1 parent 5a6b2e00
Showing 14 changed files with 7 additions and 7 deletions
tests/msodde_doc/__init__.py → tests/msodde/__init__.py
tests/msodde_doc/test_basic.py → tests/msodde/test_basic.py
tests/msodde_docx/test_blacklist.py → tests/msodde/test_blacklist.py
tests/msodde_docx/__init__.py
tests/test-data/msodde-doc/dde-test-from-office2003.doc → tests/test-data/msodde/dde-test-from-office2003.doc
tests/test-data/msodde-doc/dde-test-from-office2013-utf_16le-korean.doc → tests/test-data/msodde/dde-test-from-office2013-utf_16le-korean.doc
tests/test-data/msodde-doc/dde-test-from-office2016.doc → tests/test-data/msodde/dde-test-from-office2016.doc
tests/test-data/msodde-doc/dde-test.docm → tests/test-data/msodde/dde-test.docm
tests/test-data/msodde-doc/dde-test.docx → tests/test-data/msodde/dde-test.docx
tests/test-data/msodde-doc/harmless-clean-2003.xml → tests/test-data/msodde/harmless-clean-2003.xml
tests/test-data/msodde-doc/harmless-clean.doc → tests/test-data/msodde/harmless-clean.doc
tests/test-data/msodde-doc/harmless-clean.docm → tests/test-data/msodde/harmless-clean.docm
tests/test-data/msodde-doc/harmless-clean.docx → tests/test-data/msodde/harmless-clean.docx
tests/test-data/msodde-doc/harmless-clean.xml → tests/test-data/msodde/harmless-clean.xml
@@ -22,25 +22,25 @@ class TestReturnCode(unittest.TestCase):
         """ check that a valid doc file leads to 0 exit status """
         for filename in ('dde-test-from-office2003', 'dde-test-from-office2016',
                          'harmless-clean', 'dde-test-from-office2013-utf_16le-korean'):
-            self.do_test_validity(join(BASE_DIR, 'msodde-doc',
+            self.do_test_validity(join(BASE_DIR, 'msodde',
                                        filename + '.doc'))
  
     def test_valid_docx(self):
         """ check that a valid docx file leads to 0 exit status """
         for filename in 'dde-test', 'harmless-clean':
-            self.do_test_validity(join(BASE_DIR, 'msodde-doc',
+            self.do_test_validity(join(BASE_DIR, 'msodde',
                                        filename + '.docx'))
  
     def test_valid_docm(self):
         """ check that a valid docm file leads to 0 exit status """
         for filename in 'dde-test', 'harmless-clean':
-            self.do_test_validity(join(BASE_DIR, 'msodde-doc',
+            self.do_test_validity(join(BASE_DIR, 'msodde',
                                        filename + '.docm'))
  
     def test_invalid_other(self):
         """ check that xml do not work yet """
         for extn in '-2003.xml', '.xml':
-            self.do_test_validity(join(BASE_DIR, 'msodde-doc',
+            self.do_test_validity(join(BASE_DIR, 'msodde',
                                        'harmless-clean' + extn), True)
  
     def test_invalid_none(self):
@@ -96,7 +96,7 @@ class TestDdeInDoc(unittest.TestCase):
     def test_with_dde(self):
         """ check that dde links appear on stdout """
         with OutputCapture() as capturer:
-            msodde.main([join(BASE_DIR, 'msodde-doc',
+            msodde.main([join(BASE_DIR, 'msodde',
                               'dde-test-from-office2003.doc')])
         self.assertNotEqual(len(self.get_dde_from_output(capturer)), 0,
                             msg='Found no dde links in output for doc file')
@@ -104,14 +104,14 @@ class TestDdeInDoc(unittest.TestCase):
     def test_no_dde(self):
         """ check that no dde links appear on stdout """
         with OutputCapture() as capturer:
-            msodde.main([join(BASE_DIR, 'msodde-doc', 'harmless-clean.doc')])
+            msodde.main([join(BASE_DIR, 'msodde', 'harmless-clean.doc')])
         self.assertEqual(len(self.get_dde_from_output(capturer)), 0,
                          msg='Found dde links in output for doc file')
  
     def test_with_dde_utf16le(self):
         """ check that dde links appear on stdout """
         with OutputCapture() as capturer:
-            msodde.main([join(BASE_DIR, 'msodde-doc',
+            msodde.main([join(BASE_DIR, 'msodde',
                               'dde-test-from-office2013-utf_16le-korean.doc')])
         self.assertNotEqual(len(self.get_dde_from_output(capturer)), 0,
                             msg='Found no dde links in output for doc file')