From a86e30d0149038e1d037552715256e12b56796c8 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Fri, 16 Sep 2016 21:17:54 +0200
Subject: [PATCH] re-enable report testing, find out that it fails.

---
 src/reports.c      |  2 +-
 src/reports.test.c | 12 +++++++++++-
 src/test_eressea.c |  4 +++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/reports.c b/src/reports.c
index 975cbb3b9..cdf85d096 100644
--- a/src/reports.c
+++ b/src/reports.c
@@ -1311,7 +1311,7 @@ void prepare_report(report_context *ctx, faction *f)
     static bool rule_region_owners;
     const struct building_type *bt_lighthouse = bt_find("lighthouse");
 
-    if (config_changed(&config)) {
+    if (bt_lighthouse && config_changed(&config)) {
         rule_region_owners = config_token("rules.region_owner_pay_building", bt_lighthouse->_name);
     }
 
diff --git a/src/reports.test.c b/src/reports.test.c
index aed289972..6d96a9436 100644
--- a/src/reports.test.c
+++ b/src/reports.test.c
@@ -225,12 +225,13 @@ static void test_arg_resources(CuTest *tc) {
 
 static void test_prepare_travelthru(CuTest *tc) {
     report_context ctx;
-    faction *f;
+    faction *f, *f2;
     region *r1, *r2, *r3;
     unit *u;
 
     test_setup();
     f = test_create_faction(0);
+    f2 = test_create_faction(0);
     r1 = test_create_region(0, 0, 0);
     r2 = test_create_region(1, 0, 0);
     r3 = test_create_region(2, 0, 0);
@@ -239,9 +240,18 @@ static void test_prepare_travelthru(CuTest *tc) {
     prepare_report(&ctx, f);
     CuAssertPtrEquals(tc, r1, ctx.first);
     CuAssertPtrEquals(tc, r3, ctx.last);
+    CuAssertPtrEquals(tc, f, ctx.f);
     CuAssertIntEquals(tc, seen_unit, r1->seen.mode);
     CuAssertIntEquals(tc, seen_travel, r2->seen.mode);
     CuAssertIntEquals(tc, seen_none, r3->seen.mode);
+    finish_reports(&ctx);
+    CuAssertIntEquals(tc, seen_none, r2->seen.mode);
+
+    prepare_report(&ctx, f2);
+    CuAssertIntEquals(tc, seen_none, r2->seen.mode);
+    CuAssertPtrEquals(tc, f2, ctx.f);
+    CuAssertPtrEquals(tc, NULL, ctx.first);
+    CuAssertPtrEquals(tc, NULL, ctx.last);
     test_cleanup();
 }
 
diff --git a/src/test_eressea.c b/src/test_eressea.c
index ac8d55ee9..7089493f9 100644
--- a/src/test_eressea.c
+++ b/src/test_eressea.c
@@ -99,7 +99,7 @@ int RunAllTests(int argc, char *argv[])
     ADD_SUITE(item);
     ADD_SUITE(magic);
     ADD_SUITE(alchemy);
-//    ADD_SUITE(reports);
+    ADD_SUITE(reports);
     ADD_SUITE(save);
     ADD_SUITE(ship);
     ADD_SUITE(spellbook);
@@ -110,6 +110,8 @@ int RunAllTests(int argc, char *argv[])
     ADD_SUITE(ally);
     ADD_SUITE(messages);
     /* gamecode */
+    ADD_SUITE(report);
+//    ADD_SUITE(creport);
     ADD_SUITE(prefix);
     ADD_SUITE(summary);
     ADD_SUITE(names);