INSANEMODE/OpenAssetTools
1
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-10 14:58:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore: parse includes and assetlists while parsing zone definition

Browse Source
This commit is contained in:
Jan
2025-01-01 18:13:23 +01:00
parent 9852f52a15
commit aa212e0958
74 changed files with 530 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
test/ObjCommonTestUtils.lua Normal file
View File

@ -0,0 +1,53 @@
ObjCommonTestUtils = {}
function ObjCommonTestUtils:include(includes)
if includes:handle(self:name()) then
includedirs {
path.join(TestFolder(), "ObjCommonTestUtils")
}
end
end
function ObjCommonTestUtils:link(links)
links:add(self:name())
links:linkto(ObjCommon)
end
function ObjCommonTestUtils:use()
end
function ObjCommonTestUtils:name()
return "ObjCommonTestUtils"
end
function ObjCommonTestUtils:project()
local folder = TestFolder()
local includes = Includes:create()
local links = Links:create()
project(self:name())
targetdir(TargetDirectoryTest)
location "%{wks.location}/test/%{prj.name}"
kind "StaticLib"
language "C++"
files {
path.join(folder, "ObjCommonTestUtils/**.h"),
path.join(folder, "ObjCommonTestUtils/**.cpp")
}
vpaths {
["*"] = {
path.join(folder, "ObjCommonTestUtils")
}
}
self:include(includes)
ObjCommon:include(includes)
catch2:include(includes)
links:linkto(ObjCommon)
links:linkto(catch2)
links:linkall()
end

0
test/ObjLoadingTests/Mock/MockSearchPath.cpp → test/ObjCommonTestUtils/SearchPath/MockSearchPath.cpp
View File

8
test/ObjLoadingTests/Mock/MockSearchPath.h → test/ObjCommonTestUtils/SearchPath/MockSearchPath.h
View File

@ -1,16 +1,18 @@
#pragma once
#include "SearchPath/ISearchPath.h"
#include <map>
#include <unordered_map>
class MockSearchPath final : public ISearchPath
{
std::map<std::string, std::string> m_file_data_map;
public:
void AddFileData(std::string fileName, std::string fileData);
SearchPathOpenFile Open(const std::string& fileName) override;
const std::string& GetPath() override;
void Find(const SearchPathSearchOptions& options, const std::function<void(const std::string&)>& callback) override;
private:
std::unordered_map<std::string, std::string> m_file_data_map;
};

2
test/ObjLoadingTests.lua
View File

@ -43,10 +43,12 @@ function ObjLoadingTests:project()
}
self:include(includes)
ObjCommonTestUtils:include(includes)
ParserTestUtils:include(includes)
ObjLoading:include(includes)
catch2:include(includes)
links:linkto(ObjCommonTestUtils)
links:linkto(ParserTestUtils)
links:linkto(ObjLoading)
links:linkto(catch2)

2
test/ObjLoadingTests/Game/IW3/StringTable/AssetLoaderStringTableIW3Test.cpp
View File

@ -1,8 +1,8 @@
#include "Game/IW3/StringTable/AssetLoaderStringTableIW3.h"
#include "Game/IW3/GameIW3.h"
#include "Mock/MockSearchPath.h"
#include "Pool/ZoneAssetPools.h"
#include "SearchPath/MockSearchPath.h"
#include "Utils/MemoryManager.h"
#include <catch2/catch_test_macros.hpp>

2
test/ObjLoadingTests/Game/IW4/AssetLoaders/LoaderStringTableIW4Test.cpp
View File

@ -2,7 +2,7 @@
#include "Game/IW4/CommonIW4.h"
#include "Game/IW4/GameIW4.h"
#include "Mock/MockSearchPath.h"
#include "SearchPath/MockSearchPath.h"
#include "Utils/MemoryManager.h"
#include <catch2/catch_test_macros.hpp>

2
test/ObjLoadingTests/Game/IW4/Menu/LoaderMenuListIW4Test.cpp
View File

@ -1,8 +1,8 @@
#include "Game/IW4/Menu/LoaderMenuListIW4.h"
#include "Game/IW4/GameIW4.h"
#include "Mock/MockSearchPath.h"
#include "Parsing/Menu/MenuFileReader.h"
#include "SearchPath/MockSearchPath.h"
#include "Utils/MemoryManager.h"
#include <catch2/catch_test_macros.hpp>

2
test/ObjLoadingTests/Game/IW5/AssetLoaders/LoaderStringTableIW5Test.cpp
View File

@ -1,7 +1,7 @@
#include "Game/IW5/StringTable/LoaderStringTableIW5.h"
#include "Game/IW5/GameIW5.h"
#include "Mock/MockSearchPath.h"
#include "SearchPath/MockSearchPath.h"
#include "Utils/MemoryManager.h"
#include <catch2/catch_test_macros.hpp>

2
test/ObjLoadingTests/Game/T5/AssetLoaders/LoaderStringTableT5Test.cpp
View File

@ -1,7 +1,7 @@
#include "Game/T5/StringTable/LoaderStringTableT5.h"
#include "Game/T5/GameT5.h"
#include "Mock/MockSearchPath.h"
#include "SearchPath/MockSearchPath.h"
#include "Utils/MemoryManager.h"
#include <catch2/catch_test_macros.hpp>

2
test/ObjLoadingTests/Game/T6/AssetLoaders/LoaderStringTableT6Test.cpp
View File

@ -1,7 +1,7 @@
#include "Game/T6/StringTable/LoaderStringTableT6.h"
#include "Game/T6/GameT6.h"
#include "Mock/MockSearchPath.h"
#include "SearchPath/MockSearchPath.h"
#include "Utils/MemoryManager.h"
#include <catch2/catch_test_macros.hpp>

2
test/ZoneCommonTests.lua
View File

@ -45,9 +45,11 @@ function ZoneCommonTests:project()
}
self:include(includes)
ObjCommonTestUtils:include(includes)
ZoneCommon:include(includes)
catch2:include(includes)
links:linkto(ObjCommonTestUtils)
links:linkto(ZoneCommon)
links:linkto(catch2)
links:linkall()

80
test/ZoneCommonTests/Zone/Definition/ZoneDefinitionStreamTests.cpp
View File

@ -1,4 +1,5 @@
#include "Game/T6/T6.h"
#include "SearchPath/MockSearchPath.h"
#include "Zone/Definition/ZoneDefinitionStream.h"
#include <catch2/catch_test_macros.hpp>
@ -19,7 +20,8 @@ material,gradient_top
menu,demo_ingame
)sampledata");
ZoneDefinitionInputStream inputStream(inputData, "test", "test.zone", true);
MockSearchPath mockSearchPath;
ZoneDefinitionInputStream inputStream(inputData, "test", "test.zone", mockSearchPath);
const auto result = inputStream.ReadDefinition();
REQUIRE(result);
@ -50,7 +52,8 @@ menu,demo_ingame
material,demo_material
)sampledata");
ZoneDefinitionInputStream inputStream(inputData, "test", "test.zone", true);
MockSearchPath mockSearchPath;
ZoneDefinitionInputStream inputStream(inputData, "test", "test.zone", mockSearchPath);
const auto result = inputStream.ReadDefinition();
REQUIRE(result);
@ -68,19 +71,34 @@ material,demo_material
>name,test_mod
include,demo_gun
material,asdf
include,demo_scripts
)sampledata");
ZoneDefinitionInputStream inputStream(inputData, "test", "test.zone", true);
MockSearchPath mockSearchPath;
mockSearchPath.AddFileData("demo_gun.zone", R"sampledata(
material,demo_gun_material
)sampledata");
mockSearchPath.AddFileData("demo_scripts.zone", R"sampledata(
rawfile,demo_gun_script.gsc
)sampledata");
ZoneDefinitionInputStream inputStream(inputData, "test", "test.zone", mockSearchPath);
const auto result = inputStream.ReadDefinition();
REQUIRE(result);
REQUIRE(result->m_assets.size() == 3);
REQUIRE(result->m_assets.empty());
REQUIRE(result->m_includes.size() == 2);
REQUIRE(result->m_assets[0].m_asset_name == "demo_gun_material");
REQUIRE(result->m_assets[0].m_asset_type == T6::ASSET_TYPE_MATERIAL);
REQUIRE(result->m_includes[0] == "demo_gun");
REQUIRE(result->m_includes[1] == "demo_scripts");
REQUIRE(result->m_assets[1].m_asset_name == "asdf");
REQUIRE(result->m_assets[1].m_asset_type == T6::ASSET_TYPE_MATERIAL);
REQUIRE(result->m_assets[2].m_asset_name == "demo_gun_script.gsc");
REQUIRE(result->m_assets[2].m_asset_type == T6::ASSET_TYPE_RAWFILE);
}
TEST_CASE("ZoneDefinitionInputStream: Ensure can include assetlists", "[zonedefinition]")
@ -91,21 +109,47 @@ include,demo_scripts
>name,test_mod
assetlist,code_post_gfx_mp
material,asdf
assetlist,common_mp
material,test_material
)sampledata");
ZoneDefinitionInputStream inputStream(inputData, "test", "test.zone", true);
MockSearchPath mockSearchPath;
mockSearchPath.AddFileData("assetlist/code_post_gfx_mp.csv", R"sampledata(
material,post_fx_mat
rawfile,code_post_gfx_mp
)sampledata");
mockSearchPath.AddFileData("assetlist/common_mp.csv", R"sampledata(
material,common_mat
rawfile,common_mp
)sampledata");
ZoneDefinitionInputStream inputStream(inputData, "test", "test.zone", mockSearchPath);
const auto result = inputStream.ReadDefinition();
REQUIRE(result);
REQUIRE(result->m_assets.size() == 6);
REQUIRE(result->m_assets.size() == 1);
REQUIRE(result->m_asset_lists.size() == 2);
REQUIRE(result->m_assets[0].m_asset_name == "post_fx_mat");
REQUIRE(result->m_assets[0].m_asset_type == T6::ASSET_TYPE_MATERIAL);
REQUIRE(result->m_asset_lists[0] == "code_post_gfx_mp");
REQUIRE(result->m_asset_lists[1] == "common_mp");
REQUIRE(result->m_assets[1].m_asset_name == "code_post_gfx_mp");
REQUIRE(result->m_assets[1].m_asset_type == T6::ASSET_TYPE_RAWFILE);
REQUIRE(result->m_assets[2].m_asset_name == "asdf");
REQUIRE(result->m_assets[2].m_asset_type == T6::ASSET_TYPE_MATERIAL);
REQUIRE(result->m_assets[3].m_asset_name == "common_mat");
REQUIRE(result->m_assets[3].m_asset_type == T6::ASSET_TYPE_MATERIAL);
REQUIRE(result->m_assets[4].m_asset_name == "common_mp");
REQUIRE(result->m_assets[4].m_asset_type == T6::ASSET_TYPE_RAWFILE);
REQUIRE(result->m_assets[5].m_asset_name == "test_material");
REQUIRE(result->m_assets[5].m_asset_type == T6::ASSET_TYPE_MATERIAL);
}
TEST_CASE("ZoneDefinitionInputStream: Ensure can define other build targets", "[zonedefinition]")
@ -122,7 +166,8 @@ material,test_material
build,more_mods
)sampledata");
ZoneDefinitionInputStream inputStream(inputData, "test", "test.zone", true);
MockSearchPath mockSearchPath;
ZoneDefinitionInputStream inputStream(inputData, "test", "test.zone", mockSearchPath);
const auto result = inputStream.ReadDefinition();
REQUIRE(result);
@ -147,7 +192,8 @@ ignore,common_mp
material,test_material
)sampledata");
ZoneDefinitionInputStream inputStream(inputData, "test", "test.zone", true);
MockSearchPath mockSearchPath;
ZoneDefinitionInputStream inputStream(inputData, "test", "test.zone", mockSearchPath);
const auto result = inputStream.ReadDefinition();
REQUIRE(result);
@ -171,7 +217,8 @@ material,test_material
material,test_material
)sampledata");
ZoneDefinitionInputStream inputStream(inputData, "test", "test.zone", true);
MockSearchPath mockSearchPath;
ZoneDefinitionInputStream inputStream(inputData, "test", "test.zone", mockSearchPath);
const auto result = inputStream.ReadDefinition();
REQUIRE(result);
@ -197,7 +244,8 @@ material,test_material
>level.ipak_read,code_post_gfx
)sampledata");
ZoneDefinitionInputStream inputStream(inputData, "test", "test.zone", true);
MockSearchPath mockSearchPath;
ZoneDefinitionInputStream inputStream(inputData, "test", "test.zone", mockSearchPath);
const auto result = inputStream.ReadDefinition();
REQUIRE(result);