Update - Regex NOmeacao efetiva

- Changed rule_for_inst regex in efetivos_nome - Fixed test_extract_polished_acts
UnB-KnEDLe · Nov 2, 2021 · 0a2074c · 0a2074c
1 parent 26f8d8c
commit 0a2074c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/dodfminer/extract/polished/acts/nomeacao.py b/dodfminer/extract/polished/acts/nomeacao.py
@@ -60,7 +60,7 @@ def _props_names(self):
 
     def _rule_for_inst(self):
         start = r"(NOMEAR\s)"
-        body = r"((?:[ao]s\scandidat[ao]s\sabaixo(?:([a-zA-Z_0-9,\s\/-\:\-\(\);](no?\.)?)*).|(?:[ao]\scandidat[oa]\sabaixo(?:[a-zA-Z_0-9,\s\/-\:\-\(\);]*)))(?:\s[a-zA-Z_\s]*(?:deficiencia|especiais):(?:\s[\sA-Zo]+,\s?\d{1,4}o?;?)+)?(?:\s)?(?:[\r\n\t\f\sa-zA-Z_\s]*classificacao:(?:\s[\sA-Zo]+,\s?\d{1,4}o?[,;]?)+)?)"
+        body = r"((?:[ao]s\scandidat[ao]s\sabaixo(?:([a-zA-Z_0-9,\s\/-\:\-\(\);](no?\.)?)*).|(?:[ao]\scandidat[oa]\sabaixo(?:([a-zA-Z_0-9,\s\/-\:\-\(\);](no?\.)?)*)))(?:\s[a-zA-Z_\s]*(?:deficiencia|especiais):(?:\s[\sA-Zo]+,\s?\d{1,4}o?;?)+)?(?:\s)?(?:[\r\n\t\f\sa-zA-Z_\s]*classificacao:(?:\s[\sA-Zo]+,\s?\d{1,4}o?[,;]?)+)?)"
         end = ""
         return start + body + end
 

diff --git a/tests/test_extract_polished_acts.py b/tests/test_extract_polished_acts.py
@@ -41,7 +41,7 @@ def test_retirement_prop_names(act_ret):
 
 def test_retirement_rule(act_ret):
     assert act_ret._rule_for_inst(
-    ) == r"(APOSENTAR|CONCEDER,\sAPOSENTADORIA|CONCEDER\sAPOSENTADORIA,?\s?)([\s\S]*?(?<!lei)\s(?:[0-9|\s]*" + \
+    ) == r"(APOSENTAR[^-]|CONCEDER,\sAPOSENTADORIA|CONCEDER\sAPOSENTADORIA,?\s?)([\s\S]*?(?<!lei)\s(?:[0-9|\s]*" + \
         r"?[.|-]\s?)+?[0-9|\s]*/\s?[0-9|\s]*-?\s?[0-9|\s]*[.|,])"
 
 
@@ -594,7 +594,7 @@ def test_nom_com_prop_names(act_nomcom):
 
 
 def test_nom_com_rule(act_nomcom):
-    assert act_nomcom._rule_for_inst() == r"(NOMEAR)([\s\S]*?)\.\s"
+    assert act_nomcom._rule_for_inst() == r"(NOMEAR)([\s\S]*?)((\.\s)|(?=(EXONERAR|NOMEAR)))"
 
 
 def test_nom_com_prop_rules_names(act_nomcom):
@@ -680,8 +680,8 @@ def test_nom_efet_prop_names(act_nom_efet):
 
 def test_nom_efet_rule(act_nom_efet):
     assert act_nom_efet._rule_for_inst(
-    ) == r"(NOMEAR\s)((?:[ao]s\scandidat[ao]s\sabaixo(?:[a-zA-Z_0-9,\s\/-\:\-\(\);]*).|" + \
-        r"(?:[ao]\scandidat[oa]\sabaixo(?:[a-zA-Z_0-9,\s\/-\:\-\(\)]*)))(?:\s[a-zA-Z_\s]*(?:deficiencia|especiais):(?:\s[\sA-Zo]+" + \
+    ) == r"(NOMEAR\s)((?:[ao]s\scandidat[ao]s\sabaixo(?:([a-zA-Z_0-9,\s\/-\:\-\(\);](no?\.)?)*).|" + \
+        r"(?:[ao]\scandidat[oa]\sabaixo(?:([a-zA-Z_0-9,\s\/-\:\-\(\);](no?\.)?)*)))(?:\s[a-zA-Z_\s]*(?:deficiencia|especiais):(?:\s[\sA-Zo]+" + \
         r",\s?\d{1,4}o?;?)+)?(?:\s)?(?:[\r\n\t\f\sa-zA-Z_\s]*classificacao:(?:\s[\sA-Zo]+,\s?\d{1,4}o?[,;]?)+)?)"