diff --git a/tests/msodde_doc/__init__.py b/tests/msodde/__init__.py index e69de29..e69de29 100644 --- a/tests/msodde_doc/__init__.py +++ b/tests/msodde/__init__.py diff --git a/tests/msodde_doc/test_basic.py b/tests/msodde/test_basic.py index 33da7dd..dfc44ca 100644 --- a/tests/msodde_doc/test_basic.py +++ b/tests/msodde/test_basic.py @@ -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') diff --git a/tests/msodde_docx/test_blacklist.py b/tests/msodde/test_blacklist.py index babea81..babea81 100644 --- a/tests/msodde_docx/test_blacklist.py +++ b/tests/msodde/test_blacklist.py diff --git a/tests/msodde_docx/__init__.py b/tests/msodde_docx/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/tests/msodde_docx/__init__.py +++ /dev/null diff --git a/tests/test-data/msodde-doc/dde-test-from-office2003.doc b/tests/test-data/msodde/dde-test-from-office2003.doc index da5562c..da5562c 100644 --- a/tests/test-data/msodde-doc/dde-test-from-office2003.doc +++ b/tests/test-data/msodde/dde-test-from-office2003.doc diff --git a/tests/test-data/msodde-doc/dde-test-from-office2013-utf_16le-korean.doc b/tests/test-data/msodde/dde-test-from-office2013-utf_16le-korean.doc index 6d0bec8..6d0bec8 100644 --- a/tests/test-data/msodde-doc/dde-test-from-office2013-utf_16le-korean.doc +++ b/tests/test-data/msodde/dde-test-from-office2013-utf_16le-korean.doc diff --git a/tests/test-data/msodde-doc/dde-test-from-office2016.doc b/tests/test-data/msodde/dde-test-from-office2016.doc index 563de19..563de19 100644 --- a/tests/test-data/msodde-doc/dde-test-from-office2016.doc +++ b/tests/test-data/msodde/dde-test-from-office2016.doc diff --git a/tests/test-data/msodde-doc/dde-test.docm b/tests/test-data/msodde/dde-test.docm index ee5362a..ee5362a 100644 --- a/tests/test-data/msodde-doc/dde-test.docm +++ b/tests/test-data/msodde/dde-test.docm diff --git a/tests/test-data/msodde-doc/dde-test.docx b/tests/test-data/msodde/dde-test.docx index 5fba6b2..5fba6b2 100644 --- a/tests/test-data/msodde-doc/dde-test.docx +++ b/tests/test-data/msodde/dde-test.docx diff --git a/tests/test-data/msodde-doc/harmless-clean-2003.xml b/tests/test-data/msodde/harmless-clean-2003.xml index 477069f..477069f 100644 --- a/tests/test-data/msodde-doc/harmless-clean-2003.xml +++ b/tests/test-data/msodde/harmless-clean-2003.xml diff --git a/tests/test-data/msodde-doc/harmless-clean.doc b/tests/test-data/msodde/harmless-clean.doc index 38fcf72..38fcf72 100644 --- a/tests/test-data/msodde-doc/harmless-clean.doc +++ b/tests/test-data/msodde/harmless-clean.doc diff --git a/tests/test-data/msodde-doc/harmless-clean.docm b/tests/test-data/msodde/harmless-clean.docm index f234cae..f234cae 100644 --- a/tests/test-data/msodde-doc/harmless-clean.docm +++ b/tests/test-data/msodde/harmless-clean.docm diff --git a/tests/test-data/msodde-doc/harmless-clean.docx b/tests/test-data/msodde/harmless-clean.docx index 59099f3..59099f3 100644 --- a/tests/test-data/msodde-doc/harmless-clean.docx +++ b/tests/test-data/msodde/harmless-clean.docx diff --git a/tests/test-data/msodde-doc/harmless-clean.xml b/tests/test-data/msodde/harmless-clean.xml index cd1e53c..cd1e53c 100644 --- a/tests/test-data/msodde-doc/harmless-clean.xml +++ b/tests/test-data/msodde/harmless-clean.xml