From 1e2c2bb10c16391870c7687f85d4594bdbec223d Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Thu, 17 May 2012 04:21:34 +0000
Subject: [PATCH] hook up more tests, begin converting remaining reports to
 Query

---
 hledger-lib/Hledger.hs         | 11 +++++++++++
 hledger-lib/Hledger/Reports.hs | 16 +++++++++++++++-
 hledger/Hledger/Cli.hs         |  3 +--
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/hledger-lib/Hledger.hs b/hledger-lib/Hledger.hs
index 6418f5353..7bc325c85 100644
--- a/hledger-lib/Hledger.hs
+++ b/hledger-lib/Hledger.hs
@@ -3,9 +3,20 @@ module Hledger (
                ,module Hledger.Read
                ,module Hledger.Reports
                ,module Hledger.Utils
+               ,tests_Hledger
 )
 where
+import Test.HUnit
+
 import Hledger.Data
 import Hledger.Read
 import Hledger.Reports
 import Hledger.Utils
+
+tests_Hledger = TestList
+    [
+     tests_Hledger_Data
+    ,tests_Hledger_Data_Query
+    ,tests_Hledger_Read
+    ,tests_Hledger_Reports
+    ]
diff --git a/hledger-lib/Hledger/Reports.hs b/hledger-lib/Hledger/Reports.hs
index 9d0a42eb5..85d8e11d2 100644
--- a/hledger-lib/Hledger/Reports.hs
+++ b/hledger-lib/Hledger/Reports.hs
@@ -232,6 +232,19 @@ entriesReport opts fspec j = sortBy (comparing f) $ jtxns $ filterJournalTransac
       f = transactionDateFn opts
       j' = journalSelectingAmountFromOpts opts j
 
+-- | Select transactions for an entries report.
+entriesReport2 :: ReportOpts -> Query -> Journal -> EntriesReport
+entriesReport2 opts q j =
+    sortBy (comparing f) $ filter (not . null . tpostings) $ map (filterTransactionPostings q) $ jtxns j'
+    where
+      f = transactionDateFn opts
+      j' = journalSelectingAmountFromOpts opts j
+
+tests_entriesReport2 = [
+  "entriesReport2" ~: do
+    assertEqual "" [] (entriesReport2 defreportopts Any nulljournal)
+ ]
+
 -------------------------------------------------------------------------------
 
 -- | A postings report is a list of postings with a running total, a label
@@ -594,7 +607,8 @@ isInterestingIndented opts l a
 -------------------------------------------------------------------------------
 
 tests_Hledger_Reports :: Test
-tests_Hledger_Reports = TestList
+tests_Hledger_Reports = TestList $
+ tests_entriesReport2 ++
  [
 
   "summarisePostingsByInterval" ~: do
diff --git a/hledger/Hledger/Cli.hs b/hledger/Hledger/Cli.hs
index 61b68055a..bbe08b7c9 100644
--- a/hledger/Hledger/Cli.hs
+++ b/hledger/Hledger/Cli.hs
@@ -42,8 +42,7 @@ import Hledger.Cli.Version
 tests_Hledger_Cli :: Test
 tests_Hledger_Cli = TestList
  [
-    tests_Hledger_Data
-   ,tests_Hledger_Read
+    tests_Hledger
    -- ,tests_Hledger_Cli_Add
    -- ,tests_Hledger_Cli_Balance
    ,tests_Hledger_Cli_Balancesheet