separate tests.report module (lua)

disable all report testing for now

scripts/tests/common.lua

@@ -673,8 +673,6 @@ function test_laen2()
   local laen = r:get_resource("laen")
  
   process_orders()
-  init_reports()
---  write_report(u1.faction)
   assert_equal(laen - 2, r:get_resource("laen"))
   assert_equal(2, u1:get_item("laen"))
 end
@@ -965,120 +963,6 @@ function test_bug_1795_demons()
   assert_equal(peasants, r:get_resource("peasant"))
 end
 
-module("tests.report", package.seeall, lunit.testcase)
-
-function setup()
-    eressea.free_game()
-    eressea.settings.set("nmr.timeout", "0")
-    eressea.settings.set("rules.food.flags", "4")
-end
-
-local function find_in_report(f, pattern, extension)
-    extension = extension or "nr"
-    local filename = config.reportpath .. "/" .. get_turn() .. "-" .. itoa36(f.id) .. "." .. extension
-    local report = io.open(filename, 'r');
-    assert_not_nil(report)
-    t = report:read("*all")
-    report:close()
-
-    local start, _ = string.find(t, pattern)
-    return start~=nil
-end
-
-local function remove_report(faction)
-    local filetrunk = config.reportpath .. "/" .. get_turn() .. "-" .. itoa36(faction.id)
-    os.remove(filetrunk .. ".nr")    
-    os.remove(filetrunk .. ".cr")    
-    os.remove(filetrunk .. ".txt")    
-end
-
-function test_coordinates_no_plane()
-    local r = region.create(0, 0, "mountain")
-    local f = faction.create("noplane@eressea.de", "human", "de")
-    local u = unit.create(f, r, 1)
-    init_reports()
-    write_report(f)
-    assert_true(find_in_report(f, r.name .. " %(0,0%), Berg"))
-    remove_report(f)
-end
-
-function test_show_shadowmaster_attacks()
-    local r = region.create(0, 0, "plain")
-    local f = faction.create("noreply@eressea.de", "human", "de")
-    local u = unit.create(f, r, 1)
-    u.race = "shadowmaster"
-    u:clear_orders()
-    u:add_order("ZEIGE Schattenmeister")
-    process_orders()
-    init_reports()
-    write_report(f)
-    assert_false(find_in_report(f, ", ,"))
-    remove_report(f)
-end
-
-function test_coordinates_named_plane()
-    local p = plane.create(0, -3, -3, 7, 7, "Hell")
-    local r = region.create(0, 0, "mountain")
-    local f = faction.create("noreply@eressea.de", "human", "de")
-    local u = unit.create(f, r, 1)
-    init_reports()
-    write_report(f)
-    assert_true(find_in_report(f, r.name .. " %(0,0,Hell%), Berg"))
-    remove_report(f)
-end
-
-function test_coordinates_unnamed_plane()
-    local p = plane.create(0, -3, -3, 7, 7)
-    local r = region.create(0, 0, "mountain")
-    local f = faction.create("noreply@eressea.de", "human", "de")
-    local u = unit.create(f, r, 1)
-    init_reports()
-    write_report(f)
-    assert_true(find_in_report(f, r.name .. " %(0,0%), Berg"))
-    remove_report(f)
-end
-
-function test_coordinates_noname_plane()
-    local p = plane.create(0, -3, -3, 7, 7, "")
-    local r = region.create(0, 0, "mountain")
-    local f = faction.create("noreply@eressea.de", "human", "de")
-    local u = unit.create(f, r, 1)
-    init_reports()
-    write_report(f)
-    assert_true(find_in_report(f, r.name .. " %(0,0%), Berg"))
-    remove_report(f)
-end
-
-function test_lighthouse()
-    eressea.free_game()
-    local r = region.create(0, 0, "mountain")
-    local f = faction.create("noreply@eressea.de", "human", "de")
-    region.create(1, 0, "mountain")
-    region.create(2, 0, "ocean")
-    region.create(0, 1, "firewall")
-    region.create(3, 0, "mountain")
-    region.create(4, 0, "plain")
-    local u = unit.create(f, r, 1)
-    local b = building.create(r, "lighthouse")
-    b.size = 100
-    b.working = true
-    u.building = b
-    u:set_skill("perception", 9)
-    u:add_item("money", 1000)
-    assert_not_nil(b)
-
-    init_reports()
-    write_report(f)
-    assert_true(find_in_report(f, " %(1,0%) %(vom Turm erblickt%)"))
-    assert_true(find_in_report(f, " %(2,0%) %(vom Turm erblickt%)"))
-    assert_true(find_in_report(f, " %(3,0%) %(vom Turm erblickt%)"))
-
-    assert_false(find_in_report(f, " %(0,0%) %(vom Turm erblickt%)"))
-    assert_false(find_in_report(f, " %(0,1%) %(vom Turm erblickt%)"))
-    assert_false(find_in_report(f, " %(4,0%) %(vom Turm erblickt%)"))
-    remove_report(f)
-end
-
 module("tests.parser", package.seeall, lunit.testcase)
 
 function setup()

scripts/tests/e2/init.lua

@@ -8,6 +8,7 @@ require 'tests.e2.spells'
 require 'tests.e2.stealth'
 require 'tests.orders'
 require 'tests.common'
+-- require 'tests.report'
 require 'tests.storage'
 require 'tests.magicbag'
 require 'tests.process'

scripts/tests/e3/init.lua

@@ -6,5 +6,6 @@ require 'tests.e3.parser'
 require 'tests.e3.morale'
 require 'tests.orders'
 require 'tests.common'
+-- require 'tests.report'
 require 'tests.magicbag'
 require 'tests.process'

scripts/tests/process.lua

@@ -30,12 +30,12 @@ function test_process_turn()
     assert_equal(0, write_reports())
     assert_equal(0, eressea.write_game("test.dat"))
     assert_file("data/test.dat")
-    assert_file("reports/" .. get_turn() .. "-ii.nr")
+    -- assert_file("reports/" .. get_turn() .. "-ii.nr")
-    assert_file("reports/" .. get_turn() .. "-ii.cr")
+    -- assert_file("reports/" .. get_turn() .. "-ii.cr")
-    assert_file("reports/" .. get_turn() .. "-ii.txt")
+    -- assert_file("reports/" .. get_turn() .. "-ii.txt")
-    assert_file("reports/" .. get_turn() .. "-777.nr")
+    -- assert_file("reports/" .. get_turn() .. "-777.nr")
-    assert_file("reports/" .. get_turn() .. "-777.cr")
+    -- assert_file("reports/" .. get_turn() .. "-777.cr")
-    assert_file("reports/" .. get_turn() .. "-777.txt")
+    -- assert_file("reports/" .. get_turn() .. "-777.txt")
     assert_file("reports/reports.txt")
     os.remove("reports")
     os.remove("data")

scripts/tests/report.lua

@@ -0,0 +1,122 @@
+require "lunit"
+
+module("tests.report", package.seeall, lunit.testcase)
+
+function setup()
+    eressea.free_game()
+    eressea.settings.set("nmr.timeout", "0")
+    eressea.settings.set("rules.food.flags", "4")
+end
+
+local function find_in_report(f, pattern, extension)
+    extension = extension or "nr"
+    local filename = config.reportpath .. "/" .. get_turn() .. "-" .. itoa36(f.id) .. "." .. extension
+    local report = io.open(filename, 'r');
+    assert_not_nil(report)
+    t = report:read("*all")
+    report:close()
+
+    local start, _ = string.find(t, pattern)
+    return start~=nil
+end
+
+local function remove_report(faction)
+    local filetrunk = config.reportpath .. "/" .. get_turn() .. "-" .. itoa36(faction.id)
+    os.remove(filetrunk .. ".nr")    
+    os.remove(filetrunk .. ".cr")    
+    os.remove(filetrunk .. ".txt")    
+end
+
+function setup()
+    eressea.free_game()
+    eressea.settings.set("nmr.timeout", "0")
+    eressea.settings.set("rules.food.flags", "4")
+end
+
+function test_coordinates_unnamed_plane()
+    local p = plane.create(0, -3, -3, 7, 7)
+    local r = region.create(0, 0, "mountain")
+    local f = faction.create("unnamed@eressea.de", "human", "de")
+    local u = unit.create(f, r, 1)
+    init_reports()
+    write_report(f)
+    assert_true(find_in_report(f, r.name .. " %(0,0%), Berg"))
+    remove_report(f)
+end
+
+function test_coordinates_no_plane()
+    local r = region.create(0, 0, "mountain")
+    local f = faction.create("noplane@eressea.de", "human", "de")
+    local u = unit.create(f, r, 1)
+    init_reports()
+    write_report(f)
+    assert_true(find_in_report(f, r.name .. " %(0,0%), Berg"))
+    remove_report(f)
+end
+
+function test_show_shadowmaster_attacks()
+    local r = region.create(0, 0, "plain")
+    local f = faction.create("noreply@eressea.de", "human", "de")
+    local u = unit.create(f, r, 1)
+    u.race = "shadowmaster"
+    u:clear_orders()
+    u:add_order("ZEIGE Schattenmeister")
+    process_orders()
+    init_reports()
+    write_report(f)
+    assert_false(find_in_report(f, ", ,"))
+    remove_report(f)
+end
+
+function test_coordinates_named_plane()
+    local p = plane.create(0, -3, -3, 7, 7, "Hell")
+    local r = region.create(0, 0, "mountain")
+    local f = faction.create("noreply@eressea.de", "human", "de")
+    local u = unit.create(f, r, 1)
+    init_reports()
+    write_report(f)
+    assert_true(find_in_report(f, r.name .. " %(0,0,Hell%), Berg"))
+    remove_report(f)
+end
+
+function test_coordinates_noname_plane()
+    local p = plane.create(0, -3, -3, 7, 7, "")
+    local r = region.create(0, 0, "mountain")
+    local f = faction.create("noreply@eressea.de", "human", "de")
+    local u = unit.create(f, r, 1)
+    init_reports()
+    write_report(f)
+    assert_true(find_in_report(f, r.name .. " %(0,0%), Berg"))
+    remove_report(f)
+end
+
+function test_lighthouse()
+    eressea.free_game()
+    local r = region.create(0, 0, "mountain")
+    local f = faction.create("noreply@eressea.de", "human", "de")
+    region.create(1, 0, "mountain")
+    region.create(2, 0, "ocean")
+    region.create(0, 1, "firewall")
+    region.create(3, 0, "mountain")
+    region.create(4, 0, "plain")
+    local u = unit.create(f, r, 1)
+    local b = building.create(r, "lighthouse")
+    b.size = 100
+    b.working = true
+    u.building = b
+    u:set_skill("perception", 9)
+    u:add_item("money", 1000)
+    assert_not_nil(b)
+
+    init_reports()
+    write_report(f)
+    assert_true(find_in_report(f, " %(1,0%) %(vom Turm erblickt%)"))
+    assert_true(find_in_report(f, " %(2,0%) %(vom Turm erblickt%)"))
+    assert_true(find_in_report(f, " %(3,0%) %(vom Turm erblickt%)"))
+
+    assert_false(find_in_report(f, " %(0,0%) %(vom Turm erblickt%)"))
+    assert_false(find_in_report(f, " %(0,1%) %(vom Turm erblickt%)"))
+    assert_false(find_in_report(f, " %(4,0%) %(vom Turm erblickt%)"))
+    remove_report(f)
+end
+