diff --git a/test/test.gui_script b/test/test.gui_script index 2994f5f..54dcb74 100644 --- a/test/test.gui_script +++ b/test/test.gui_script @@ -3,8 +3,8 @@ local deftest = require("deftest.deftest") local tests = { -- Test list require("test.tests.test_button"), - --require("test.tests.test_hover"), - --require("test.tests.test_drag"), + require("test.tests.test_hover"), + require("test.tests.test_drag"), require("test.tests.test_back_handler"), require("test.tests.test_blocker"), --require("test.tests.test_static_grid"), diff --git a/test/tests/test_back_handler.lua b/test/tests/test_back_handler.lua index 697aa81..d0e489f 100644 --- a/test/tests/test_back_handler.lua +++ b/test/tests/test_back_handler.lua @@ -7,6 +7,7 @@ return function() local druid = nil local context = nil + describe("Back Handler component", function() before(function() mock_gui = require("deftest.mock.gui") @@ -18,6 +19,7 @@ return function() mock_gui.mock() mock_time.mock() mock_time.set(60) + context = test_helper.get_context() druid = druid_system.new(context) end) diff --git a/test/tests/test_blocker.lua b/test/tests/test_blocker.lua index 191fc47..3c32481 100644 --- a/test/tests/test_blocker.lua +++ b/test/tests/test_blocker.lua @@ -7,6 +7,7 @@ return function() local druid = nil local context = nil + describe("Blocker component", function() before(function() mock_gui = require("deftest.mock.gui") @@ -18,6 +19,7 @@ return function() mock_gui.mock() mock_time.mock() mock_time.set(60) + context = test_helper.get_context() druid = druid_system.new(context) end) diff --git a/test/tests/test_button.lua b/test/tests/test_button.lua index b7f94e2..154803f 100644 --- a/test/tests/test_button.lua +++ b/test/tests/test_button.lua @@ -7,6 +7,7 @@ return function() local druid = nil local context = nil + describe("Button Component", function() before(function() mock_gui = require("deftest.mock.gui") @@ -18,6 +19,7 @@ return function() mock_gui.mock() mock_time.mock() mock_time.set(60) + context = test_helper.get_context() druid = druid_system.new(context) end) diff --git a/test/tests/test_drag.lua b/test/tests/test_drag.lua index d671484..4b25661 100644 --- a/test/tests/test_drag.lua +++ b/test/tests/test_drag.lua @@ -1,12 +1,12 @@ return function() - local mock_gui = require "deftest.mock.gui" - local mock_time = require("deftest.mock.time") - local mock_input = require("test.helper.mock_input") - local test_helper = require("test.helper.test_helper") - local druid_system = require("druid.druid") + local mock_gui = nil + local mock_time = nil + local mock_input = nil + local test_helper = nil + local druid_system = nil local druid = nil - local context = test_helper.get_context() + local context = nil local function create_drag_instance(on_drag) local button = mock_gui.add_box("button", 0, 0, 20, 20) @@ -18,9 +18,17 @@ return function() describe("Drag component", function() before(function() + mock_gui = require("deftest.mock.gui") + mock_time = require("deftest.mock.time") + mock_input = require("test.helper.mock_input") + test_helper = require("test.helper.test_helper") + druid_system = require("druid.druid") + mock_gui.mock() mock_time.mock() mock_time.set(60) + + context = test_helper.get_context() druid = druid_system.new(context) end) diff --git a/test/tests/test_hover.lua b/test/tests/test_hover.lua index 1f8ccee..0d095b6 100644 --- a/test/tests/test_hover.lua +++ b/test/tests/test_hover.lua @@ -1,17 +1,26 @@ return function() - local mock_gui = require "deftest.mock.gui" - local mock_time = require("deftest.mock.time") - local mock_input = require("test.helper.mock_input") - local test_helper = require("test.helper.test_helper") - local druid_system = require("druid.druid") + local mock_gui = nil + local mock_time = nil + local mock_input = nil + local test_helper = nil + local druid_system = nil local druid = nil - local context = test_helper.get_context() + local context = nil + describe("Hover component", function() before(function() + mock_gui = require("deftest.mock.gui") + mock_time = require("deftest.mock.time") + mock_input = require("test.helper.mock_input") + test_helper = require("test.helper.test_helper") + druid_system = require("druid.druid") + mock_gui.mock() mock_time.mock() mock_time.set(60) + + context = test_helper.get_context() druid = druid_system.new(context) end) diff --git a/test/tests/test_static_grid.lua b/test/tests/test_static_grid.lua index 6e67edb..4e17ce7 100644 --- a/test/tests/test_static_grid.lua +++ b/test/tests/test_static_grid.lua @@ -1,12 +1,13 @@ return function() - local mock_gui = require "deftest.mock.gui" - local mock_time = require("deftest.mock.time") - local mock_input = require("test.helper.mock_input") - local test_helper = require("test.helper.test_helper") - local druid_system = require("druid.druid") + local mock_gui = nil + local mock_time = nil + local mock_input = nil + local test_helper = nil + local druid_system = nil local druid = nil - local context = test_helper.get_context() + local context = nil + describe("Static Grid component", function() local parent = nil ---@type druid.static_grid @@ -14,9 +15,17 @@ return function() local prefab = nil before(function() + mock_gui = require("deftest.mock.gui") + mock_time = require("deftest.mock.time") + mock_input = require("test.helper.mock_input") + test_helper = require("test.helper.test_helper") + druid_system = require("druid.druid") + mock_gui.mock() mock_time.mock() mock_time.set(60) + + context = test_helper.get_context() druid = druid_system.new(context) parent = mock_gui.add_box("parent", 0, 0, 50, 50) diff --git a/test/tests/test_template.lua b/test/tests/test_template.lua index 8793a92..ebe405f 100644 --- a/test/tests/test_template.lua +++ b/test/tests/test_template.lua @@ -1,17 +1,26 @@ return function() - local mock_gui = require "deftest.mock.gui" - local mock_time = require("deftest.mock.time") - local mock_input = require("test.helper.mock_input") - local test_helper = require("test.helper.test_helper") - local druid_system = require("druid.druid") + local mock_gui = nil + local mock_time = nil + local mock_input = nil + local test_helper = nil + local druid_system = nil local druid = nil - local context = test_helper.get_context() + local context = nil + describe("Template component", function() before(function() + mock_gui = require("deftest.mock.gui") + mock_time = require("deftest.mock.time") + mock_input = require("test.helper.mock_input") + test_helper = require("test.helper.test_helper") + druid_system = require("druid.druid") + mock_gui.mock() mock_time.mock() mock_time.set(60) + + context = test_helper.get_context() druid = druid_system.new(context) end)