NPO-Accounting/conservancy_beancount Changeset - b142b3e521be

Changeset - b142b3e521be

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Brett Smith - 3 years ago 2021-02-18 20:05:56
brettcsmith@brettcsmith.org

accrual: Use EnumArgument for ReportType.

2 files changed with 5 insertions and 34 deletions:

conservancy_beancount/reports/accrual.py

tests/test_reports_accrual.py

0 comments (0 inline, 0 general)

conservancy_beancount/reports/accrual.py

➞

Show inline comments

@@ ... / @@ -623,13 +623,6 @@ class ReportType(enum.Enum): @@
     OUT = OUTGOING
     OUTGOINGS = OUTGOING
     @classmethod
     def by_name(cls, name: str) -> 'ReportType':
         try:
             return cls[name.upper()]
         except KeyError:
             raise ValueError(f"unknown report type {name!r}") from None
 def filter_search(postings: Iterable[data.Posting],
                   search_terms: Iterable[cliutil.SearchTerm],
@@ ... @@
     parser = argparse.ArgumentParser(prog=PROGNAME)
     cliutil.add_version_argument(parser)
     cliutil.add_rewrite_rules_argument(parser)
     report_type_arg = cliutil.EnumArgument(ReportType)
     parser.add_argument(
         '--report-type', '-t',
         metavar='NAME',
         type=ReportType.by_name,
         help="""The type of report to generate, one of `aging`, `balance`, or
 `outgoing`. If not specified, the default is `aging` when no search terms are
         type=report_type_arg.enum_type,
         help=f"""The type of report to generate.
 Choices are {report_type_arg.choices_str()}.
 If not specified, the default is `aging` when no search terms are
 given, `outgoing` for search terms that return a single outstanding payable,
 and `balance` any other time.
 """)

tests/test_reports_accrual.py

➞

Show inline comments

@@ ... @@
     for post in actual:
         assert check_func(post)
 @pytest.mark.parametrize('arg,expected', [
     ('aging', accrual.AgingReport),
     ('balance', accrual.BalanceReport),
     ('outgoing', accrual.OutgoingReport),
     ('age', accrual.AgingReport),
     ('bal', accrual.BalanceReport),
     ('out', accrual.OutgoingReport),
     ('outgoings', accrual.OutgoingReport),
 ])
 def test_report_type_by_name(arg, expected):
     assert accrual.ReportType.by_name(arg.lower()).value is expected
     assert accrual.ReportType.by_name(arg.title()).value is expected
     assert accrual.ReportType.by_name(arg.upper()).value is expected
 @pytest.mark.parametrize('arg', [
     'unknown',
     'blance',
     'outgong',
 ])
 def test_report_type_by_unknown_name(arg):
     # Raising ValueError helps argparse generate good messages.
     with pytest.raises(ValueError):
         accrual.ReportType.by_name(arg)
 @pytest.mark.parametrize('acct_name,invoice,day', testutil.combine_values(
     INVOICE_ACCOUNTS,
     ['FIXME', '', None, *testutil.NON_STRING_METADATA_VALUES],

0 comments (0 inline, 0 general)