Add unit tests for SAO load / unload behaviour

src/script/scripting_server.cpp

@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "server.h"
 #include "log.h"
 #include "settings.h"
+#include "filesys.h"
 #include "cpp_api/s_internal.h"
 #include "lua_api/l_areastore.h"
 #include "lua_api/l_auth.h"
@@ -89,6 +90,12 @@ ServerScripting::ServerScripting(Server* server):
 	infostream << "SCRIPTAPI: Initialized game modules" << std::endl;
 }
 
+void ServerScripting::loadBuiltin()
+{
+	loadMod(Server::getBuiltinLuaPath() + DIR_DELIM "init.lua", BUILTIN_MOD_NAME);
+	checkSetByBuiltin();
+}
+
 void ServerScripting::saveGlobals()
 {
 	SCRIPTAPI_PRECHECKHEADER

src/script/scripting_server.h

@@ -49,6 +49,7 @@ class ServerScripting:
 public:
 	ServerScripting(Server* server);
 
+	void loadBuiltin();
 	// use ScriptApiBase::loadMod() to load mods
 
 	// Save globals that are copied into other Lua envs

src/server.cpp

@@ -471,8 +471,7 @@ void Server::init()
 	// Must be created before mod loading because we have some inventory creation
 	m_inventory_mgr = std::make_unique<ServerInventoryManager>();
 
-	m_script->loadMod(getBuiltinLuaPath() + DIR_DELIM "init.lua", BUILTIN_MOD_NAME);
-	m_script->checkSetByBuiltin();
+	m_script->loadBuiltin();
 
 	m_gamespec.checkAndLog();
 	m_modmgr->loadMods(m_script);

src/serverenvironment.cpp

@@ -1637,7 +1637,8 @@ void ServerEnvironment::step(float dtime)
 	}
 
 	// Send outdated detached inventories
-	m_server->sendDetachedInventories(PEER_ID_INEXISTENT, true);
+	if (!m_players.empty())
+		m_server->sendDetachedInventories(PEER_ID_INEXISTENT, true);
 
 	// Notify mods of modified mapblocks
 	if (m_on_mapblocks_changed_receiver.receiving &&

src/unittest/CMakeLists.txt

@@ -26,6 +26,7 @@ set (UNITTEST_SRCS
 	${CMAKE_CURRENT_SOURCE_DIR}/test_objdef.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_profiler.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_random.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/test_sao.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_schematic.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_serialization.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/test_serveractiveobjectmgr.cpp

src/unittest/mock_server.h

@@ -17,7 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include <server.h>
+#include "server.h"
 
 class MockServer : public Server
 {
@@ -29,6 +29,9 @@ class MockServer : public Server
 		)
 	{}
 
+	void start() = delete;
+	void stop() = delete;
+
 private:
 	void SendChatMessage(session_t peer_id, const ChatMessage &message) {}
 };

src/unittest/test_moveaction.cpp

@@ -22,10 +22,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mock_inventorymanager.h"
 #include "mock_server.h"
 #include "mock_serveractiveobject.h"
-
 #include "scripting_server.h"
 
-
 class TestMoveAction : public TestBase
 {
 public:
@@ -74,7 +72,7 @@ void TestMoveAction::runTests(IGameDef *gamedef)
 
 	ServerScripting server_scripting(&server);
 	try {
-		server_scripting.loadMod(Server::getBuiltinLuaPath() + DIR_DELIM "init.lua", BUILTIN_MOD_NAME);
+		server_scripting.loadBuiltin();
 		server_scripting.loadMod(helper_lua, BUILTIN_MOD_NAME);
 	} catch (ModError &e) {
 		// Print backtrace in case of syntax errors