From 70c071582734c8feaf2be95570a229b3f1106ac5 Mon Sep 17 00:00:00 2001 From: "Hasko, Vladimir" Date: Wed, 29 Mar 2023 11:22:35 +0000 Subject: [PATCH] adding rds fix for /* ... */ match which should also conver mrs previous Reviewed-by: gtema Co-authored-by: Hasko, Vladimir Co-committed-by: Hasko, Vladimir --- otc_doc_convertor/convertor.py | 3 +- .../tests/unit/test_convertor.py | 28 +++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/otc_doc_convertor/convertor.py b/otc_doc_convertor/convertor.py index 21aca83c..fdfa1520 100644 --- a/otc_doc_convertor/convertor.py +++ b/otc_doc_convertor/convertor.py @@ -403,7 +403,8 @@ class OTCDocConvertor: # MRS UMN contain: /:*?"<>|\\;&,'`!{}[]$%+ r"\s([^a-zA-Z0-9\s]{8,})", # MRS operation guide contain: /*+ MAPJOIN(join_table) \*/ - r"\s(/\*.*\*/)", + # RDS UMN contain: /*FORCE_MASTER*/ + r"(/\*.{5,}\*/)", # BMS API contain sequence in a dedicated paragraph r"^([^a-zA-Z0-9\s]{10,})$", # OBS special chars - "\$" "\\" etc diff --git a/otc_doc_convertor/tests/unit/test_convertor.py b/otc_doc_convertor/tests/unit/test_convertor.py index f87c30ab..094b6847 100644 --- a/otc_doc_convertor/tests/unit/test_convertor.py +++ b/otc_doc_convertor/tests/unit/test_convertor.py @@ -191,3 +191,31 @@ class TestConvertor(TestCase): str(res.find('p')), expected.strip(), ) + + def test_streamline_html_escape_14(self): + test_data= """ +
  • Use /*+ MAPJOIN(join_table) */.
  • + """ # noqa + expected = """ +
  • Use /*+ MAPJOIN(join_table) */.
  • + """ # noqa + soup = bs4.BeautifulSoup(test_data, 'lxml') + res = self.convertor.streamline_html(soup, "dummy") + self.assertEqual( + str(res.find('li')), + expected.strip(), + ) + + def test_streamline_html_escape_15(self): + test_data= """ +

    /*FORCE_MASTER*/: A SQL statement is routed to the primary DB instance.

    + """ # noqa + expected = """ +

    /*FORCE_MASTER*/: A SQL statement is routed to the primary DB instance.

    + """ # noqa + soup = bs4.BeautifulSoup(test_data, 'lxml') + res = self.convertor.streamline_html(soup, "dummy") + self.assertEqual( + str(res.find('p')), + expected.strip(), + )