summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/test
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2013-10-17 04:48:56 +0200
committerAdam Borowski <kilobyte@angband.pl>2013-10-17 04:52:54 +0200
commit660d43f70c72e38673d5e3210e52afd2d1f0450d (patch)
tree971da39620bab63e4270ec12b5a08efc33bce96a /crawl-ref/source/test
parent3c6a2862f587dece6c938f1adeb9bbd6acf11f88 (diff)
downloadcrawl-ref-660d43f70c72e38673d5e3210e52afd2d1f0450d.tar.gz
crawl-ref-660d43f70c72e38673d5e3210e52afd2d1f0450d.zip
Move maps used by the test suite to dat/des/test
This means there's no dynamic loading of maps anymore. Also, delete unused regression tests for the long gone old LOS code. We had copies of both the old and current version.
Diffstat (limited to 'crawl-ref/source/test')
-rw-r--r--crawl-ref/source/test/bounce.lua1
-rw-r--r--crawl-ref/source/test/bounce2.lua1
-rw-r--r--crawl-ref/source/test/des/bounce.des23
-rw-r--r--crawl-ref/source/test/des/debug-diamond-los.des268
-rw-r--r--crawl-ref/source/test/des/debug-los.des236
-rw-r--r--crawl-ref/source/test/des/monster-plant-pathfind.des14
-rw-r--r--crawl-ref/source/test/los_maps.lua1
-rw-r--r--crawl-ref/source/test/monster-plant-pathfind.lua.disabled1
8 files changed, 0 insertions, 545 deletions
diff --git a/crawl-ref/source/test/bounce.lua b/crawl-ref/source/test/bounce.lua
index ef20a0656b..54b683bff3 100644
--- a/crawl-ref/source/test/bounce.lua
+++ b/crawl-ref/source/test/bounce.lua
@@ -34,7 +34,6 @@ end
local function test_bounces()
debug.flush_map_memory()
- dgn.load_des_file("test/des/bounce.des")
local map = dgn.map_by_tag("bounce_test")
assert(map, "Could not find bounce_test map (tag 'bounce_test')")
-- The ragedness of the map edge is randomized on placement,
diff --git a/crawl-ref/source/test/bounce2.lua b/crawl-ref/source/test/bounce2.lua
index b60ae3ccb2..082f3add02 100644
--- a/crawl-ref/source/test/bounce2.lua
+++ b/crawl-ref/source/test/bounce2.lua
@@ -31,7 +31,6 @@ end
local function test_bounces()
debug.flush_map_memory()
- dgn.load_des_file("test/des/bounce.des")
local map = dgn.map_by_tag("bounce_test")
assert(map, "Could not find bounce_test map (tag 'bounce_test')")
-- The ragedness of the map edge is randomized on placement,
diff --git a/crawl-ref/source/test/des/bounce.des b/crawl-ref/source/test/des/bounce.des
deleted file mode 100644
index 8202da7af2..0000000000
--- a/crawl-ref/source/test/des/bounce.des
+++ /dev/null
@@ -1,23 +0,0 @@
-# A random set of walls for unpredictable ray bouncing.
-NAME: bounce_test
-TAGS: bounce_test
-KFEAT: x = w:70 floor / w:30 X
-MAP
-XXXXXXXXXXXXXXXXX
-XxxxxxxxxxxxxxxxX
-XxxxxxxxxxxxxxxxX
-XxxxxxxxxxxxxxxxX
-XxxxxxxxxxxxxxxxX
-Xxxxx.......xxxxX
-Xxxxx.......xxxxX
-Xxxxx.......xxxxX
-Xxxxx...@...xxxxX
-Xxxxx.......xxxxX
-Xxxxx.......xxxxX
-Xxxxx.......xxxxX
-XxxxxxxxxxxxxxxxX
-XxxxxxxxxxxxxxxxX
-XxxxxxxxxxxxxxxxX
-XxxxxxxxxxxxxxxxX
-XXXXXXXXXXXXXXXXX
-ENDMAP
diff --git a/crawl-ref/source/test/des/debug-diamond-los.des b/crawl-ref/source/test/des/debug-diamond-los.des
deleted file mode 100644
index 578b97696a..0000000000
--- a/crawl-ref/source/test/des/debug-diamond-los.des
+++ /dev/null
@@ -1,268 +0,0 @@
-# Sample maps illustrating what LOS should be like.
-# test/los_maps.lua tests losight() against these.
-#
-# For the moment, these need to be 10x10 with an @
-# in the nw corner and show one quadrant, with
-# visibility encoded as follows.
-#
-# x: visible wall
-# c: non-visible wall
-# .: visible floor
-# w: non-visible floor (water actually; could just place c's there)
-# @: center
-
-NAME: los_empty
-ORIENT: float
-TAGS: debug_los
-MAP
-@........c
-.........c
-........cc
-........cc
-........cc
-.......ccc
-......cccc
-.....ccccc
-..cccccccc
-cccccccccc
-ENDMAP
-
-NAME: los_edge
-ORIENT: float
-TAGS: debug_los
-MAP
-@.......xc
-.......xxc
-.......xcc
-.......xcc
-......xxcc
-.....xxccc
-....xxcccc
-.xxxxccccc
-xxcccccccc
-cccccccccc
-ENDMAP
-
-NAME: los_blocking_wall
-ORIENT: float
-TAGS: debug_los
-MAP
-@..xwwwwwc
-..xxwwwwwc
-.xxwwwwwcc
-xxwwwwwwcc
-wwwwwwwwcc
-wwwwwwwccc
-wwwwwwcccc
-wwwwwccccc
-wwcccccccc
-cccccccccc
-ENDMAP
-
-NAME: los_corner
-ORIENT: float
-TAGS: debug_los
-MAP
-@xcccccccc
-x........c
-cxxxxxxxcc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-ENDMAP
-
-NAME: los_corner_2
-ORIENT: float
-TAGS: debug_los
-MAP
-@.xccccccc
-xx.......c
-cccxxxxxcc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-ENDMAP
-
-NAME: los_corner_3
-ORIENT: float
-TAGS: debug_los
-MAP
-@..xcccccc
-xxx......c
-cccccxxxcc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-ENDMAP
-
-NAME: los_corner_4
-ORIENT: float
-TAGS: debug_los
-MAP
-@...xccccc
-xxxx.....c
-cccccccxcc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-ENDMAP
-
-NAME: los_corner_5
-ORIENT: float
-TAGS: debug_los
-MAP
-@....xcccc
-xxxxx....c
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-ENDMAP
-
-NAME: los_corner_6
-ORIENT: float
-TAGS: debug_los
-MAP
-@.....xccc
-xxxxxx...c
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-ENDMAP
-
-NAME: los_corner_7
-ORIENT: float
-TAGS: debug_los
-MAP
-@......xcc
-xxxxxxx..c
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-ENDMAP
-
-NAME: los_corner_8
-ORIENT: float
-TAGS: debug_los
-MAP
-@.......xc
-xxxxxxxx.c
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-ENDMAP
-
-NAME: los_corner_9
-ORIENT: float
-TAGS: debug_los
-MAP
-@........c
-xxxxxxxxxw
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-ENDMAP
-
-NAME: los_gap
-ORIENT: float
-TAGS: debug_los
-MAP
-@.xccccccc
-x.xccccccc
-c...cccccc
-c.....cccc
-c.......cc
-c......ccc
-c.....cccc
-c....ccccc
-c.cccccccc
-cccccccccc
-ENDMAP
-
-NAME: los_gap2
-ORIENT: float
-TAGS: debug_los
-MAP
-@.xccccccc
-x.xccccccc
-c.xccccccc
-c..ccccccc
-c...cccccc
-c....ccccc
-c.....cccc
-c....ccccc
-c.cccccccc
-cccccccccc
-ENDMAP
-
-NAME: los_diag
-ORIENT: float
-TAGS: debug_los
-MAP
-@xcccccccc
-x.xccccccc
-cx.xcccccc
-ccx.xccccc
-cccx.xcccc
-ccccx.xccc
-cccccxcccc
-cccccccccc
-cccccccccc
-cccccccccc
-ENDMAP
-
-NAME: los_diag_gap
-ORIENT: float
-TAGS: debug_los
-MAP
-@xcccccccc
-x.xccccccc
-cx..cccccc
-cc....cccc
-ccc.....cc
-ccc....ccc
-cccc..cccc
-cccc.ccccc
-cccccccccc
-cccccccccc
-ENDMAP
diff --git a/crawl-ref/source/test/des/debug-los.des b/crawl-ref/source/test/des/debug-los.des
deleted file mode 100644
index 42736b44fa..0000000000
--- a/crawl-ref/source/test/des/debug-los.des
+++ /dev/null
@@ -1,236 +0,0 @@
-# Sample maps illustrating what LOS should be like.
-# test/los_maps.lua tests losight() against these.
-#
-# For the moment, these need to be 10x10 with an @
-# in the nw corner and show one quadrant, with
-# visibility encoded as follows.
-#
-# x: visible wall
-# c: non-visible wall
-# .: visible floor
-# w: non-visible floor (water actually; could just place c's there)
-# @: center
-
-NAME: los_empty
-ORIENT: float
-TAGS: debug_los
-MAP
-@........c
-.........c
-........cc
-........cc
-........cc
-.......ccc
-......cccc
-.....ccccc
-..cccccccc
-cccccccccc
-ENDMAP
-
-NAME: los_edge
-ORIENT: float
-TAGS: debug_los
-MAP
-@.......xc
-.......xxc
-.......xcc
-.......xcc
-......xxcc
-.....xxccc
-....xxcccc
-.xxxxccccc
-xxcccccccc
-cccccccccc
-ENDMAP
-
-NAME: los_blocking_wall
-ORIENT: float
-TAGS: debug_los
-MAP
-@..xwwwwwc
-..xxwwwwwc
-.xxwwwwwcc
-xxwwwwwwcc
-wwwwwwwwcc
-wwwwwwwccc
-wwwwwwcccc
-wwwwwccccc
-wwcccccccc
-cccccccccc
-ENDMAP
-
-NAME: los_corner
-ORIENT: float
-TAGS: debug_los
-MAP
-@xcccccccc
-x........c
-cxxxxxxxcc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-ENDMAP
-
-NAME: los_corner_2
-ORIENT: float
-TAGS: debug_los
-MAP
-@.xccccccc
-xx.......c
-cccxxxxxcc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-ENDMAP
-
-NAME: los_corner_3
-ORIENT: float
-TAGS: debug_los
-MAP
-@..xcccccc
-xxx......c
-cccccxxxcc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-ENDMAP
-
-NAME: los_corner_4
-ORIENT: float
-TAGS: debug_los
-MAP
-@...xccccc
-xxxx.....c
-cccccccxcc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-ENDMAP
-
-NAME: los_corner_5
-ORIENT: float
-TAGS: debug_los
-MAP
-@....xcccc
-xxxxx....c
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-ENDMAP
-
-NAME: los_corner_6
-ORIENT: float
-TAGS: debug_los
-MAP
-@.....xccc
-xxxxxx...c
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-ENDMAP
-
-NAME: los_corner_7
-ORIENT: float
-TAGS: debug_los
-MAP
-@......xcc
-xxxxxxx..c
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-ENDMAP
-
-NAME: los_corner_8
-ORIENT: float
-TAGS: debug_los
-MAP
-@.......xc
-xxxxxxxx.c
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-ENDMAP
-
-NAME: los_corner_9
-ORIENT: float
-TAGS: debug_los
-MAP
-@........c
-xxxxxxxxxw
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-cccccccccc
-ENDMAP
-
-NAME: los_gap
-ORIENT: float
-TAGS: debug_los
-MAP
-@.xccccccc
-x.xccccccc
-c..ccccccc
-c...cccccc
-c....ccccc
-c.....cccc
-c.....cccc
-c....ccccc
-c.cccccccc
-cccccccccc
-ENDMAP
-
-NAME: los_gap2
-ORIENT: float
-TAGS: debug_los
-MAP
-@.xccccccc
-x.xccccccc
-c.xccccccc
-c..ccccccc
-c..ccccccc
-c...cccccc
-c...cccccc
-c....ccccc
-c.cccccccc
-cccccccccc
-ENDMAP
diff --git a/crawl-ref/source/test/des/monster-plant-pathfind.des b/crawl-ref/source/test/des/monster-plant-pathfind.des
deleted file mode 100644
index 0dfb28aa67..0000000000
--- a/crawl-ref/source/test/des/monster-plant-pathfind.des
+++ /dev/null
@@ -1,14 +0,0 @@
-# In the buggy case, the monster oscillates between 1 and 2.
-NAME: monster_plant_pathfind
-ORIENT: encompass
-MONS: generate_awake hippogriff, nothing
-KMONS: P = plant
-# Just to shut up level compiler sanity checks.
-TAGS: monster_plant_pathfind
-MAP
-xxxxx
-xxP{x
-x2PPx
-x.1xx
-xxxxx
-ENDMAP
diff --git a/crawl-ref/source/test/los_maps.lua b/crawl-ref/source/test/los_maps.lua
index ffb55afca9..b545fb5b30 100644
--- a/crawl-ref/source/test/los_maps.lua
+++ b/crawl-ref/source/test/los_maps.lua
@@ -50,7 +50,6 @@ local function test_los_map(map)
end
local function test_los_maps()
- dgn.load_des_file("test/des/debug-diamond-los.des")
local map = dgn.map_by_tag("debug_los")
assert(map, "Could not find debug-los maps (tag 'debug_los')")
while map do
diff --git a/crawl-ref/source/test/monster-plant-pathfind.lua.disabled b/crawl-ref/source/test/monster-plant-pathfind.lua.disabled
index 273cc307ab..31f4e1994b 100644
--- a/crawl-ref/source/test/monster-plant-pathfind.lua.disabled
+++ b/crawl-ref/source/test/monster-plant-pathfind.lua.disabled
@@ -6,7 +6,6 @@ local FAILMAP = map .. ".map"
debug.flush_map_memory()
debug.goto_place("D:2")
-dgn.load_des_file("test/des/monster-plant-pathfind.des")
dgn.reset_level()
assert(dgn.place_map(dgn.map_by_name(map), true, true),
"Could not place " .. map)