diff --git a/tests/modules/test_error_mngr.py b/tests/modules/test_error_mngr.py index 363df89..51a72e4 100644 --- a/tests/modules/test_error_mngr.py +++ b/tests/modules/test_error_mngr.py @@ -34,7 +34,7 @@ class TestLogging(TestCase): with self.assertLogs() as captured: with pytest.raises(SystemExit): error_mngr.log_exception(Exception(''), level="CRITICAL") - self.assertEqual(len(captured.records), 1) + self.assertEqual(len(captured.records), 2) def test_log_exception_with_message(self): for exception in all_non_blocking_exception_tests: @@ -51,16 +51,16 @@ class TestLogging(TestCase): def test_log_message(self): with self.assertLogs() as captured: error_mngr.log_message("test message", level="INFO") - self.assertEqual(len(captured.records), 1) - self.assertEqual(captured.records[0].levelname, "INFO") - self.assertEqual(captured.records[0].msg, "test message") + self.assertEqual(1, len(captured.records)) + self.assertEqual("INFO", captured.records[0].levelname) + self.assertEqual(" test message", captured.records[0].msg) def test_log_message_critical(self): with self.assertLogs() as captured: error_mngr.log_message("test message", level="CRITICAL") self.assertEqual(len(captured.records), 1) - self.assertEqual(captured.records[0].levelname, "CRITICAL") - self.assertEqual(captured.records[0].msg, "test message") + self.assertEqual("CRITICAL", captured.records[0].levelname) + self.assertEqual(" test message", captured.records[0].msg) def test_exception__str__(): diff --git a/tests/modules/test_export.py b/tests/modules/test_export.py index 6ad6ee7..8169237 100644 --- a/tests/modules/test_export.py +++ b/tests/modules/test_export.py @@ -44,7 +44,7 @@ def test_transform(export_type, export_subtype): Test the transform method """ em = export.ExportManager("test", "test") - re = em.transform(export.ExportRequest(export_type, export_subtype, "", { + re = em.transform(export.ExportRequest(export_type, export_subtype, "", { # noqa E741 "header_level": "1", "display_level": "1", "col_span": "1", @@ -69,7 +69,14 @@ def test_get_template_error(): def test_with_optionnals(): em = export.ExportManager("test", "test") - em(export.ExportRequest("structural_elements", "div", "boo")) + em(export.ExportRequest("structural_elements", "div", "boo")) # noqa E741 + + +@pytest.mark.xfail(reason="Not implemented") +def test_format_optionnals(): + from bootstraparse.modules import syntax # noqa E402 + export.format_optionals("") + assert False def test_return_values(): diff --git a/tests/modules/test_preparser.py b/tests/modules/test_preparser.py index d6130fe..caa9b2a 100644 --- a/tests/modules/test_preparser.py +++ b/tests/modules/test_preparser.py @@ -281,22 +281,19 @@ def test_get_all_lines(): """ Test the line reader """ - testfile = temp_name("index.bpr") + testfile = temp_name(os.path.join(_BASE_PATH_GIVEN, "index.bpr")) assert os.path.exists(testfile) pp = preparser.PreParser(testfile, env) assert_readlines_equals(pp.get_all_lines(), content_index.split("\n")) # To test we are getting the right file - pp.file_with_all_imports, temp = StringIO("12"), pp.file_with_all_imports - pp.do_imports() + pp.current_origin_for_read = StringIO("12") assert pp.get_all_lines() == ['12'] - pp.file_with_all_imports = temp # To test we are getting the right file - pp.file_with_all_replacements, temp = StringIO("123"), pp.file_with_all_replacements pp.do_replacements() + pp.current_origin_for_read = StringIO("123") assert pp.get_all_lines() == ["123"] - pp.file_with_all_replacements = temp assert pp.readlines() != pp.get_all_lines() @@ -304,19 +301,19 @@ def test_new_temporary_files(): """ Test the reset of the files """ - testfile = temp_name("index.bpr") + testfile = temp_name(os.path.join(_BASE_PATH_GIVEN, "index.bpr")) assert os.path.exists(testfile) pp = preparser.PreParser(testfile, env) pp.do_imports() pp.do_replacements() pp.new_temporary_files() assert_readlines_equals(pp.readlines(), content_index.split("\n")) - assert_readlines_equals(pp.get_all_lines(), content_index.split("\n")) + assert_readlines_equals(pp.get_all_lines(), final_content_index.split("\n")) assert pp.file_with_all_imports.read() == "" assert pp.file_with_all_replacements.read() == "" pp.do_imports() pp.do_replacements() - assert_readlines_equals(pp.get_all_lines(), final_content_index) + assert_readlines_equals(pp.get_all_lines(), final_content_index.split("\n")) def test_errors(): @@ -351,6 +348,7 @@ def test_rich_tree(): pp.rich_tree(force=False) +@pytest.mark.xfail(reason="Not implemented") def test_get_shortcut_from_config(): from_config = temp_name("test_get_shortcut_from_config.bpr") make_new_file(from_config, get_from_config) @@ -361,6 +359,7 @@ def test_get_shortcut_from_config(): assert pp.get_image_from_config("any_picture", None) == '' +@pytest.mark.xfail(reason="Not implemented") def test_replace(): replace_file = temp_name("test_preparse.bpr") make_new_file(replace_file, get_from_config)