fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2025-12-25 19:04:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use re to split date string. Remove separator parameter.

Browse Source
This commit is contained in:
Bob Swift
2021-07-23 09:48:02 -06:00
parent e52346af90
commit 816fcd8022
2 changed files with 51 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
test/test_script.py
View File

@@ -1647,136 +1647,129 @@ class ScriptParserTest(PicardTestCase):
context = Metadata()
context["foo"] = "07.21.2021"
context["bar"] = "mdy"
context["baz"] = "."
# Test with default values
self.assertScriptResultEquals("$year(2021 07 21)", "2021", context)
self.assertScriptResultEquals("$year(2021.07.21)", "2021", context)
self.assertScriptResultEquals("$year(2021-07-21)", "2021", context)
self.assertScriptResultEquals("$year(21-07-21)", "21", context)
# Test with overrides specified
self.assertScriptResultEquals("$year(%foo%,%bar%,%baz%)", "2021", context)
self.assertScriptResultEquals("$year(%foo%,%bar%)", "2021", context)
# Test with invalid overrides
self.assertScriptResultEquals("$year(2021-07-21,myd)", "2021", context)
self.assertScriptResultEquals("$year(2021-07-21,,.)", "2021-07-21", context)
self.assertScriptResultEquals("$year(2021-07-21,, )", "2021-07-21", context)
# Test missing elements
self.assertScriptResultEquals("$year(,)", "", context)
self.assertScriptResultEquals("$year(,,)", "", context)
self.assertScriptResultEquals("$year(07-21,mdy)", "", context)
self.assertScriptResultEquals("$year(21-07,dmy)", "", context)
# Tests with invalid number of arguments
areg = r"^\d+:\d+:\$year: Wrong number of arguments for \$year: Expected between 1 and 3, "
areg = r"^\d+:\d+:\$year: Wrong number of arguments for \$year: Expected between 1 and 2, "
with self.assertRaisesRegex(ScriptError, areg):
self.parser.eval("$year()")
with self.assertRaisesRegex(ScriptError, areg):
self.parser.eval("$year(2021-07-21,,,)")
self.parser.eval("$year(2021-07-21,,)")
def test_cmd_month(self):
context = Metadata()
context["foo"] = "07.21.2021"
context["bar"] = "mdy"
context["baz"] = "."
# Test with default values
self.assertScriptResultEquals("$month(2021 07 21)", "07", context)
self.assertScriptResultEquals("$month(2021.07.21)", "07", context)
self.assertScriptResultEquals("$month(2021-07-21)", "07", context)
self.assertScriptResultEquals("$month(2021-7-21)", "7", context)
# Test with overrides specified
self.assertScriptResultEquals("$month(%foo%,%bar%,%baz%)", "07", context)
self.assertScriptResultEquals("$month(%foo%,%bar%)", "07", context)
# Test with invalid overrides
self.assertScriptResultEquals("$month(2021-07-21,myd)", "07", context)
self.assertScriptResultEquals("$month(2021-07-21,,.)", "", context)
self.assertScriptResultEquals("$month(2021-07-21,mdy,.)", "2021-07-21", context)
self.assertScriptResultEquals("$month(2021-07-21,, )", "", context)
# Test missing elements
self.assertScriptResultEquals("$month(,)", "", context)
self.assertScriptResultEquals("$month(,,)", "", context)
self.assertScriptResultEquals("$month(-21-2021,mdy)", "", context)
self.assertScriptResultEquals("$month(21--2021,dmy)", "", context)
# self.assertScriptResultEquals("$month(21--2021,dmy)", "", context)
# Tests with invalid number of arguments
areg = r"^\d+:\d+:\$month: Wrong number of arguments for \$month: Expected between 1 and 3, "
areg = r"^\d+:\d+:\$month: Wrong number of arguments for \$month: Expected between 1 and 2, "
with self.assertRaisesRegex(ScriptError, areg):
self.parser.eval("$month()")
with self.assertRaisesRegex(ScriptError, areg):
self.parser.eval("$month(2021-07-21,,,)")
self.parser.eval("$month(2021-07-21,,)")
def test_cmd_day(self):
context = Metadata()
context["foo"] = "07.21.2021"
context["bar"] = "mdy"
context["baz"] = "."
# Test with default values
self.assertScriptResultEquals("$day(2021 07 21)", "21", context)
self.assertScriptResultEquals("$day(2021.07.21)", "21", context)
self.assertScriptResultEquals("$day(2021-07-21)", "21", context)
self.assertScriptResultEquals("$day(2021-07-2)", "2", context)
# Test with overrides specified
self.assertScriptResultEquals("$day(%foo%,%bar%,%baz%)", "21", context)
self.assertScriptResultEquals("$day(%foo%,%bar%)", "21", context)
# Test with invalid overrides
self.assertScriptResultEquals("$day(2021-07-21,myd)", "21", context)
self.assertScriptResultEquals("$day(2021-07-21,,.)", "", context)
self.assertScriptResultEquals("$day(2021-07-21,dmy,.)", "2021-07-21", context)
self.assertScriptResultEquals("$day(2021-07-21,, )", "", context)
# Test missing elements
self.assertScriptResultEquals("$day(,)", "", context)
self.assertScriptResultEquals("$day(,,)", "", context)
self.assertScriptResultEquals("$day(-07-2021,dmy)", "", context)
self.assertScriptResultEquals("$day(07--2021,mdy)", "", context)
# self.assertScriptResultEquals("$day(07--2021,mdy)", "", context)
# Tests with invalid number of arguments
areg = r"^\d+:\d+:\$day: Wrong number of arguments for \$day: Expected between 1 and 3, "
areg = r"^\d+:\d+:\$day: Wrong number of arguments for \$day: Expected between 1 and 2, "
with self.assertRaisesRegex(ScriptError, areg):
self.parser.eval("$day()")
with self.assertRaisesRegex(ScriptError, areg):
self.parser.eval("$day(2021-07-21,,,)")
self.parser.eval("$day(2021-07-21,,)")
def test_cmd_dateformat(self):
context = Metadata()
context["foo"] = "07.21.2021"
context["bar"] = "mdy"
context["baz"] = "."
context["format"] = "%Y.%m.%d"
# Test with default values
self.assertScriptResultEquals("$dateformat(2021 07 21)", "2021-07-21", context)
self.assertScriptResultEquals("$dateformat(2021.07.21)", "2021-07-21", context)
self.assertScriptResultEquals("$dateformat(2021-07-21)", "2021-07-21", context)
self.assertScriptResultEquals("$dateformat(2021-7-21)", "2021-07-21", context)
# Test with overrides specified
self.assertScriptResultEquals("$dateformat(%foo%,%format%,%bar%,%baz%)", "2021.07.21", context)
self.assertScriptResultEquals("$dateformat(%foo%,%format%,%bar%)", "2021.07.21", context)
# Test with invalid overrides
self.assertScriptResultEquals("$dateformat(2021-07-21,,myd)", "2021-07-21", context)
areg = r"^\d+:\d+:\$dateformat: Invalid date"
# with self.assertRaisesRegex(ScriptError, areg):
# self.parser.eval("$dateformat(2021-07-21,,,.)")
with self.assertRaisesRegex(ScriptError, areg):
self.parser.eval("$dateformat(2021-07-21,,,.)")
self.parser.eval("$dateformat(2021-07-21,,dmy)")
with self.assertRaisesRegex(ScriptError, areg):
self.parser.eval("$dateformat(2021-07-21,,dmy,.)")
with self.assertRaisesRegex(ScriptError, areg):
self.parser.eval("$dateformat(2021-07-21,,, )")
self.parser.eval("$dateformat(2021-07-21,,mdy)")
with self.assertRaisesRegex(ScriptError, areg):
self.parser.eval("$dateformat(2021-July-21)")
with self.assertRaisesRegex(ScriptError, areg):
self.parser.eval("$dateformat(2021)")
with self.assertRaisesRegex(ScriptError, areg):
self.parser.eval("$dateformat(2021-07)")
with self.assertRaisesRegex(ScriptError, areg):
self.parser.eval("$dateformat(2021--21)")
# with self.assertRaisesRegex(ScriptError, areg):
# self.parser.eval("$dateformat(2021--21)")
# Test missing elements
with self.assertRaisesRegex(ScriptError, areg):
self.parser.eval("$dateformat(,)")
# Tests with invalid number of arguments
areg = r"^\d+:\d+:\$dateformat: Wrong number of arguments for \$dateformat: Expected between 1 and 4, "
areg = r"^\d+:\d+:\$dateformat: Wrong number of arguments for \$dateformat: Expected between 1 and 3, "
with self.assertRaisesRegex(ScriptError, areg):
self.parser.eval("$dateformat()")
with self.assertRaisesRegex(ScriptError, areg):
self.parser.eval("$dateformat(2021-07-21,,,,)")
self.parser.eval("$dateformat(2021-07-21,,,)")