diff options
| author | Charles Cabergs <me@cacharle.xyz> | 2020-10-08 17:44:00 +0200 |
|---|---|---|
| committer | Charles Cabergs <me@cacharle.xyz> | 2020-10-08 17:44:00 +0200 |
| commit | 72954f36bfcad29cbb4bb324763d4c03b9fa4601 (patch) | |
| tree | 4647b3916e7285cc39898ce508eddf6b15cea399 | |
| parent | 93ead396473526e5f4849ad2f4194b8cc6c9ce45 (diff) | |
| download | minishell_test-72954f36bfcad29cbb4bb324763d4c03b9fa4601.tar.gz minishell_test-72954f36bfcad29cbb4bb324763d4c03b9fa4601.tar.bz2 minishell_test-72954f36bfcad29cbb4bb324763d4c03b9fa4601.zip | |
Deleted duplicated tests, Added error_eof_to_expected_token hook
| -rw-r--r-- | src/hooks.py | 9 | ||||
| -rw-r--r-- | src/suites/flow.py | 145 |
2 files changed, 67 insertions, 87 deletions
diff --git a/src/hooks.py b/src/hooks.py index 5ec2dde..58cc7a0 100644 --- a/src/hooks.py +++ b/src/hooks.py @@ -6,7 +6,7 @@ # By: charles <me@cacharle.xyz> +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2020/09/11 16:10:20 by charles #+# #+# # -# Updated: 2020/10/08 11:43:54 by cacharle ### ########.fr # +# Updated: 2020/10/08 17:32:12 by cacharle ### ########.fr # # # # ############################################################################ # @@ -99,3 +99,10 @@ def delete_escape(output): return output.replace("\\", "") else: return output + + +def error_eof_to_expected_token(output): + return output.replace( + "-c: line 1: syntax error: unexpected end of file", + "syntax error expected token" + ) diff --git a/src/suites/flow.py b/src/suites/flow.py index eac9459..a62cd9d 100644 --- a/src/suites/flow.py +++ b/src/suites/flow.py @@ -6,13 +6,13 @@ # By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2020/07/15 18:24:52 by charles #+# #+# # -# Updated: 2020/10/08 16:45:19 by cacharle ### ########.fr # +# Updated: 2020/10/08 17:33:32 by cacharle ### ########.fr # # # # ############################################################################ # import config from suite import suite -from hooks import error_line0, platform_status, discard, replace_double_semi_colon +from hooks import error_line0, platform_status, discard, replace_double_semi_colon, error_eof_to_expected_token @suite() @@ -208,27 +208,23 @@ def suite_parenthesis(test): @suite() def suite_syntax_error(test): """ separator syntax error test """ - test("< |", hook=error_line0) - test("> |", hook=error_line0) - test(">> |", hook=error_line0) - test("< ;", hook=error_line0) - test("> ;", hook=error_line0) - test(">> ;", hook=error_line0) - test("; |", hook=error_line0) - test("; |", hook=error_line0) - test("; |", hook=error_line0) - test("; <", hook=error_line0) - test("; >", hook=error_line0) - test("; >>", hook=error_line0) - test("| ;", hook=error_line0) - test("| ;", hook=error_line0) - test("| ;", hook=error_line0) - test("| <", hook=error_line0) - test("| >", hook=error_line0) - test("| >>", hook=error_line0) - test("> a ;", hook=error_line0) - test("< a ;", hook=error_line0) - test(">> a ;", hook=error_line0) + test("< | a", hook=error_line0) + test("> | a", hook=error_line0) + test(">> | a", hook=error_line0) + test("< ; a", hook=error_line0) + test("> ; a", hook=error_line0) + test(">> ; a", hook=error_line0) + test("; | a", hook=error_line0) + test("; < a", hook=error_line0) + test("; > a", hook=error_line0) + test("; >> a", hook=error_line0) + test("| ; a", hook=error_line0) + test("| < a", hook=error_line0) + test("| > a", hook=error_line0) + test("| >> a", hook=error_line0) + test("> a ; a", hook=error_line0) + test("< a ; a", hook=error_line0) + test(">> a ; a", hook=error_line0) test(config.LOREM + " > >" + config.LOREM, hook=error_line0) test(config.LOREM + " < <" + config.LOREM, hook=error_line0) test(config.LOREM + " ; |" + config.LOREM, hook=error_line0) @@ -238,70 +234,47 @@ def suite_syntax_error(test): @suite(bonus=True) def suite_syntax_error_bonus(test): """ separator syntax error bonus test """ - test("< &&", hook=error_line0) - test("> &&", hook=error_line0) - test(">> &&", hook=error_line0) - test("< ||", hook=error_line0) - test("> ||", hook=error_line0) - test(">> ||", hook=error_line0) - test("< (", hook=error_line0) - test("> (", hook=error_line0) - test(">> (", hook=error_line0) - test("< )", hook=error_line0) - test("> )", hook=error_line0) - test(">> )", hook=error_line0) - test("&& <", hook=error_line0) - test("&& >", hook=error_line0) - test("&& >>", hook=error_line0) - test("&& ||", hook=error_line0) - test("&& ||", hook=error_line0) - test("&& ||", hook=error_line0) - test("&& (", hook=error_line0) - test("&& (", hook=error_line0) - test("&& (", hook=error_line0) - test("&& )", hook=error_line0) - test("&& )", hook=error_line0) - test("&& )", hook=error_line0) - test("|| <", hook=error_line0) - test("|| >", hook=error_line0) - test("|| >>", hook=error_line0) - test("|| &&", hook=error_line0) - test("|| &&", hook=error_line0) - test("|| &&", hook=error_line0) - test("|| (", hook=error_line0) - test("|| (", hook=error_line0) - test("|| (", hook=error_line0) - test("|| )", hook=error_line0) - test("|| )", hook=error_line0) - test("|| )", hook=error_line0) - test("( <", hook=error_line0) - test("( >", hook=error_line0) - test("( >>", hook=error_line0) - test("( &&", hook=error_line0) - test("( &&", hook=error_line0) - test("( &&", hook=error_line0) - test("( ||", hook=error_line0) - test("( ||", hook=error_line0) - test("( ||", hook=error_line0) - test("( )", hook=error_line0) - test("( )", hook=error_line0) - test("( )", hook=error_line0) - test(") <", hook=error_line0) - test(") >", hook=error_line0) - test(") >>", hook=error_line0) - test(") &&", hook=error_line0) - test(") &&", hook=error_line0) - test(") &&", hook=error_line0) - test(") ||", hook=error_line0) - test(") ||", hook=error_line0) - test(") ||", hook=error_line0) - test(") (", hook=error_line0) - test(") (", hook=error_line0) - test(") (", hook=error_line0) - test("()", hook=error_line0) - test("(", hook=[error_line0, lambda o: o.replace("-c: line 1: ", "")]) - test(")", hook=error_line0) + test("< && a", hook=error_line0) + test("> && a", hook=error_line0) + test(">> && a", hook=error_line0) + test("< || a", hook=error_line0) + test("> || a", hook=error_line0) + test(">> || a", hook=error_line0) + test("< ( a", hook=error_line0) + test("> ( a", hook=error_line0) + test(">> ( a", hook=error_line0) + test("< ) a", hook=error_line0) + test("> ) a", hook=error_line0) + test(">> ) a", hook=error_line0) + test("&& < a", hook=error_line0) + test("&& > a", hook=error_line0) + test("&& >> a", hook=error_line0) + test("&& || a", hook=error_line0) + test("&& ( a", hook=error_line0) + test("&& ) a", hook=error_line0) + test("|| < a", hook=error_line0) + test("|| > a", hook=error_line0) + test("|| >> a", hook=error_line0) + test("|| && a", hook=error_line0) + test("|| ( a", hook=error_line0) + test("|| ) a", hook=error_line0) + test("( < a", hook=[error_line0, error_eof_to_expected_token]) + test("( > a", hook=[error_line0, error_eof_to_expected_token]) + test("( >> a", hook=[error_line0, error_eof_to_expected_token]) + test(") < a", hook=error_line0) + test(") > a", hook=error_line0) + test(") >> a", hook=error_line0) + test("( && a", hook=error_line0) + test("( || a", hook=error_line0) + test("( ) a", hook=error_line0) + test(") && a", hook=error_line0) + test(") || a", hook=error_line0) + test(") ( a", hook=error_line0) + test("() a", hook=error_line0) + test("( a", hook=[error_line0, error_eof_to_expected_token]) + test(") a", hook=error_line0) test(config.LOREM + " && &&" + config.LOREM, hook=error_line0) test(config.LOREM + " || ||" + config.LOREM, hook=error_line0) test(config.LOREM + " ( (" + config.LOREM, hook=error_line0) test(config.LOREM + " ) )" + config.LOREM, hook=error_line0) + test("(); () ;() ;() ;() ;() ;() ;() ;() ;() ;a", hook=error_line0) |
