widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/fix_regression_tests into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/fix_regression_tests/+merge/229367

Renamed burners_house => charcoal_kiln in Lua testsuite
-- 
https://code.launchpad.net/~widelands-dev/widelands/fix_regression_tests/+merge/229367
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix_regression_tests into lp:widelands.

=== modified file 'test/maps/lua_testsuite.wmf/scripting/baseimmovables.lua'
--- test/maps/lua_testsuite.wmf/scripting/baseimmovables.lua	2014-07-28 18:30:11 +0000
+++ test/maps/lua_testsuite.wmf/scripting/baseimmovables.lua	2014-08-03 19:20:25 +0000
@@ -98,7 +98,7 @@
    self.none = map:place_immovable("pebble1", map:get_field(19, 10))
    self.small = map:place_immovable("aspen_summer_old", map:get_field(18, 10))
    self.medium = player1:place_building(
-      "burners_house", map:get_field(10,10), false, true
+      "charcoal_kiln", map:get_field(10,10), false, true
    )
    self.big = map:place_immovable("greenland_stones4", map:get_field(20, 10))
    self.big_building = player1:place_building(
@@ -135,8 +135,8 @@
 function immovable_property_tests:test_name_tree()
    assert_equal("aspen_summer_old", self.small.descr.name)
 end
-function immovable_property_tests:test_name_charcoal_burner()
-   assert_equal("burners_house", self.medium.descr.name)
+function immovable_property_tests:test_name_charcoal_kiln()
+   assert_equal("charcoal_kiln", self.medium.descr.name)
 end
 function immovable_property_tests:test_name_stone()
    assert_equal("greenland_stones4", self.big.descr.name)
@@ -151,9 +151,9 @@
 function immovable_property_tests:test_type_tree()
    assert_equal("immovable", self.small.descr.type_name)
 end
-function immovable_property_tests:test_type_charcoal_burner()
+function immovable_property_tests:test_type_charcoal_kiln()
    assert_equal("productionsite", self.medium.descr.type_name)
-   assert_equal("burners_house", self.medium.descr.name)
+   assert_equal("charcoal_kiln", self.medium.descr.name)
 end
 function immovable_property_tests:test_type_stone()
    assert_equal("immovable", self.big.descr.type_name)
@@ -171,7 +171,7 @@
    assert_equal(1, #self.small.fields)
    assert_equal(map:get_field(18,10), self.small.fields[1])
 end
-function immovable_property_tests:test_fields_charcoal_burner()
+function immovable_property_tests:test_fields_charcoal_kiln()
    assert_equal(1, #self.medium.fields)
    assert_equal(map:get_field(10,10), self.medium.fields[1])
 end

=== modified file 'test/maps/lua_testsuite.wmf/scripting/immovables_descriptions.lua'
--- test/maps/lua_testsuite.wmf/scripting/immovables_descriptions.lua	2014-07-26 09:48:21 +0000
+++ test/maps/lua_testsuite.wmf/scripting/immovables_descriptions.lua	2014-08-03 19:20:25 +0000
@@ -352,7 +352,7 @@
 
 function test_descr:test_producers()
 	local ware_description = egbase:get_ware_description("barbarians","coal")
-	assert_equal("burners_house", ware_description.producers[1].name)
+	assert_equal("charcoal_kiln", ware_description.producers[1].name)
 	assert_equal("deeper_coalmine", ware_description.producers[2].name)
 	assert_equal("deep_coalmine", ware_description.producers[3].name)
 	assert_equal("coalmine", ware_description.producers[4].name)