From 3b9c6448bed36991710d7cd8df79d729f8172e17 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Sat, 27 Jun 2009 11:02:28 +0000
Subject: [PATCH] more test tweaks

---
 Makefile                                  |  8 ++++----
 Tests.hs                                  |  4 ++--
 tests/eliding-balance.test                |  8 ++++++++
 tests/eliding-print.test.disabled         |  9 +++++++++
 tests/eliding-register.test.disabled      |  7 +++++++
 tests/null-accountname-component.test     | 10 ++++++++++
 tests/parens-in-account-name.test         | 12 ++++++++++++
 tests/unicode-account-matching.test       |  7 +++++++
 tests/unicode-balance.test                |  8 ++++++++
 tests/unicode-description-matching.test   | 11 +++++++++++
 tests/unicode-error-message.test.disabled | 12 ++++++++++++
 tests/unicode-print.test                  | 10 ++++++++++
 tests/unicode-register.test               |  8 ++++++++
 tests/virtual.test                        | 12 ++++++++++++
 14 files changed, 120 insertions(+), 6 deletions(-)
 create mode 100644 tests/eliding-balance.test
 create mode 100644 tests/eliding-print.test.disabled
 create mode 100644 tests/eliding-register.test.disabled
 create mode 100644 tests/null-accountname-component.test
 create mode 100644 tests/parens-in-account-name.test
 create mode 100644 tests/unicode-account-matching.test
 create mode 100644 tests/unicode-balance.test
 create mode 100644 tests/unicode-description-matching.test
 create mode 100644 tests/unicode-error-message.test.disabled
 create mode 100644 tests/unicode-print.test
 create mode 100644 tests/unicode-register.test
 create mode 100644 tests/virtual.test

diff --git a/Makefile b/Makefile
index f8c742a0d..eefcc08b4 100644
--- a/Makefile
+++ b/Makefile
@@ -93,7 +93,7 @@ tools/doctest: tools/doctest.hs
 
 # build the shell test runner
 tools/shelltest: tools/shelltest.hs
-	ghc --make -threaded tools/shelltest.hs
+	ghc --make -threaded -O2 tools/shelltest.hs
 
 # build the generateledger tool
 tools/generateledger: tools/generateledger.hs
@@ -103,16 +103,16 @@ tools/generateledger: tools/generateledger.hs
 # TESTING
 
 # quick code tests - run all the time
-test: unittest doctest haddocktest
+test: unittest doctest functest haddocktest
 
 # moderate pre-commit tests
 # run before recording or before send/pushing, your choice
-committest: unittest doctest haddocktest warningstest
+committest: unittest doctest functest haddocktest warningstest
 	@(cabal configure -fvty -fhapps \
 		&& echo $@ passed) || echo $@ FAILED
 
 # thorough, pre-release tests - run before release
-releasetest: unittest doctest haddocktest warningstest cabaltest
+releasetest: unittest doctest functest haddocktest warningstest cabaltest
 
 # run unit tests, without waiting for compilation
 unittest:
diff --git a/Tests.hs b/Tests.hs
index f93ddaaec..59fb16ba8 100644
--- a/Tests.hs
+++ b/Tests.hs
@@ -165,11 +165,12 @@ $ printf "2009-01-01 x\n  a  2\n  b (b) b  -1\n  c\n" | hledger -f - print 2>&1;
 Nafai's bug
 @
 $ printf "2009/1/1 x\n a:  13\n b\n" | hledger -f - bal -E 2>&1; true
-"-" (line 2, column 1):
+hledger: parse error at (line 1, column 4):
 unexpected " "
 accountname seems ill-formed: a:
 @
 
+
 Eliding, general layout
 @
 $ printf "2009/1/1 x\n aaaaaaaaaaaaaaaaaaaa:aaaaaaaaaaaaaaaaaaaa:aaaaaaaaaaaaaaaaaaaa  €1\n b\n" | hledger -f - bal 2>&1
@@ -189,7 +190,6 @@ $ printf "2009/1/1 x\n aaaaaaaaaaaaaaaaaaaa:aaaaaaaaaaaaaaaaaaaa:aaaaaaaaaaaaaaa
     aa:aaaaaaaaaa:aaaaaaaaaaaaaaaaaaaa
     b
 @
-
 -}
 -- other test tools:
 -- http://hackage.haskell.org/cgi-bin/hackage-scripts/package/test-framework
diff --git a/tests/eliding-balance.test b/tests/eliding-balance.test
new file mode 100644
index 000000000..47513c7ab
--- /dev/null
+++ b/tests/eliding-balance.test
@@ -0,0 +1,8 @@
+balance
+<<<
+2009/1/1 x
+ aaaaaaaaaaaaaaaaaaaa:aaaaaaaaaaaaaaaaaaaa:aaaaaaaaaaaaaaaaaaaa  €1
+ b
+>>>
+                  €1  aaaaaaaaaaaaaaaaaaaa:aaaaaaaaaaaaaaaaaaaa:aaaaaaaaaaaaaaaaaaaa
+                 €-1  b
diff --git a/tests/eliding-print.test.disabled b/tests/eliding-print.test.disabled
new file mode 100644
index 000000000..ee41a7d0c
--- /dev/null
+++ b/tests/eliding-print.test.disabled
@@ -0,0 +1,9 @@
+print
+<<<
+2009/1/1 x
+ aaaaaaaaaaaaaaaaaaaa:aaaaaaaaaaaaaaaaaaaa:aaaaaaaaaaaaaaaaaaaa  €1
+ b
+>>>
+2009/01/01 x
+    aa:aaaaaaaaaa:aaaaaaaaaaaaaaaaaaaa
+    b
diff --git a/tests/eliding-register.test.disabled b/tests/eliding-register.test.disabled
new file mode 100644
index 000000000..e5efc3a75
--- /dev/null
+++ b/tests/eliding-register.test.disabled
@@ -0,0 +1,7 @@
+register
+<<<
+2009/1/1 x aaaaaaaaaaaaaaaaaaaa:aaaaaaaaaaaaaaaaaaaa:aaaaaaaaaaaaaaaaaaaa  €1
+ b
+>>>
+2009/01/01 x                    aa:aa:aaaaaaaaaaaaaaaa           €1           €1
+                                b                               €-1            0
diff --git a/tests/null-accountname-component.test b/tests/null-accountname-component.test
new file mode 100644
index 000000000..944d3c66b
--- /dev/null
+++ b/tests/null-accountname-component.test
@@ -0,0 +1,10 @@
+balance -E
+<<<
+2009/1/1 x
+ a:  13
+ b
+>>>2
+hledger: parse error at (line 1, column 4):
+unexpected " "
+accountname seems ill-formed: a:
+===1
diff --git a/tests/parens-in-account-name.test b/tests/parens-in-account-name.test
new file mode 100644
index 000000000..658cc7bfb
--- /dev/null
+++ b/tests/parens-in-account-name.test
@@ -0,0 +1,12 @@
+print
+<<<
+2009-01-01 x
+  a  2
+  b (b) b  -1
+  c
+>>>
+2009/01/01 x
+    a                                              2
+    b (b) b                                       -1
+    c
+
diff --git a/tests/unicode-account-matching.test b/tests/unicode-account-matching.test
new file mode 100644
index 000000000..4565bf3cd
--- /dev/null
+++ b/tests/unicode-account-matching.test
@@ -0,0 +1,7 @@
+register τράπ
+<<<
+2009-01-01 проверка
+  τράπεζα  10 руб
+  नकद
+>>>
+2009/01/01 проверка             τράπεζα                      10 руб       10 руб
diff --git a/tests/unicode-balance.test b/tests/unicode-balance.test
new file mode 100644
index 000000000..920a0fd81
--- /dev/null
+++ b/tests/unicode-balance.test
@@ -0,0 +1,8 @@
+balance
+<<<
+2009-01-01 проверка
+  τράπεζα  10 руб
+  नकद
+>>>
+              10 руб  τράπεζα
+             -10 руб  नकद
diff --git a/tests/unicode-description-matching.test b/tests/unicode-description-matching.test
new file mode 100644
index 000000000..bba167090
--- /dev/null
+++ b/tests/unicode-description-matching.test
@@ -0,0 +1,11 @@
+register desc:аура
+<<<
+2009-01-01 аура (cyrillic letters)
+  bank  10
+  cash
+2010-01-01 aypa (roman letters)
+  bank  20
+  cash
+>>>
+2009/01/01 аура (cyrillic let.. bank                             10           10
+                                cash                            -10            0
diff --git a/tests/unicode-error-message.test.disabled b/tests/unicode-error-message.test.disabled
new file mode 100644
index 000000000..a70c3f9be
--- /dev/null
+++ b/tests/unicode-error-message.test.disabled
@@ -0,0 +1,12 @@
+; not implemented yet
+balance >/dev/null
+<<<
+2009-01-01 broken entry
+  дебит  1
+  кредит  -2
+>>>2
+hledger: could not balance this transaction, amounts do not add up to zero:
+2009/01/01 broken entry
+    дебит                                          1
+    кредит                                        -2
+
diff --git a/tests/unicode-print.test b/tests/unicode-print.test
new file mode 100644
index 000000000..0fa923f4e
--- /dev/null
+++ b/tests/unicode-print.test
@@ -0,0 +1,10 @@
+print
+<<<
+2009-01-01 проверка
+ счёт:первый  1
+ счёт:второй
+>>>
+2009/01/01 проверка
+    счёт:первый                                    1
+    счёт:второй
+
diff --git a/tests/unicode-register.test b/tests/unicode-register.test
new file mode 100644
index 000000000..b48aae8f6
--- /dev/null
+++ b/tests/unicode-register.test
@@ -0,0 +1,8 @@
+register
+<<<
+2009-01-01 проверка
+  τράπεζα  10 руб
+  नकद
+>>>
+2009/01/01 проверка             τράπεζα                      10 руб       10 руб
+                                नकद                         -10 руб            0
diff --git a/tests/virtual.test b/tests/virtual.test
new file mode 100644
index 000000000..dba62af89
--- /dev/null
+++ b/tests/virtual.test
@@ -0,0 +1,12 @@
+print
+<<<
+2009/1/1 x
+  (virtual)  100
+  a  1
+  b
+>>>
+2009/01/01 x
+    (virtual)                                    100
+    a                                              1
+    b
+