self.assertEqual(node.budget_excluding_subtasks, Money(cents=0))
self.assertEqual(node.budget_including_subtasks, Money(cents=0))
self.assertIsNone(node.nlnet_milestone)
- self.assertEqual(node.payees, {})
+ self.assertEqual(node.payments, {})
def test_loop1(self):
with self.assertRaises(BudgetGraphLoopError) as cm:
self.assertEqual(node1.nlnet_milestone, "abc")
self.assertEqual(list(node1.children()), [node2])
self.assertEqual(list(node1.children_breadth_first()), [node2])
- self.assertEqual(node1.payees, {})
+ self.assertEqual(node1.payments, {})
self.assertIsInstance(node2, Node)
self.assertIs(node2.graph, bg)
self.assertIs(node2.bug, EXAMPLE_CHILD_BUG2)
self.assertEqual(node2.budget_excluding_subtasks, Money(cents=1000))
self.assertEqual(node2.budget_including_subtasks, Money(cents=1000))
self.assertEqual(node2.nlnet_milestone, "abc")
- self.assertEqual(node2.payees, {})
+ self.assertEqual(node2.payments, {})
def test_children(self):
bg = BudgetGraph([
self.assertEqual(errors[0].root_bug_id, 1)
def test_payees_parse(self):
- def check(cf_payees_list, expected_payees):
+ def check(cf_payees_list, expected_payments):
bg = BudgetGraph([MockBug(bug_id=1,
cf_budget_parent=None,
cf_budget="0",
])
self.assertEqual(len(bg.nodes), 1)
node: Node = bg.nodes[1]
- self.assertEqual(node.payees, expected_payees)
+ self.assertEqual([str(i) for i in node.payments.values()],
+ expected_payments)
check("""
abc = 123
""",
- {"abc": Money(123)})
+ ["Payment(node=#1, payee_key='abc', amount=123, "
+ + "state=NotYetSubmitted, paid=None, submitted=None)"])
check("""
abc = "123"
""",
- {"abc": Money(123)})
+ ["Payment(node=#1, payee_key='abc', amount=123, "
+ + "state=NotYetSubmitted, paid=None, submitted=None)"])
check("""
abc = "123.45"
""",
- {"abc": Money("123.45")})
+ ["Payment(node=#1, payee_key='abc', amount=123.45, "
+ + "state=NotYetSubmitted, paid=None, submitted=None)"])
check("""
abc = "123.45"
"d e f" = "21.35"
""",
- {
- "abc": Money("123.45"),
- "d e f": Money("21.35"),
- })
+ ["Payment(node=#1, payee_key='abc', amount=123.45, "
+ + "state=NotYetSubmitted, paid=None, submitted=None)",
+ "Payment(node=#1, payee_key='d e f', amount=21.35, "
+ + "state=NotYetSubmitted, paid=None, submitted=None)"])
check("""
abc = "123.45"
# my comments
"AAA" = "-21.35"
""",
- {
- "abc": Money("123.45"),
- "AAA": Money("-21.35"),
- })
+ ["Payment(node=#1, payee_key='abc', amount=123.45, "
+ + "state=NotYetSubmitted, paid=None, submitted=None)",
+ "Payment(node=#1, payee_key='AAA', amount=-21.35, "
+ + "state=NotYetSubmitted, paid=None, submitted=None)"])
check("""
"not-an-email@example.com" = "-2345"
""",
- {
- "not-an-email@example.com": Money(-2345),
- })
+ ["Payment(node=#1, payee_key='not-an-email@example.com', "
+ + "amount=-2345, state=NotYetSubmitted, paid=None, "
+ + "submitted=None)"])
+ check("""
+ payee = { amount = 123 }
+ """,
+ ["Payment(node=#1, payee_key='payee', "
+ + "amount=123, state=NotYetSubmitted, paid=None, "
+ + "submitted=None)"])
+ check("""
+ payee = { amount = 123, submitted = 2020-05-01 }
+ """,
+ ["Payment(node=#1, payee_key='payee', "
+ + "amount=123, state=Submitted, paid=None, "
+ + "submitted=2020-05-01)"])
+ check("""
+ payee = { amount = 123, submitted = 2020-05-01T00:00:00 }
+ """,
+ ["Payment(node=#1, payee_key='payee', "
+ + "amount=123, state=Submitted, paid=None, "
+ + "submitted=2020-05-01 00:00:00)"])
+ check("""
+ payee = { amount = 123, submitted = 2020-05-01T00:00:00Z }
+ """,
+ ["Payment(node=#1, payee_key='payee', "
+ + "amount=123, state=Submitted, paid=None, "
+ + "submitted=2020-05-01 00:00:00+00:00)"])
+ check("""
+ payee = { amount = 123, submitted = 2020-05-01T00:00:00-07:23 }
+ """,
+ ["Payment(node=#1, payee_key='payee', "
+ + "amount=123, state=Submitted, paid=None, "
+ + "submitted=2020-05-01 00:00:00-07:23)"])
+ check("""
+ payee = { amount = 123, paid = 2020-05-01 }
+ """,
+ ["Payment(node=#1, payee_key='payee', "
+ + "amount=123, state=Paid, paid=2020-05-01, "
+ + "submitted=None)"])
+ check("""
+ payee = { amount = 123, paid = 2020-05-01T00:00:00 }
+ """,
+ ["Payment(node=#1, payee_key='payee', "
+ + "amount=123, state=Paid, paid=2020-05-01 00:00:00, "
+ + "submitted=None)"])
+ check("""
+ payee = { amount = 123, paid = 2020-05-01T00:00:00Z }
+ """,
+ ["Payment(node=#1, payee_key='payee', "
+ + "amount=123, state=Paid, paid=2020-05-01 00:00:00+00:00, "
+ + "submitted=None)"])
+ check("""
+ payee = { amount = 123, paid = 2020-05-01T00:00:00-07:23 }
+ """,
+ ["Payment(node=#1, payee_key='payee', "
+ + "amount=123, state=Paid, paid=2020-05-01 00:00:00-07:23, "
+ + "submitted=None)"])
+ check("""
+ [payee]
+ amount = 123
+ submitted = 2020-05-23
+ paid = 2020-05-01
+ """,
+ ["Payment(node=#1, payee_key='payee', "
+ + "amount=123, state=Paid, paid=2020-05-01, "
+ + "submitted=2020-05-23)"])
+ check("""
+ [payee]
+ amount = 123
+ submitted = 2020-05-23
+ paid = 2020-05-01T00:00:00
+ """,
+ ["Payment(node=#1, payee_key='payee', "
+ + "amount=123, state=Paid, paid=2020-05-01 00:00:00, "
+ + "submitted=2020-05-23)"])
+ check("""
+ [payee]
+ amount = 123
+ submitted = 2020-05-23
+ paid = 2020-05-01T00:00:00Z
+ """,
+ ["Payment(node=#1, payee_key='payee', "
+ + "amount=123, state=Paid, paid=2020-05-01 00:00:00+00:00, "
+ + "submitted=2020-05-23)"])
+ check("""
+ [payee]
+ amount = 123
+ submitted = 2020-05-23
+ paid = 2020-05-01T00:00:00-07:23
+ """,
+ ["Payment(node=#1, payee_key='payee', "
+ + "amount=123, state=Paid, paid=2020-05-01 00:00:00-07:23, "
+ + "submitted=2020-05-23)"])
def test_payees_money_mismatch(self):
bg = BudgetGraph([
self.assertEqual(errors[0].msg, expected_msg)
check_parse_error("""
- "payee 1" = {}
+ "payee 1" = []
""",
- "value for key 'payee 1' is not a string or integer "
- "(to use fractional values such as 123.45, write "
- "\"123.45\"): {}")
+ "value for key 'payee 1' is invalid -- it should "
+ "either be a monetary value or a table")
check_parse_error("""
payee = "ashjkf"
""",
- "failed to parse Money value for key 'payee': "
+ "failed to parse monetary amount for key 'payee': "
"invalid Money string: characters after sign and "
"before first `.` must be ascii digits")
check_parse_error("""
payee = 123.45
""",
- "value for key 'payee' is not a string or "
- "integer (to use fractional values such as "
- "123.45, write \"123.45\"): 123.45")
+ "failed to parse monetary amount for key 'payee': "
+ "monetary amount is not a string or integer (to "
+ "use fractional amounts such as 123.45, write "
+ "\"123.45\"): 123.45")
+
+ check_parse_error("""
+ payee = {}
+ """,
+ "value for key 'payee' is missing the `amount` "
+ "field which is required")
+
+ check_parse_error("""
+ payee = { amount = 123.45 }
+ """,
+ "failed to parse monetary amount for key 'payee': "
+ "monetary amount is not a string or integer (to "
+ "use fractional amounts such as 123.45, write "
+ "\"123.45\"): 123.45")
+
+ check_parse_error("""
+ payee = { amount = 123, blah = false }
+ """,
+ "value for key 'payee' has an unknown field: `blah`")
+
+ check_parse_error("""
+ payee = { amount = 123, submitted = false }
+ """,
+ "failed to parse `submitted` field for key "
+ "'payee': invalid date: false")
+
+ check_parse_error("""
+ payee = { amount = 123, submitted = 123 }
+ """,
+ "failed to parse `submitted` field for key 'payee':"
+ " invalid date: 123")
+
+ check_parse_error(
+ """
+ payee = { amount = 123, paid = 2020-01-01, submitted = "abc" }
+ """,
+ "failed to parse `submitted` field for key 'payee': "
+ "invalid date: 'abc'")
+
+ check_parse_error(
+ """
+ payee = { amount = 123, paid = 12:34:56 }
+ """,
+ "failed to parse `paid` field for key 'payee': just a time of "
+ "day by itself is not enough, a date must be included: 12:34:56")
+
+ check_parse_error(
+ """
+ payee = { amount = 123, submitted = 12:34:56.123456 }
+ """,
+ "failed to parse `submitted` field for key 'payee': just a time "
+ "of day by itself is not enough, a date must be included: "
+ "12:34:56.123456")
def test_negative_payee_money(self):
bg = BudgetGraph([
projects / utils.git / blobdiff