diff --git a/src/countdown/__main__.py b/src/countdown/__main__.py index f30de15..a3fcb29 100644 --- a/src/countdown/__main__.py +++ b/src/countdown/__main__.py @@ -17,11 +17,11 @@ r""" ^ (?: # Optional minutes - ( \d{1,2} ) # D or DD + ( \d+ ) # one or more digits m # "m" )? (?: # Optional seconds - ( \d{1,2} ) # D or DD + ( \d+ ) # one or more digits s # "s" )? $ diff --git a/tests/test_main.py b/tests/test_main.py index 593478f..abc5db3 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -63,6 +63,10 @@ def test_duration_10_minutes(): assert __main__.duration("10m") == 600 +def test_duration_150_minutes(): + assert __main__.duration("150m") == 9000 + + def test_duration_25_minutes(): assert __main__.duration("25m") == 1500 @@ -120,6 +124,21 @@ def test_get_number_lines_45_minutes(): ) +def test_get_number_lines_101_minutes(): + assert join_lines(__main__.get_number_lines(6060)) == indent( + dedent( + """ + ██ ██████ ██ ██████ ██████ + ███ ██ ██ ███ ██ ██ ██ ██ ██ + ██ ██ ██ ██ ██ ██ ██ ██ + ██ ██ ██ ██ ██ ██ ██ ██ ██ + ██ ██████ ██ ██████ ██████ + """ + ).strip("\n"), + " ", + ) + + def test_get_number_lines_17_minutes_and_four_seconds(): assert join_lines(__main__.get_number_lines(1024)) == indent( dedent(