From 8b9d317d720a705e8e5a537d588040d8f15dbd04 Mon Sep 17 00:00:00 2001 From: Celtic Minstrel Date: Sat, 7 Apr 2018 12:11:25 -0400 Subject: [PATCH] WML Unit Tests: Fix issues found by the schema validator With this, the WML unit tests are as clean of schema errors as they can get The two remaining errors are unit tests for dealing with invalid input, so they are intentionally violating the schema. --- data/test/maps/pathfind_1.cfg | 2 +- data/test/scenarios/test_menu_items.cfg | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/test/maps/pathfind_1.cfg b/data/test/maps/pathfind_1.cfg index 7bd4806b725..b7ecd8a7830 100644 --- a/data/test/maps/pathfind_1.cfg +++ b/data/test/maps/pathfind_1.cfg @@ -50,7 +50,7 @@ Gg, Gs, Gs, Hh, Gg^Efm, Gs^Fms, Hh^Fms, Mm, Wwf, Wwf, Ww, Ww, Wo, Wo, Ww, Ww, Ww Hh, Gg, Gg, Gg, Gg, Gg^Efm, Gg, Wwf, Ww, Ww, Wo, Wo, Wo, Ww, Wwf, Wwf, Gg, Gg, Gg, Gg, Rr, Rr, Gg, Rr, Hh, Hh^Fms, Hh, Gg, Gg^Fp, Wwf, Ww, Wwf, Wwf, Wwf, Wwf, Gg, Gg, Gs, Gg, Gs, Gg^Fp, Hh^Fms, Mm, Hh, Gg^Fms, Rr, Gg, Gs, Gg Gs^Fp, Hh, Mm, Hh^Fds, Gs^Fp, Hh, Wwf, Wwf, Ww, Wo, Wo, Wo, Wo, Ww, Wwf, Mm, Hh^Fms, Hh, Rr, Rr, Hh^Fds, Mm, Hh^Fds, Gg^Fms, Gg^Fet, Mm, Gg^Uf, Gg^Fms, Wwf, Wwf, Ww, Ww, Ww, Ww, Ww, Wwf, Wwf, Wwf, Wwf, Gg, Gg^Fms, Mm, Mm, Mm, Gg^Uf, Rr, Uu^Uf, Gg^Efm, Gg^Fet " -random_starting_time=no +random_start_time=no turns=-1 victory_when_enemies_defeated=yes [time] diff --git a/data/test/scenarios/test_menu_items.cfg b/data/test/scenarios/test_menu_items.cfg index 3eaa3fadb7b..69ffd0b6d10 100644 --- a/data/test/scenarios/test_menu_items.cfg +++ b/data/test/scenarios/test_menu_items.cfg @@ -41,10 +41,10 @@ description="spawn a unit" [filter_location] [not] - [have_unit] + [filter] x=$x1 y=$y1 - [/have_unit] + [/filter] [/not] [/filter_location] [command]