summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/baseline/opt-base.test3
-rw-r--r--test/baseline/opt-historical.test60
-rw-r--r--test/baseline/opt-price.test7
-rw-r--r--test/regress/C0212EAC.test3
-rw-r--r--test/regress/CAE63F5C-b.test3
-rw-r--r--test/regress/CAE63F5C-c.test3
6 files changed, 37 insertions, 42 deletions
diff --git a/test/baseline/opt-base.test b/test/baseline/opt-base.test
index 060dee42..a987c385 100644
--- a/test/baseline/opt-base.test
+++ b/test/baseline/opt-base.test
@@ -16,12 +16,11 @@ test bal --base
7200s A
$8,000.00 Assets:Receivable
7200s B
- $3,200.00 Equity:Capital Gains
$-3,200.00
-288000s Income
-288000s Contracts
$-3,200.00 Gains
--------------------
- $8,000.00
+ $4,800.00
-273600s
end test
diff --git a/test/baseline/opt-historical.test b/test/baseline/opt-historical.test
index 820f5ff0..a882d91a 100644
--- a/test/baseline/opt-historical.test
+++ b/test/baseline/opt-historical.test
@@ -50,11 +50,11 @@ test reg stocks -O
end test
test reg stocks -B
-12-Jan-01 Broker Assets:Stocks $100 $100
-12-Feb-02 Broker Assets:Stocks $200 $300
-12-Mar-03 Broker Assets:Stocks $300 $600
-12-Apr-04 Broker Assets:Stocks $400 $1000
-12-May-05 Broker Assets:Stocks $500 $1500
+12-Jan-01 Broker Assets:Stocks $10 $10
+12-Feb-02 Broker Assets:Stocks $20 $30
+12-Mar-03 Broker Assets:Stocks $30 $60
+12-Apr-04 Broker Assets:Stocks $40 $100
+12-May-05 Broker Assets:Stocks $50 $150
end test
test reg stocks -I
@@ -98,11 +98,11 @@ test reg stocks -O -V --now=2012/05/10
end test
test reg stocks -B -V
-12-Jan-01 Broker Assets:Stocks $100 $100
-12-Feb-02 Broker Assets:Stocks $200 $300
-12-Mar-03 Broker Assets:Stocks $300 $600
-12-Apr-04 Broker Assets:Stocks $400 $1000
-12-May-05 Broker Assets:Stocks $500 $1500
+12-Jan-01 Broker Assets:Stocks $10 $10
+12-Feb-02 Broker Assets:Stocks $20 $30
+12-Mar-03 Broker Assets:Stocks $30 $60
+12-Apr-04 Broker Assets:Stocks $40 $100
+12-May-05 Broker Assets:Stocks $50 $150
end test
test reg stocks -I -V
@@ -138,11 +138,11 @@ test reg stocks -O -X EUR --now=2012/05/10
end test
test reg stocks -B -X EUR
-12-Jan-01 Broker Assets:Stocks EUR 200,00 EUR 200,00
-12-Feb-02 Broker Assets:Stocks EUR 400,00 EUR 600,00
-12-Mar-03 Broker Assets:Stocks EUR 600,00 EUR 1.200,00
-12-Apr-04 Broker Assets:Stocks EUR 800,00 EUR 2.000,00
-12-May-05 Broker Assets:Stocks EUR 1.000,00 EUR 3.000,00
+12-Jan-01 Broker Assets:Stocks EUR 20,00 EUR 20,00
+12-Feb-02 Broker Assets:Stocks EUR 40,00 EUR 60,00
+12-Mar-03 Broker Assets:Stocks EUR 60,00 EUR 120,00
+12-Apr-04 Broker Assets:Stocks EUR 80,00 EUR 200,00
+12-May-05 Broker Assets:Stocks EUR 100,00 EUR 300,00
end test
test reg stocks -I -X EUR
@@ -170,11 +170,11 @@ test reg stocks -O -H
end test
test reg stocks -B -H
-12-Jan-01 Broker Assets:Stocks $100 $100
-12-Feb-02 Broker Assets:Stocks $200 $300
-12-Mar-03 Broker Assets:Stocks $300 $600
-12-Apr-04 Broker Assets:Stocks $400 $1000
-12-May-05 Broker Assets:Stocks $500 $1500
+12-Jan-01 Broker Assets:Stocks $10 $10
+12-Feb-02 Broker Assets:Stocks $20 $30
+12-Mar-03 Broker Assets:Stocks $30 $60
+12-Apr-04 Broker Assets:Stocks $40 $100
+12-May-05 Broker Assets:Stocks $50 $150
end test
test reg stocks -I -H
@@ -202,11 +202,11 @@ test reg stocks -O -H -V
end test
test reg stocks -B -H -V
-12-Jan-01 Broker Assets:Stocks $100 $100
-12-Feb-02 Broker Assets:Stocks $200 $300
-12-Mar-03 Broker Assets:Stocks $300 $600
-12-Apr-04 Broker Assets:Stocks $400 $1000
-12-May-05 Broker Assets:Stocks $500 $1500
+12-Jan-01 Broker Assets:Stocks $10 $10
+12-Feb-02 Broker Assets:Stocks $20 $30
+12-Mar-03 Broker Assets:Stocks $30 $60
+12-Apr-04 Broker Assets:Stocks $40 $100
+12-May-05 Broker Assets:Stocks $50 $150
end test
test reg stocks -I -H -V
@@ -234,11 +234,11 @@ test reg stocks -O -H -X EUR
end test
test reg stocks -B -H -X EUR
-12-Jan-01 Broker Assets:Stocks EUR 200,00 EUR 200,00
-12-Feb-02 Broker Assets:Stocks EUR 400,00 EUR 600,00
-12-Mar-03 Broker Assets:Stocks EUR 600,00 EUR 1.200,00
-12-Apr-04 Broker Assets:Stocks EUR 800,00 EUR 2.000,00
-12-May-05 Broker Assets:Stocks EUR 1.000,00 EUR 3.000,00
+12-Jan-01 Broker Assets:Stocks EUR 20,00 EUR 20,00
+12-Feb-02 Broker Assets:Stocks EUR 40,00 EUR 60,00
+12-Mar-03 Broker Assets:Stocks EUR 60,00 EUR 120,00
+12-Apr-04 Broker Assets:Stocks EUR 80,00 EUR 200,00
+12-May-05 Broker Assets:Stocks EUR 100,00 EUR 300,00
end test
test reg stocks -I -H -X EUR
diff --git a/test/baseline/opt-price.test b/test/baseline/opt-price.test
index 2ebd061e..2a9778cc 100644
--- a/test/baseline/opt-price.test
+++ b/test/baseline/opt-price.test
@@ -18,7 +18,7 @@ end test
test reg -B equities
08-Jan-01 Purchase Apple shares Equities $2000 $2000
-08-Jun-30 Sell some Apple sha.. Equities $-1250 $750
+08-Jun-30 Sell some Apple sha.. Equities $-1000 $1000
end test
test reg --end 2009/06/26 -V equities
@@ -31,8 +31,9 @@ end test
test reg --end 2009/06/26 -G equities
08-Jun-30 Commodities revalued <Revalued> $500 $500
-09-Jan-31 Commodities revalued <Revalued> $250 $750
-09-Jun-26 Commodities revalued <Revalued> $500 $1250
+08-Jun-30 Sell some Apple sha.. Equities $-250 $250
+09-Jan-31 Commodities revalued <Revalued> $250 $500
+09-Jun-26 Commodities revalued <Revalued> $500 $1000
end test
test reg -I equities
diff --git a/test/regress/C0212EAC.test b/test/regress/C0212EAC.test
index 9a572ef6..e77107d7 100644
--- a/test/regress/C0212EAC.test
+++ b/test/regress/C0212EAC.test
@@ -27,7 +27,4 @@ test reg
-5.00 GBP {=1.40 EUR}
Income:Gain -0.50 EUR 5.00 GBP
-5.00 GBP {=1.40 EUR}
- Equity:Capital Gains 0.50 EUR 0.50 EUR
- 5.00 GBP
- -5.00 GBP {=1.40 EUR}
end test
diff --git a/test/regress/CAE63F5C-b.test b/test/regress/CAE63F5C-b.test
index c0b7efd8..e1ea049e 100644
--- a/test/regress/CAE63F5C-b.test
+++ b/test/regress/CAE63F5C-b.test
@@ -7,9 +7,8 @@
test bal -X $
$272.67 Accrued
$-271.54 Assets
- $6.45 Equity:Capital Gains
$5.32 Expenses
$-6.45 Income:Currency Conversion
--------------------
- $6.45
+ 0
end test
diff --git a/test/regress/CAE63F5C-c.test b/test/regress/CAE63F5C-c.test
index 64728544..db318b2d 100644
--- a/test/regress/CAE63F5C-c.test
+++ b/test/regress/CAE63F5C-c.test
@@ -7,9 +7,8 @@
test bal -X $
$272.67 Accrued
$-271.54 Assets
- $6.45 Equity:Capital Gains
$5.32 Expenses
$-6.45 Income:Currency Conversion
--------------------
- $6.46
+ 0
end test