Update tests

Author: Insality

.luacov

@@ -55,7 +55,10 @@ return {
   -- Nothing will be excluded if nothing is listed.
   -- Do not include the '.lua' extension. Path separator is always '/'.
   -- Overrules `include`.
-  exclude = { "^test%/.+$" },
+  exclude = {
+    "^test%/.+$",
+	"^druid/system/utf8.lua$",
+  },
 
   --- Table mapping names of modules to be included to their filenames.
   -- Has no effect if empty.

test/test.gui

@@ -9,3 +9,4 @@ textures {
 }
 material: "/builtins/materials/gui.material"
 adjust_reference: ADJUST_REFERENCE_DISABLED
+max_nodes: 2048

test/test.gui_script

@@ -1,18 +1,20 @@
 local deftest = require("deftest.deftest")
 
 function init(self)
+	deftest.add(require("test.tests.test_druid_instance"))
+	deftest.add(require("test.tests.test_back_handler"))
 	deftest.add(require("test.tests.test_blocker"))
 	deftest.add(require("test.tests.test_button"))
-	deftest.add(require("test.tests.test_hover"))
+	deftest.add(require("test.tests.test_container"))
 	deftest.add(require("test.tests.test_drag"))
-	deftest.add(require("test.tests.test_back_handler"))
+	deftest.add(require("test.tests.test_grid"))
 	deftest.add(require("test.tests.test_helper"))
-	deftest.add(require("test.tests.test_text"))
+	deftest.add(require("test.tests.test_hover"))
 	deftest.add(require("test.tests.test_input"))
 	deftest.add(require("test.tests.test_layout"))
-	deftest.add(require("test.tests.test_container"))
 	deftest.add(require("test.tests.test_rich_text"))
-	deftest.add(require("test.tests.test_druid_instance"))
+	deftest.add(require("test.tests.test_scroll"))
+	deftest.add(require("test.tests.test_text"))
 
 	local is_report = (sys.get_config_int("test.report", 0) == 1)
 	deftest.run({ coverage = { enabled = is_report } })

test/tests/test_blocker.lua

@@ -26,7 +26,7 @@ return function()
 		end)
 
 		it("Should consume input", function()
-			local button_node = gui.new_box_node(vmath.vector3(0, 0, 0), vmath.vector3(100, 100, 0))
+			local button_node = gui.new_box_node(vmath.vector3(0, 0, 0), vmath.vector3(150, 150, 0))
 			local blocker_node = gui.new_box_node(vmath.vector3(0, 0, 0), vmath.vector3(20, 20, 0))
 			local on_click_calls = 0
 
@@ -35,8 +35,8 @@ return function()
 			end)
 			druid:new_blocker(blocker_node)
 
-			druid:on_input(mock_input.click_pressed(40, 40))
-			druid:on_input(mock_input.click_released(40, 40))
+			druid:on_input(mock_input.click_pressed(20, 20))
+			druid:on_input(mock_input.click_released(20, 20))
 			assert(on_click_calls == 1)
 
 			-- Click should been consumed by blocker component

test/tests/test_button.lua

@@ -330,8 +330,8 @@ return function()
 		end)
 
 		it("Should work with click zone", function()
-			local button = gui.new_box_node(vmath.vector3(50, 25, 0), vmath.vector3(100, 50, 0))
-			local zone = gui.new_box_node(vmath.vector3(50, 50, 0), vmath.vector3(50, 50, 0))
+			local button = gui.new_box_node(vmath.vector3(0, 0, 0), vmath.vector3(200, 200, 0))
+			local zone = gui.new_box_node(vmath.vector3(0, 0, 0), vmath.vector3(50, 50, 0))
 			local button_params = {}
 
 			local on_click_calls = 0
@@ -341,12 +341,13 @@ return function()
 
 			local instance = druid:new_button(button, on_click, button_params)
 			instance:set_click_zone(zone)
-			druid:on_input(mock_input.click_pressed(10, 10))
-			druid:on_input(mock_input.click_released(10, 10))
+
+			druid:on_input(mock_input.click_pressed(70, 70))
+			druid:on_input(mock_input.click_released(70, 70))
 			assert(on_click_calls == 0)
 
-			druid:on_input(mock_input.click_pressed(50, 50))
-			druid:on_input(mock_input.click_released(50, 50))
+			druid:on_input(mock_input.click_pressed(10, 10))
+			druid:on_input(mock_input.click_released(10, 10))
 			assert(on_click_calls == 1)
 		end)
 

test/tests/test_drag.lua

@@ -131,7 +131,7 @@ return function()
 			local on_drag_calls = 0
 			local function on_drag() on_drag_calls = on_drag_calls + 1 end
 			local instance = create_drag_instance(on_drag)
-			local zone = gui.new_box_node(vmath.vector3(0, 0, 0), vmath.vector3(10, 10, 0))
+			local zone = gui.new_box_node(vmath.vector3(0, 0, 0), vmath.vector3(20, 20, 0))
 			instance:set_click_zone(zone)
 
 			druid:on_input(mock_input.click_pressed(20, 20))
@@ -149,6 +149,7 @@ return function()
 			assert(instance.is_touch == true)
 
 			druid:on_input(mock_input.input_empty(5, 5))
+			druid:on_input(mock_input.click_released(5, 5))
 			assert(on_drag_calls == 1)
 		end)
 

test/tests/test_druid_instance.lua

@@ -178,6 +178,7 @@ return function()
 
 			local drag = druid_instance:new_drag(button_node, on_drag)
 			drag.style.DRAG_DEADZONE = 0
+			drag.style.NO_USE_SCREEN_KOEF = true
 
 			assert(drag ~= nil)
 			assert(drag.node == button_node)
@@ -187,7 +188,6 @@ return function()
 			druid_instance:on_input(mock_input.input_empty(60, 35))
 			druid_instance:on_input(mock_input.click_released(60, 35))
 
-			print(drag_dx, drag_dy)
 			assert(on_drag_calls == 1)
 			assert(math.floor(drag_dx) == 10)
 			assert(math.floor(drag_dy) == 10)