NPO-Accounting/conservancy_beancount Changeset - 39fa977f71ce

Changeset - 39fa977f71ce

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Brett Smith - 4 years ago 2020-06-04 14:49:55
brettcsmith@brettcsmith.org

reports: Balance.le/ge_zero returns False when exactly at tolerance.

2 files changed with 8 insertions and 2 deletions:

conservancy_beancount/reports/core.py

tests/test_reports_balance.py

0 comments (0 inline, 0 general)

conservancy_beancount/reports/core.py

➞

Show inline comments

@@ ... / @@ -164,17 +164,19 @@ class Balance(Mapping[str, data.Amount]): @@
         return self._all_amounts(self.within_tolerance, self.tolerance)
     is_zero = eq_zero
     def ge_zero(self) -> bool:
         """Returns true if all amounts in the balance >= 0, within tolerance."""
         return self._all_amounts(operator.ge, -self.tolerance)
         op_func = operator.gt if self.tolerance else operator.ge
         return self._all_amounts(op_func, -self.tolerance)
     def le_zero(self) -> bool:
         """Returns true if all amounts in the balance <= 0, within tolerance."""
         return self._all_amounts(operator.le, self.tolerance)
         op_func = operator.lt if self.tolerance else operator.le
         return self._all_amounts(op_func, self.tolerance)
     def format(self,
                fmt: Optional[str]='#,#00.00 ¤¤',
                sep: str=', ',
                empty: str="Zero balance",
     ) -> str:

tests/test_reports_balance.py

➞

Show inline comments

@@ ... / @@ -109,12 +109,14 @@ def test_eq_zero(mapping, expected): @@
     ({'USD': -10, 'EUR': -20}, False),
     ({'JPY': 10}, True),
     ({'JPY': 10, 'BRL': 0}, True),
     ({'JPY': 10, 'BRL': 20}, True),
     ({'USD': '0.00015'}, True),
     ({'EUR': '-0.00052'}, True),
     ({'RUB': core.Balance.TOLERANCE}, True),
     ({'RUB': -core.Balance.TOLERANCE}, False),
 ])
 def test_ge_zero(mapping, expected):
     balance = core.Balance(amounts_from_map(mapping))
     assert balance.ge_zero() == expected
 @pytest.mark.parametrize('mapping,expected', [
@@ ... / @@ -126,12 +128,14 @@ def test_ge_zero(mapping, expected): @@
     ({'USD': -10, 'EUR': -20}, True),
     ({'JPY': 10}, False),
     ({'JPY': 10, 'BRL': 0}, False),
     ({'JPY': 10, 'BRL': 20}, False),
     ({'USD': '0.00015'}, True),
     ({'EUR': '-0.00052'}, True),
     ({'RUB': core.Balance.TOLERANCE}, False),
     ({'RUB': -core.Balance.TOLERANCE}, True),
 ])
 def test_le_zero(mapping, expected):
     balance = core.Balance(amounts_from_map(mapping))
     assert balance.le_zero() == expected
 @pytest.mark.parametrize('mapping', [

0 comments (0 inline, 0 general)