Update tests for network code refactoring

Drop coverage stats for sources outside of technic directory (technic_cnc, technic_worldgen)
Update technic API functions for tests (were exported just for tests, now part of API)

Move CNC tests, use shared fixtures for tests

Author: S-S-X

technic/spec/api_spec.lua

@@ -6,6 +6,7 @@ require("mineunit")
 
 -- Load fixtures required by tests
 fixture("technic")
+sourcefile("init")
 
 describe("Technic API", function()
 

technic/spec/building_spec.lua

@@ -32,7 +32,7 @@ describe("Power network building", function()
 			assert.equals(1, #net.PR_nodes)
 			assert.equals(3, count(net.all_nodes))
 			world.set_node(build_pos, {name="technic:hv_cable", param2=0})
-			technic.network_node_on_placenode(build_pos, {"HV"}, "technic:hv_cable")
+			technic.place_network_node(build_pos, {"HV"}, "technic:hv_cable")
 		end)
 
 		it("is added to network", function()
@@ -72,7 +72,7 @@ describe("Power network building", function()
 			assert.equals(1, #net.PR_nodes)
 			assert.equals(4, count(net.all_nodes))
 			world.set_node(build_pos, {name="technic:hv_cable", param2=0})
-			technic.network_node_on_placenode(build_pos, {"HV"}, "technic:hv_cable")
+			technic.place_network_node(build_pos, {"HV"}, "technic:hv_cable")
 		end)
 
 		it("is added to network", function()
@@ -94,7 +94,7 @@ describe("Power network building", function()
 
 		it("does not duplicate already added machine", function()
 			world.set_node(build_pos2, {name="technic:hv_cable", param2=0})
-			technic.network_node_on_placenode(build_pos2, {"HV"}, "technic:hv_cable")
+			technic.place_network_node(build_pos2, {"HV"}, "technic:hv_cable")
 			assert.equals(2, #net.PR_nodes)
 			assert.equals(7, count(net.all_nodes))
 		end)
@@ -129,7 +129,7 @@ describe("Power network building", function()
 			assert.equals(2, #net.PR_nodes)
 			assert.equals(6, count(net.all_nodes))
 			world.set_node(build_pos, {name="technic:hv_generator",param2=0})
-			technic.network_node_on_placenode(build_pos, {"HV"}, "technic:hv_generator")
+			technic.place_network_node(build_pos, {"HV"}, "technic:hv_generator")
 		end)
 
 		it("is added to network without duplicates", function()
@@ -156,7 +156,7 @@ describe("Power network building", function()
 
 		it("overloads network", function()
 			world.set_node(build_pos2, {name="technic:hv_generator",param2=0})
-			technic.network_node_on_placenode(build_pos2, {"HV"}, "technic:hv_generator")
+			technic.place_network_node(build_pos2, {"HV"}, "technic:hv_generator")
 			assert.not_nil(technic.is_overloaded(net.id))
 			assert.not_nil(technic.is_overloaded(net2.id))
 		end)
@@ -182,7 +182,7 @@ describe("Power network building", function()
 			assert.equals(1, count(net.all_nodes))
 			assert.equals(1, count(net2.all_nodes))
 			world.set_node(build_pos, {name="technic:hv_cable", param2=0})
-			technic.network_node_on_placenode(build_pos, {"HV"}, "technic:hv_cable")
+			technic.place_network_node(build_pos, {"HV"}, "technic:hv_cable")
 		end)
 
 		it("removes network", function()
@@ -211,7 +211,7 @@ describe("Power network building", function()
 			assert.equals(2, #net.PR_nodes)
 			assert.equals(6, count(net.all_nodes))
 			world.set_node(build_pos, {name="air",param2=0})
-			technic.network_node_on_dignode(build_pos, {"HV"}, "technic:hv_cable")
+			technic.remove_network_node(build_pos, {"HV"}, "technic:hv_cable")
 		end)
 
 		--[[ NOTE: Whole network is currently removed when cutting cables
@@ -260,7 +260,7 @@ describe("Power network building", function()
 			assert.equals(2, #net.PR_nodes)
 			assert.equals(8, count(net.all_nodes))
 			world.set_node(build_pos, {name="air",param2=0})
-			technic.network_node_on_dignode(build_pos, {"HV"}, "technic:hv_cable")
+			technic.remove_network_node(build_pos, {"HV"}, "technic:hv_cable")
 		end)
 
 		it("is removed from network", function()
@@ -279,7 +279,7 @@ describe("Power network building", function()
 
 		it("keeps connected machines in network", function()
 			world.set_node(build_pos2, {name="air",param2=0})
-			technic.network_node_on_dignode(build_pos2, {"HV"}, "technic:hv_cable")
+			technic.remove_network_node(build_pos2, {"HV"}, "technic:hv_cable")
 			assert.same({x=101,y=911,z=100}, net.all_nodes[minetest.hash_node_position({x=101,y=911,z=100})])
 			assert.equals(1, #net.PR_nodes)
 			assert.equals(5, count(net.all_nodes))
@@ -307,7 +307,7 @@ describe("Power network building", function()
 			assert.equals(3, #net.PR_nodes)
 			assert.equals(7, count(net.all_nodes))
 			world.set_node(build_pos, {name="air",param2=0})
-			technic.network_node_on_dignode(build_pos, {"HV"}, "technic:hv_generator")
+			technic.remove_network_node(build_pos, {"HV"}, "technic:hv_generator")
 		end)
 
 		it("is removed from network", function()

technic/spec/fixtures/default.lua

@@ -1,10 +1,14 @@
 
-local function register_node(name)
-	minetest.register_node(":default:"..name, {
+mineunit:set_modpath("default", "spec/fixtures")
+
+local function register_node(name, groups, additional_definition)
+	local definition = {
 		description = name.." description",
 		tiles = { "default_"..name },
-		groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2},
-	})
+		groups = groups,
+	}
+	for k,v in pairs(additional_definition or {}) do definition[k] = v end
+	minetest.register_node(":default:"..name, definition)
 end
 
 local function register_item(name)
@@ -13,12 +17,15 @@ local function register_item(name)
 	})
 end
 
-register_node("furnace")
-register_node("stone")
-register_node("cobble")
-register_node("sand")
-register_node("sandstone")
-register_node("wood")
-register_node("steelblock")
+-- Register some basic nodes for cutting, grinding, digging, registering recipes etc.
+register_node("stone", {cracky = 3, stone = 1}, {is_ground_content = true, drop = "default:cobble"})
+register_node("cobble", {cracky=3, stone = 2})
+register_node("sand", {snappy=2, choppy=2, oddly_breakable_by_hand=2})
+register_node("wood", {tree=1, choppy=2, oddly_breakable_by_hand=2})
+register_node("dirt", {crumbly = 3, soil = 1})
+register_node("sandstone", {crumbly = 1, cracky = 3})
+register_node("steelblock", {cracky = 1, level = 2})
+register_node("furnace", {cracky=2})
+register_node("furnace_active", {cracky=2, not_in_creative_inventory=1}, {drop = "default:furnace"})
 
 register_item("steel_ingot")

technic_cnc/spec/fixtures/digilines.lua renamed to technic/spec/fixtures/digilines.lua

@@ -1,10 +1,12 @@
 
+-- Simple digilines mod fixture that logs sent messages, works with some simple digiline mods
+
 mineunit:set_modpath("digilines", "spec/fixtures")
 
-_G.digilines = {
+digilines = {
 	_msg_log = {},
 	receptor_send = function(pos, rules, channel, msg)
-		table.insert(_G.digilines._msg_log, {
+		table.insert(digilines._msg_log, {
 			pos = pos,
 			rules = rules,
 			channel = channel,
@@ -28,3 +30,8 @@ _G.digilines = {
 		}
 	}
 }
+
+digilines = setmetatable(digilines, {
+	__call = function(self,...) return self end,
+	__index = function(...) return function(...)end end,
+})

technic/spec/fixtures/network.lua

@@ -37,6 +37,7 @@ technic.register_tier("MV", "Busted MV")
 technic.register_tier("HV", "Busted HV")
 
 sourcefile("machines/network")
+sourcefile("machines/overload")
 
 sourcefile("machines/register/cables")
 sourcefile("machines/LV/cables")

technic/spec/fixtures/technic.lua

@@ -13,8 +13,6 @@ mineunit("voxelmanip")
 -- Load fixtures required by tests
 fixture("default")
 fixture("mesecons")
+fixture("digilines")
 fixture("pipeworks")
 fixture("technic_worldgen")
-
--- Load mod
-sourcefile("init")

technic/spec/fixtures/technic_cnc.lua

@@ -6,6 +6,7 @@ require("mineunit")
 
 -- Load complete technic mod
 fixture("technic")
+sourcefile("init")
 
 describe("HV machine network", function()
 

technic/spec/hv_network_spec.lua

@@ -6,6 +6,7 @@ require("mineunit")
 
 -- Load complete technic mod
 fixture("technic")
+sourcefile("init")
 
 describe("LV machine network", function()
 

technic/spec/lv_network_spec.lua

@@ -5,4 +5,6 @@ exclude = {
 	-- These are commented out, not part of mod without manually editing code
 	"machines/MV/lighting",
 	"machines/MV/power_radiator",
+	-- Exclude everything outside of technic directory, some are tested but we do not want stats for these
+	"^../"
 }

technic/spec/mineunit.conf

@@ -6,6 +6,7 @@ require("mineunit")
 
 -- Load complete technic mod
 fixture("technic")
+sourcefile("init")
 
 describe("Technic node placement", function()
 

technic/spec/nodes_spec.lua

@@ -45,7 +45,7 @@ describe("Supply converter", function()
 			assert.equals(0, #net2.RE_nodes)
 			assert.equals(1, count(net2.all_nodes))
 			world.set_node(build_pos, {name="technic:supply_converter",param2=0})
-			technic.network_node_on_placenode(build_pos, {"HV"}, "technic:supply_converter")
+			technic.place_network_node(build_pos, {"HV"}, "technic:supply_converter")
 		end)
 
 		it("is added to network without duplicates", function()
@@ -77,7 +77,7 @@ describe("Supply converter", function()
 		it("overloads network", function()
 			pending("overload does not work with supply converter")
 			world.set_node(build_pos2, {name="technic:supply_converter",param2=0})
-			technic.network_node_on_placenode(build_pos2, {"HV"}, "technic:supply_converter")
+			technic.place_network_node(build_pos2, {"HV"}, "technic:supply_converter")
 			assert.not_nil(technic.is_overloaded(net.id))
 			assert.is_nil(technic.is_overloaded(net2.id))
 			assert.not_nil(technic.is_overloaded(net3.id))
@@ -104,7 +104,7 @@ describe("Supply converter", function()
 			assert.equals(1, #net.RE_nodes)
 			assert.equals(4, count(net.all_nodes))
 			world.set_node(build_pos, {name="air",param2=0})
-			technic.network_node_on_dignode(build_pos, {"HV"}, "technic:supply_converter")
+			technic.remove_network_node(build_pos, {"HV"}, "technic:supply_converter")
 		end)
 
 		it("is removed from network", function()

technic/spec/supply_converter_spec.lua

@@ -55,15 +55,38 @@ describe("CNC digiline API", function()
 		assert.equals(1, meta:get_int("size"))
 	end)
 
-	it("disables machine", function()
-		action(pos, table.copy(node), "ch1", "disable")
+	it("sets size", function()
+		action(pos, table.copy(node), "ch1", { size = 2 })
 		local meta = minetest.get_meta(pos)
+		assert.equals("cylinder", meta:get("program"))
+		assert.equals(2, meta:get_int("size"))
+	end)
+
+	it("table disables machine", function()
+		local meta = minetest.get_meta(pos)
+		assert.is_true(technic_cnc.is_enabled(meta))
+		action(pos, table.copy(node), "ch1", { enabled = false })
 		assert.is_false(technic_cnc.is_enabled(meta))
 	end)
 
-	it("enables machine", function()
-		action(pos, table.copy(node), "ch1", "enable")
+	it("table enables machine", function()
+		local meta = minetest.get_meta(pos)
+		assert.is_false(technic_cnc.is_enabled(meta))
+		action(pos, table.copy(node), "ch1", { enabled = true })
+		assert.is_true(technic_cnc.is_enabled(meta))
+	end)
+
+	it("string disables machine", function()
+		local meta = minetest.get_meta(pos)
+		assert.is_true(technic_cnc.is_enabled(meta))
+		action(pos, table.copy(node), "ch1", "disable")
+		assert.is_false(technic_cnc.is_enabled(meta))
+	end)
+
+	it("string enables machine", function()
 		local meta = minetest.get_meta(pos)
+		assert.is_false(technic_cnc.is_enabled(meta))
+		action(pos, table.copy(node), "ch1", "enable")
 		assert.is_true(technic_cnc.is_enabled(meta))
 	end)
 
@@ -78,4 +101,20 @@ describe("CNC digiline API", function()
 		assert.not_nil(response.msg.sphere)
 	end)
 
+	it("returns status", function()
+		local count = #digilines._msg_log
+		action(pos, table.copy(node), "ch1", "status")
+		assert.equals(count + 1, #digilines._msg_log)
+		local response = digilines._msg_log[#digilines._msg_log]
+		assert.is_table(response)
+		assert.is_table(response.msg)
+		assert.equals("ch1", response.channel)
+		assert.is_boolean(response.msg.enabled)
+		assert.is_number(response.msg.time)
+		assert.is_number(response.msg.size)
+		assert.is_string(response.msg.program)
+		assert.is_string(response.msg.user)
+		assert.is_table(response.msg.material)
+	end)
+
 end)

technic_cnc/spec/digilines_spec.lua

@@ -1,3 +1,8 @@
+time_step = 100
 exclude = {
-	"../technic/",
+	"^../"
+}
+-- Using helper at technic/spec/fixtures/technic.lua for loading technic mod
+fixture_paths = {
+	"../technic/spec/fixtures",
 }