dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-16 05:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix disabled serializer tests

Browse source 
test_hash depends on modmod for xml schemas. InitAttributes need to be
set as deep freezing expects them to be a valid object. The map used got
renamed at some point. Finally prior to running the sim PreInitGame()
and InitGame() need to be called.

Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
This commit is contained in:
Ralph Sennhauser 2025-11-02 08:01:31 +01:00
parent 0599848330
commit 296ccc78c9
No known key found for this signature in database
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/simulation2/tests/test_Serializer.h
View file

@ -32,6 +32,7 @@
#include "ps/Loader.h"
#include "ps/XML/Xeromyces.h"
#include "scriptinterface/FunctionWrapper.h"
#include "scriptinterface/Object.h"
#include "scriptinterface/ScriptInterface.h"
#include "scriptinterface/ScriptRequest.h"
#include "simulation2/Simulation2.h"
@ -896,6 +897,7 @@ public:
CXeromycesEngine xeromycesEngine;
g_VFS = CreateVfs();
TS_ASSERT_OK(g_VFS->Mount(L"", DataDir() / "mods" / "mod" / "", VFS_MOUNT_MUST_EXIST));
TS_ASSERT_OK(g_VFS->Mount(L"", DataDir() / "mods" / "public" / "", VFS_MOUNT_MUST_EXIST));
TS_ASSERT_OK(g_VFS->Mount(L"cache", DataDir() / "_testcache" / "", 0, VFS_MAX_PRIORITY));
@ -904,16 +906,22 @@ public:
CSimulation2 sim2{nullptr, *g_ScriptContext, &terrain, CSimulation2::DEFAULT_SCRIPTS};
sim2.ResetState();
JS::RootedValue attribs(sim2.GetScriptInterface().GetGeneralJSContext());
Script::CreateObject(ScriptRequest(sim2.GetScriptInterface()), &attribs);
sim2.SetInitAttributes(attribs);
std::unique_ptr<CMapReader> mapReader = std::make_unique<CMapReader>();
PS::Loader::BeginRegistering();
mapReader->LoadMap(L"maps/skirmishes/Greek Acropolis (2).pmp",
mapReader->LoadMap(L"maps/skirmishes/greek_acropolis_2p.pmp",
sim2.GetScriptInterface().GetContext(), JS::UndefinedHandleValue,
&terrain, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
&sim2, &sim2.GetSimContext(), -1, false);
PS::Loader::EndRegistering();
TS_ASSERT_OK(PS::Loader::NonprogressiveLoad());
sim2.PreInitGame();
sim2.InitGame();
sim2.Update(0);
{