mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-03 17:30:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Cherrypick remaining changes from the feature/catch2 branch sans the big switch to SGCT 3.0

Browse Source
This commit is contained in:
Alexander Bock
2020-02-11 00:21:42 +01:00
parent 9cb1169d58
commit c8799dcc80
25 changed files with 92 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_assetloader.cpp
+4 -4
View File
@@ -55,7 +55,7 @@ TEST_CASE("AssetLoader: Assertion", "[assetloader]") {
ghoul::lua::LuaState* state = openspace::global::scriptEngine.luaState();
openspace::SynchronizationWatcher syncWatcher;
openspace::AssetLoader assetLoader(
*state,
state,
&syncWatcher,
FileSys.absolutePath("${TESTDIR}/AssetLoaderTest/")
);
@@ -69,7 +69,7 @@ TEST_CASE("AssetLoader: Basic Export Import", "[assetloader]") {
ghoul::lua::LuaState* state = openspace::global::scriptEngine.luaState();
openspace::SynchronizationWatcher syncWatcher;
openspace::AssetLoader assetLoader(
*state,
state,
&syncWatcher,
FileSys.absolutePath("${TESTDIR}/AssetLoaderTest/")
);
@@ -82,7 +82,7 @@ TEST_CASE("AssetLoader: Asset Functions", "[assetloader]") {
ghoul::lua::LuaState* state = openspace::global::scriptEngine.luaState();
openspace::SynchronizationWatcher syncWatcher;
openspace::AssetLoader assetLoader(
*state,
state,
&syncWatcher,
FileSys.absolutePath("${TESTDIR}/AssetLoaderTest/")
);
@@ -95,7 +95,7 @@ TEST_CASE("AssetLoader: Asset Initialization", "[assetloader]") {
ghoul::lua::LuaState* state = openspace::global::scriptEngine.luaState();
openspace::SynchronizationWatcher syncWatcher;
openspace::AssetLoader assetLoader(
*state,
state,
&syncWatcher,
FileSys.absolutePath("${TESTDIR}/AssetLoaderTest/")
);