From 0c4af81a695edfba658283020ef60a509a3b2ad3 Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 7 Jul 2025 16:48:24 +0200
Subject: [PATCH] Fix tests

---
 apps/components_tests/lua/testutilpackage.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/apps/components_tests/lua/testutilpackage.cpp b/apps/components_tests/lua/testutilpackage.cpp
index 1a40886510..47041985f6 100644
--- a/apps/components_tests/lua/testutilpackage.cpp
+++ b/apps/components_tests/lua/testutilpackage.cpp
@@ -12,33 +12,30 @@ namespace
     struct LuaUtilPackageTest : Test
     {
         LuaUtil::LuaState mLuaState{ nullptr, nullptr };
-        sol::state& lua;
 
         LuaUtilPackageTest()
-            : lua(mLuaState.unsafeState())
         {
             mLuaState.addInternalLibSearchPath(
                 std::filesystem::path{ OPENMW_PROJECT_SOURCE_DIR } / "components" / "lua");
-
-            lua["loadInternalLib"] = [this](const std::string& name) { return mLuaState.loadInternalLib(name); };
-            lua.open_libraries(sol::lib::base, sol::lib::math, sol::lib::string);
-            lua["util"] = LuaUtil::initUtilPackage(lua);
+            sol::state_view sol = mLuaState.unsafeState();
+            sol["util"] = LuaUtil::initUtilPackage(sol);
         }
     };
 
     template <typename T>
-    T get(sol::state& lua, const std::string& luaCode)
+    T get(sol::state_view& lua, const std::string& luaCode)
     {
         return lua.safe_script("return " + luaCode).get<T>();
     }
 
-    std::string getAsString(sol::state& lua, std::string luaCode)
+    std::string getAsString(sol::state_view& lua, std::string luaCode)
     {
         return LuaUtil::toString(lua.safe_script("return " + luaCode));
     }
 
     TEST_F(LuaUtilPackageTest, Vector2)
     {
+        sol::state_view lua = mLuaState.unsafeState();
         lua.safe_script("v = util.vector2(3, 4)");
         EXPECT_FLOAT_EQ(get<float>(lua, "v.x"), 3);
         EXPECT_FLOAT_EQ(get<float>(lua, "v.y"), 4);
@@ -71,6 +68,7 @@ namespace
 
     TEST_F(LuaUtilPackageTest, Vector3)
     {
+        sol::state_view lua = mLuaState.unsafeState();
         lua.safe_script("v = util.vector3(5, 12, 13)");
         EXPECT_FLOAT_EQ(get<float>(lua, "v.x"), 5);
         EXPECT_FLOAT_EQ(get<float>(lua, "v.y"), 12);
@@ -107,6 +105,7 @@ namespace
 
     TEST_F(LuaUtilPackageTest, Vector4)
     {
+        sol::state_view lua = mLuaState.unsafeState();
         lua.safe_script("v = util.vector4(5, 12, 13, 15)");
         EXPECT_FLOAT_EQ(get<float>(lua, "v.x"), 5);
         EXPECT_FLOAT_EQ(get<float>(lua, "v.y"), 12);
@@ -146,6 +145,7 @@ namespace
 
     TEST_F(LuaUtilPackageTest, Color)
     {
+        sol::state_view lua = mLuaState.unsafeState();
         lua.safe_script("brown = util.color.rgba(0.75, 0.25, 0, 1)");
         EXPECT_EQ(get<std::string>(lua, "tostring(brown)"), "(0.75, 0.25, 0, 1)");
         lua.safe_script("blue = util.color.rgb(0, 1, 0, 1)");
@@ -162,6 +162,7 @@ namespace
 
     TEST_F(LuaUtilPackageTest, Transform)
     {
+        sol::state_view lua = mLuaState.unsafeState();
         lua["T"] = lua["util"]["transform"];
         lua["v"] = lua["util"]["vector3"];
         EXPECT_ERROR(lua.safe_script("T.identity = nil"), "attempt to index");
@@ -195,6 +196,7 @@ namespace
 
     TEST_F(LuaUtilPackageTest, UtilityFunctions)
     {
+        sol::state_view lua = mLuaState.unsafeState();
         lua.safe_script("v = util.vector2(1, 0):rotate(math.rad(120))");
         EXPECT_FLOAT_EQ(get<float>(lua, "v.x"), -0.5f);
         EXPECT_FLOAT_EQ(get<float>(lua, "v.y"), 0.86602539f);