Regenerate tests for fix for bug #713
The fix for bug #713 changes the way capital gains as well as basis costs are shown. All of these tests use the same input file, which includes capital gains and losses. The tests are too long to update and verify manually but I verified some files and believe the output is correct. I've therefore updated the tests with the output of the fixed ledger. Let's take baseline/opt-lot-dates.test as one example. In the past, ledger generated the following incorrect Equity entries: 190.42G Equity 236.83G Capital Gains -46.41G Capital Losses If you compare the end of the diff of the test, you'll see: - 35.42G + -155.00G The difference is: 35.42 - -155.00 = 190.42 This matches exactly the Equity entries previously generated, which shouldn't be there.
This commit is contained in:
parent
ddfabe0692
commit
2854ecdd19
5 changed files with 768 additions and 1928 deletions
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -676,9 +676,8 @@ test reg --basis
|
|||
06-Mar-16 Post Expenses:Fees:Mail 90c 90c
|
||||
Assets:Tajer -90c 0
|
||||
06-Mar-16 Auction House Assets:Tajer 119.58G 119.58G
|
||||
Assets:Tajer:Items -119.58G 0
|
||||
Income:Brokering -54.58G -54.58G
|
||||
Equity:Capital Gains 54.58G 0
|
||||
Assets:Tajer:Items -65.00G 54.58G
|
||||
Income:Brokering -54.58G 0
|
||||
06-Mar-16 Auction House Assets:Wyshona:Items "Plans: Mithril Shield Spike" 1 "Plans: Mithril Shield Spike" 1
|
||||
Assets:Wyshona:Items "Plans: Mithril Shield Spike" 1 "Plans: Mithril Shield Spike" 2
|
||||
Assets:Wyshona:Items "Recipe: Elixir of Giant Growth" 1 "Plans: Mithril Shield Spike" 2
|
||||
|
|
@ -745,13 +744,11 @@ test reg --basis
|
|||
06-Mar-16 Player Assets:Tajer 1.00G 1.00G
|
||||
Equity:Gold -1.00G 0
|
||||
06-Mar-17 Auction House Assets:Wyshona 18.06G 18.06G
|
||||
Assets:Wyshona:Items -18.06G 0
|
||||
Income:Brokering -16.56G -16.56G
|
||||
Equity:Capital Gains 16.56G 0
|
||||
Assets:Wyshona:Items -1.50G 16.56G
|
||||
Income:Brokering -16.56G 0
|
||||
06-Mar-17 Auction House Assets:Wyshona 18.06G 18.06G
|
||||
Assets:Wyshona:Items -18.06G 0
|
||||
Income:Brokering -17.06G -17.06G
|
||||
Equity:Capital Gains 17.06G 0
|
||||
Assets:Wyshona:Items -1.00G 17.06G
|
||||
Income:Brokering -17.06G 0
|
||||
06-Mar-17 Post Expenses:Fees:Mail 30c 30c
|
||||
Assets:Tajer -30c 0
|
||||
06-Mar-17 Player: raev Assets:Tajer:Items 30.00G 30.00G
|
||||
|
|
@ -761,9 +758,8 @@ test reg --basis
|
|||
06-Mar-17 Post Expenses:Fees:Mail 3.00s 3.00s
|
||||
Assets:Wyshona -3.00s 0
|
||||
06-Mar-17 Player Assets:Wyshona 1.00G 1.00G
|
||||
Assets:Wyshona:Items -1.00G 0
|
||||
Expenses:Capital Loss 25.00s 25.00s
|
||||
Equity:Capital Losses -25.00s 0
|
||||
Assets:Wyshona:Items -1.25G -25.00s
|
||||
Expenses:Capital Loss 25.00s 0
|
||||
06-Mar-17 Auction House (impl.. Expenses:Items 2.79G 2.79G
|
||||
Assets:Wyshona -2.79G 0
|
||||
06-Mar-17 Auction House (impl.. Assets:Danell:Items 3.00G 3.00G
|
||||
|
|
@ -776,24 +772,20 @@ test reg --basis
|
|||
Assets:Tajer:Items 1.00G 26.90G
|
||||
Assets:Wyshona -26.90G 0
|
||||
06-Mar-17 Auction House Assets:Tajer 4.00G 4.00G
|
||||
Assets:Tajer:Items -4.00G 0
|
||||
Income:Brokering -3.00G -3.00G
|
||||
Equity:Capital Gains 3.00G 0
|
||||
Assets:Tajer:Items -1.00G 3.00G
|
||||
Income:Brokering -3.00G 0
|
||||
06-Mar-17 Auction House Assets:Danell 31.71s 31.71s
|
||||
Assets:Danell:Items -31.71s 0
|
||||
Expenses:Capital Loss 2.68G 2.68G
|
||||
Equity:Capital Losses -2.68G 0
|
||||
Assets:Danell:Items -3.00G -2.68G
|
||||
Expenses:Capital Loss 2.68G 0
|
||||
06-Mar-17 Auction House Expenses:Fees:Auction 1.25G 1.25G
|
||||
Assets:Danell -1.25G 0
|
||||
06-Mar-17 Transfer Assets:Gruulmorg 15.00G 15.00G
|
||||
Expenses:Fees:Mail 30c 15.00G
|
||||
Assets:Tajer -15.00G 0
|
||||
06-Mar-17 Auction House Assets:Wyshona 36.25G 36.25G
|
||||
Assets:Wyshona:Items -18.12G 18.12G
|
||||
Assets:Wyshona:Items -18.12G 0
|
||||
Income:Brokering -31.84G -31.84G
|
||||
Equity:Capital Gains 16.02G -15.82G
|
||||
Equity:Capital Gains 15.82G 0
|
||||
Assets:Wyshona:Items -2.11G 34.14G
|
||||
Assets:Wyshona:Items -2.30G 31.84G
|
||||
Income:Brokering -31.84G 0
|
||||
06-Mar-17 Transfer Assets:Danell 49.96G 49.96G
|
||||
Expenses:Gifts 1.00G 50.96G
|
||||
Expenses:Fees:Mail 30c 50.96G
|
||||
|
|
@ -811,44 +803,35 @@ test reg --basis
|
|||
Expenses:Fees:Mail 30c 75.30s
|
||||
Assets:Tajer -75.30s 0
|
||||
06-Mar-18 Auction House Assets:Tajer 15.00G 15.00G
|
||||
Assets:Tajer:Items -15.00G 0
|
||||
Income:Brokering -11.10G -11.10G
|
||||
Equity:Capital Gains 11.10G 0
|
||||
Assets:Tajer:Items -3.90G 11.10G
|
||||
Income:Brokering -11.10G 0
|
||||
06-Mar-18 Auction House Assets:Tajer 43.45G 43.45G
|
||||
Assets:Tajer:Items -43.45G 0
|
||||
Income:Brokering -13.45G -13.45G
|
||||
Equity:Capital Gains 13.45G 0
|
||||
Assets:Tajer:Items -30.00G 13.45G
|
||||
Income:Brokering -13.45G 0
|
||||
06-Mar-18 Auction House Assets:Tajer 19.95G 19.95G
|
||||
Assets:Tajer:Items -19.95G 0
|
||||
Income:Brokering -14.95G -14.95G
|
||||
Equity:Capital Gains 14.95G 0
|
||||
Assets:Tajer:Items -5.00G 14.95G
|
||||
Income:Brokering -14.95G 0
|
||||
06-Mar-19 Auction House Assets:Tajer 28.50G 28.50G
|
||||
Assets:Tajer:Items -28.50G 0
|
||||
Income:Brokering -24.50G -24.50G
|
||||
Equity:Capital Gains 24.50G 0
|
||||
Assets:Tajer:Items -4.00G 24.50G
|
||||
Income:Brokering -24.50G 0
|
||||
06-Mar-19 Auction House Assets:Tajer 17.10G 17.10G
|
||||
Assets:Tajer:Items -17.10G 0
|
||||
Income:Brokering -13.10G -13.10G
|
||||
Equity:Capital Gains 13.10G 0
|
||||
Assets:Tajer:Items -4.00G 13.10G
|
||||
Income:Brokering -13.10G 0
|
||||
06-Mar-19 Auction House Assets:Tajer 4.65G 4.65G
|
||||
Assets:Tajer:Items -4.65G 0
|
||||
Income:Brokering -3.65G -3.65G
|
||||
Equity:Capital Gains 3.65G 0
|
||||
Assets:Tajer:Items -1.00G 3.65G
|
||||
Income:Brokering -3.65G 0
|
||||
06-Mar-19 Auction House Assets:Tajer:Items 3.00G 3.00G
|
||||
Assets:Tajer:Items 2.50G 5.50G
|
||||
Assets:Tajer -5.50G 0
|
||||
06-Mar-20 Auction House Assets:Tajer 16.34G 16.34G
|
||||
Assets:Tajer:Items -16.34G 0
|
||||
Income:Brokering -14.34G -14.34G
|
||||
Equity:Capital Gains 14.34G 0
|
||||
Assets:Tajer:Items -2.00G 14.34G
|
||||
Income:Brokering -14.34G 0
|
||||
06-Mar-20 Auction House Assets:Tajer 5.00G 5.00G
|
||||
Assets:Tajer:Items -5.00G 0
|
||||
Income:Brokering -2.00G -2.00G
|
||||
Equity:Capital Gains 2.00G 0
|
||||
Assets:Tajer:Items -3.00G 2.00G
|
||||
Income:Brokering -2.00G 0
|
||||
06-Mar-20 Auction House Assets:Tajer 15.00G 15.00G
|
||||
Assets:Tajer:Items -15.00G 0
|
||||
Income:Brokering -11.00G -11.00G
|
||||
Equity:Capital Gains 11.00G 0
|
||||
Assets:Tajer:Items -4.00G 11.00G
|
||||
Income:Brokering -11.00G 0
|
||||
06-Mar-20 Auction House Expenses:Fees:Mail 60c 60c
|
||||
Assets:Tajer -60c 0
|
||||
06-Mar-21 Auction House Assets:Tajer:Items 170.00G 170.00G
|
||||
|
|
@ -865,21 +848,18 @@ test reg --basis
|
|||
Expenses:Fees:Auction 75.00s 7.83G
|
||||
Assets:Tajer -7.83G 0
|
||||
06-Mar-23 Auction House Assets:Tajer 166.53G 166.53G
|
||||
Assets:Tajer:Items -166.53G 0
|
||||
Expenses:Capital Loss 3.47G 3.47G
|
||||
Equity:Capital Losses -3.47G 0
|
||||
Assets:Tajer:Items -170.00G -3.47G
|
||||
Expenses:Capital Loss 3.47G 0
|
||||
06-Mar-26 Auction House Assets:Tajer 8.20G 8.20G
|
||||
Assets:Tajer:Items -8.20G 0
|
||||
Income:Brokering -5.70G -5.70G
|
||||
Equity:Capital Gains 5.70G 0
|
||||
Assets:Tajer:Items -2.50G 5.70G
|
||||
Income:Brokering -5.70G 0
|
||||
06-Mar-26 Player Expenses:Items 1.50G 1.50G
|
||||
Expenses:Fees:Mail 30c 1.50G
|
||||
Expenses:Fees:Mail 30c 1.51G
|
||||
Assets:Tajer -1.51G 0
|
||||
06-Mar-27 Player Assets:Tajer 160.00G 160.00G
|
||||
Assets:Tajer:Items -160.00G 0
|
||||
Expenses:Capital Loss 40.00G 40.00G
|
||||
Equity:Capital Losses -40.00G 0
|
||||
Assets:Tajer:Items -200.00G -40.00G
|
||||
Expenses:Capital Loss 40.00G 0
|
||||
06-Mar-27 Player Expenses:Fees:Mail 30c 30c
|
||||
Assets:Tajer -30c 0
|
||||
06-Mar-26 Player Expenses:Items 54.00G 54.00G
|
||||
|
|
|
|||
|
|
@ -677,9 +677,8 @@ test reg --basis --base
|
|||
06-Mar-16 Post Expenses:Fees:Mail 90c 90c
|
||||
Assets:Tajer -90c 0
|
||||
06-Mar-16 Auction House Assets:Tajer 1195768c 1195768c
|
||||
Assets:Tajer:Items -1195768c 0
|
||||
Income:Brokering -545768c -545768c
|
||||
Equity:Capital Gains 545768c 0
|
||||
Assets:Tajer:Items -650000c 545768c
|
||||
Income:Brokering -545768c 0
|
||||
06-Mar-16 Auction House Assets:Wyshona:Items "Plans: Mithril Shield Spike" 1 "Plans: Mithril Shield Spike" 1
|
||||
Assets:Wyshona:Items "Plans: Mithril Shield Spike" 1 "Plans: Mithril Shield Spike" 2
|
||||
Assets:Wyshona:Items "Recipe: Elixir of Giant Growth" 1 "Plans: Mithril Shield Spike" 2
|
||||
|
|
@ -746,13 +745,11 @@ test reg --basis --base
|
|||
06-Mar-16 Player Assets:Tajer 10000c 10000c
|
||||
Equity:Gold -10000c 0
|
||||
06-Mar-17 Auction House Assets:Wyshona 180584c 180584c
|
||||
Assets:Wyshona:Items -180584c 0
|
||||
Income:Brokering -165584c -165584c
|
||||
Equity:Capital Gains 165584c 0
|
||||
Assets:Wyshona:Items -15000c 165584c
|
||||
Income:Brokering -165584c 0
|
||||
06-Mar-17 Auction House Assets:Wyshona 180584c 180584c
|
||||
Assets:Wyshona:Items -180584c 0
|
||||
Income:Brokering -170584c -170584c
|
||||
Equity:Capital Gains 170584c 0
|
||||
Assets:Wyshona:Items -10000c 170584c
|
||||
Income:Brokering -170584c 0
|
||||
06-Mar-17 Post Expenses:Fees:Mail 30c 30c
|
||||
Assets:Tajer -30c 0
|
||||
06-Mar-17 Player: raev Assets:Tajer:Items 300000c 300000c
|
||||
|
|
@ -762,9 +759,8 @@ test reg --basis --base
|
|||
06-Mar-17 Post Expenses:Fees:Mail 300c 300c
|
||||
Assets:Wyshona -300c 0
|
||||
06-Mar-17 Player Assets:Wyshona 10000c 10000c
|
||||
Assets:Wyshona:Items -10000c 0
|
||||
Expenses:Capital Loss 2500c 2500c
|
||||
Equity:Capital Losses -2500c 0
|
||||
Assets:Wyshona:Items -12500c -2500c
|
||||
Expenses:Capital Loss 2500c 0
|
||||
06-Mar-17 Auction House (impl.. Expenses:Items 27900c 27900c
|
||||
Assets:Wyshona -27900c 0
|
||||
06-Mar-17 Auction House (impl.. Assets:Danell:Items 30000c 30000c
|
||||
|
|
@ -777,24 +773,20 @@ test reg --basis --base
|
|||
Assets:Tajer:Items 10000c 269000c
|
||||
Assets:Wyshona -269000c 0
|
||||
06-Mar-17 Auction House Assets:Tajer 40000c 40000c
|
||||
Assets:Tajer:Items -40000c 0
|
||||
Income:Brokering -30000c -30000c
|
||||
Equity:Capital Gains 30000c 0
|
||||
Assets:Tajer:Items -10000c 30000c
|
||||
Income:Brokering -30000c 0
|
||||
06-Mar-17 Auction House Assets:Danell 3171c 3171c
|
||||
Assets:Danell:Items -3171c 0
|
||||
Expenses:Capital Loss 26829c 26829c
|
||||
Equity:Capital Losses -26829c 0
|
||||
Assets:Danell:Items -30000c -26829c
|
||||
Expenses:Capital Loss 26829c 0
|
||||
06-Mar-17 Auction House Expenses:Fees:Auction 12537c 12537c
|
||||
Assets:Danell -12537c 0
|
||||
06-Mar-17 Transfer Assets:Gruulmorg 150000c 150000c
|
||||
Expenses:Fees:Mail 30c 150030c
|
||||
Assets:Tajer -150030c 0
|
||||
06-Mar-17 Auction House Assets:Wyshona 362450c 362450c
|
||||
Assets:Wyshona:Items -181225c 181225c
|
||||
Assets:Wyshona:Items -181225c 0
|
||||
Income:Brokering -318400c -318400c
|
||||
Equity:Capital Gains 160175c -158225c
|
||||
Equity:Capital Gains 158225c 0
|
||||
Assets:Wyshona:Items -21050c 341400c
|
||||
Assets:Wyshona:Items -23000c 318400c
|
||||
Income:Brokering -318400c 0
|
||||
06-Mar-17 Transfer Assets:Danell 499560c 499560c
|
||||
Expenses:Gifts 10000c 509560c
|
||||
Expenses:Fees:Mail 30c 509590c
|
||||
|
|
@ -812,44 +804,35 @@ test reg --basis --base
|
|||
Expenses:Fees:Mail 30c 7530c
|
||||
Assets:Tajer -7530c 0
|
||||
06-Mar-18 Auction House Assets:Tajer 150000c 150000c
|
||||
Assets:Tajer:Items -150000c 0
|
||||
Income:Brokering -111000c -111000c
|
||||
Equity:Capital Gains 111000c 0
|
||||
Assets:Tajer:Items -39000c 111000c
|
||||
Income:Brokering -111000c 0
|
||||
06-Mar-18 Auction House Assets:Tajer 434472c 434472c
|
||||
Assets:Tajer:Items -434472c 0
|
||||
Income:Brokering -134472c -134472c
|
||||
Equity:Capital Gains 134472c 0
|
||||
Assets:Tajer:Items -300000c 134472c
|
||||
Income:Brokering -134472c 0
|
||||
06-Mar-18 Auction House Assets:Tajer 199500c 199500c
|
||||
Assets:Tajer:Items -199500c 0
|
||||
Income:Brokering -149500c -149500c
|
||||
Equity:Capital Gains 149500c 0
|
||||
Assets:Tajer:Items -50000c 149500c
|
||||
Income:Brokering -149500c 0
|
||||
06-Mar-19 Auction House Assets:Tajer 285000c 285000c
|
||||
Assets:Tajer:Items -285000c 0
|
||||
Income:Brokering -245000c -245000c
|
||||
Equity:Capital Gains 245000c 0
|
||||
Assets:Tajer:Items -40000c 245000c
|
||||
Income:Brokering -245000c 0
|
||||
06-Mar-19 Auction House Assets:Tajer 171000c 171000c
|
||||
Assets:Tajer:Items -171000c 0
|
||||
Income:Brokering -131000c -131000c
|
||||
Equity:Capital Gains 131000c 0
|
||||
Assets:Tajer:Items -40000c 131000c
|
||||
Income:Brokering -131000c 0
|
||||
06-Mar-19 Auction House Assets:Tajer 46550c 46550c
|
||||
Assets:Tajer:Items -46550c 0
|
||||
Income:Brokering -36550c -36550c
|
||||
Equity:Capital Gains 36550c 0
|
||||
Assets:Tajer:Items -10000c 36550c
|
||||
Income:Brokering -36550c 0
|
||||
06-Mar-19 Auction House Assets:Tajer:Items 30000c 30000c
|
||||
Assets:Tajer:Items 25000c 55000c
|
||||
Assets:Tajer -55000c 0
|
||||
06-Mar-20 Auction House Assets:Tajer 163443c 163443c
|
||||
Assets:Tajer:Items -163443c 0
|
||||
Income:Brokering -143443c -143443c
|
||||
Equity:Capital Gains 143443c 0
|
||||
Assets:Tajer:Items -20000c 143443c
|
||||
Income:Brokering -143443c 0
|
||||
06-Mar-20 Auction House Assets:Tajer 50000c 50000c
|
||||
Assets:Tajer:Items -50000c 0
|
||||
Income:Brokering -20000c -20000c
|
||||
Equity:Capital Gains 20000c 0
|
||||
Assets:Tajer:Items -30000c 20000c
|
||||
Income:Brokering -20000c 0
|
||||
06-Mar-20 Auction House Assets:Tajer 150000c 150000c
|
||||
Assets:Tajer:Items -150000c 0
|
||||
Income:Brokering -110000c -110000c
|
||||
Equity:Capital Gains 110000c 0
|
||||
Assets:Tajer:Items -40000c 110000c
|
||||
Income:Brokering -110000c 0
|
||||
06-Mar-20 Auction House Expenses:Fees:Mail 60c 60c
|
||||
Assets:Tajer -60c 0
|
||||
06-Mar-21 Auction House Assets:Tajer:Items 1700000c 1700000c
|
||||
|
|
@ -866,21 +849,18 @@ test reg --basis --base
|
|||
Expenses:Fees:Auction 7500c 78300c
|
||||
Assets:Tajer -78300c 0
|
||||
06-Mar-23 Auction House Assets:Tajer 1665260c 1665260c
|
||||
Assets:Tajer:Items -1665260c 0
|
||||
Expenses:Capital Loss 34740c 34740c
|
||||
Equity:Capital Losses -34740c 0
|
||||
Assets:Tajer:Items -1700000c -34740c
|
||||
Expenses:Capital Loss 34740c 0
|
||||
06-Mar-26 Auction House Assets:Tajer 81980c 81980c
|
||||
Assets:Tajer:Items -81980c 0
|
||||
Income:Brokering -56980c -56980c
|
||||
Equity:Capital Gains 56980c 0
|
||||
Assets:Tajer:Items -25000c 56980c
|
||||
Income:Brokering -56980c 0
|
||||
06-Mar-26 Player Expenses:Items 15000c 15000c
|
||||
Expenses:Fees:Mail 30c 15030c
|
||||
Expenses:Fees:Mail 30c 15060c
|
||||
Assets:Tajer -15060c 0
|
||||
06-Mar-27 Player Assets:Tajer 1600000c 1600000c
|
||||
Assets:Tajer:Items -1600000c 0
|
||||
Expenses:Capital Loss 400000c 400000c
|
||||
Equity:Capital Losses -400000c 0
|
||||
Assets:Tajer:Items -2000000c -400000c
|
||||
Expenses:Capital Loss 400000c 0
|
||||
06-Mar-27 Player Expenses:Fees:Mail 30c 30c
|
||||
Assets:Tajer -30c 0
|
||||
06-Mar-26 Player Expenses:Items 540000c 540000c
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue