From 4cad4b327d462b0115bea44a219a5a32f4b19bfc Mon Sep 17 00:00:00 2001 From: thdox Date: Wed, 25 Feb 2015 19:03:29 +0100 Subject: Revert "Disable three tests preventing Jenkins from succeeding" This reverts commit 8d1067c89c1c283accfeebb1ff35276b8eb35749. --- test/baseline/cmd-convert.test | 35 ++++++++++++++++++++++++++++++++++ test/baseline/cmd-convert.test.disable | 35 ---------------------------------- test/baseline/opt-file.test | 12 ++++++++++++ test/baseline/opt-file.test.disable | 12 ------------ 4 files changed, 47 insertions(+), 47 deletions(-) create mode 100644 test/baseline/cmd-convert.test delete mode 100644 test/baseline/cmd-convert.test.disable create mode 100644 test/baseline/opt-file.test delete mode 100644 test/baseline/opt-file.test.disable (limited to 'test/baseline') diff --git a/test/baseline/cmd-convert.test b/test/baseline/cmd-convert.test new file mode 100644 index 00000000..d444da52 --- /dev/null +++ b/test/baseline/cmd-convert.test @@ -0,0 +1,35 @@ + +test -f /dev/null --input-date-format "%m/%d/%Y" convert test/baseline/cmd-convert1.dat +2011/12/12=2011/12/13 * (100) Test ;test + Expenses:Unknown $10 + Equity:Unknown $-10 = $20 + +2011/12/12=2011/12/12 * + Expenses:Unknown $10 + Equity:Unknown +end test + +test -f /dev/null --input-date-format "%m/%d/%Y" convert test/baseline/cmd-convert2.dat +2011/01/01 * test + Expenses:Unknown 20.00 EUR + Equity:Unknown +end test + +test -f /dev/null --input-date-format "%m/%d/%Y" convert test/baseline/cmd-convert3.dat -> 1 +__ERROR__ +While parsing file "$sourcepath/test/baseline/cmd-convert3.dat", line 1: +While parsing CSV line: + 01/01/2011,, + +Error: No quantity specified for amount +end test + +test -f /dev/null convert test/baseline/cmd-convert4.dat -> 1 +__ERROR__ +While parsing file "$sourcepath/test/baseline/cmd-convert4.dat", line 1: +While parsing CSV line: + bogus,$10, + +Error: Invalid date: bogus +end test + diff --git a/test/baseline/cmd-convert.test.disable b/test/baseline/cmd-convert.test.disable deleted file mode 100644 index d444da52..00000000 --- a/test/baseline/cmd-convert.test.disable +++ /dev/null @@ -1,35 +0,0 @@ - -test -f /dev/null --input-date-format "%m/%d/%Y" convert test/baseline/cmd-convert1.dat -2011/12/12=2011/12/13 * (100) Test ;test - Expenses:Unknown $10 - Equity:Unknown $-10 = $20 - -2011/12/12=2011/12/12 * - Expenses:Unknown $10 - Equity:Unknown -end test - -test -f /dev/null --input-date-format "%m/%d/%Y" convert test/baseline/cmd-convert2.dat -2011/01/01 * test - Expenses:Unknown 20.00 EUR - Equity:Unknown -end test - -test -f /dev/null --input-date-format "%m/%d/%Y" convert test/baseline/cmd-convert3.dat -> 1 -__ERROR__ -While parsing file "$sourcepath/test/baseline/cmd-convert3.dat", line 1: -While parsing CSV line: - 01/01/2011,, - -Error: No quantity specified for amount -end test - -test -f /dev/null convert test/baseline/cmd-convert4.dat -> 1 -__ERROR__ -While parsing file "$sourcepath/test/baseline/cmd-convert4.dat", line 1: -While parsing CSV line: - bogus,$10, - -Error: Invalid date: bogus -end test - diff --git a/test/baseline/opt-file.test b/test/baseline/opt-file.test new file mode 100644 index 00000000..66d0ab1b --- /dev/null +++ b/test/baseline/opt-file.test @@ -0,0 +1,12 @@ +test -f opt-file-does-not-exist.dat bal -> 1 +__ERROR__ +Error: Cannot read journal file "$sourcepath/opt-file-does-not-exist.dat" +end test + +test -f test/baseline/opt-file1.dat -f test/baseline/opt-file2.dat bal + 10 A + -10 C +-------------------- + 0 +end test + diff --git a/test/baseline/opt-file.test.disable b/test/baseline/opt-file.test.disable deleted file mode 100644 index 66d0ab1b..00000000 --- a/test/baseline/opt-file.test.disable +++ /dev/null @@ -1,12 +0,0 @@ -test -f opt-file-does-not-exist.dat bal -> 1 -__ERROR__ -Error: Cannot read journal file "$sourcepath/opt-file-does-not-exist.dat" -end test - -test -f test/baseline/opt-file1.dat -f test/baseline/opt-file2.dat bal - 10 A - -10 C --------------------- - 0 -end test - -- cgit v1.2.3