Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

op2ext for Outpost 2 v1.4.x #303

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

op2ext for Outpost 2 v1.4.x #303

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
fcc7949
op2ext changes for 1.4.0
Dec 4, 2020
874c451
Add [OPU]/libs to DLL search paths.
Dec 5, 2020
d1404d0
Fixes to DLL-less ini mods. Added GetModuleDirectoryCount, GetModuleD…
Dec 7, 2020
ac462d8
Change GetFilePath() hook now that OPUPatch is mod directory-aware.
Dec 7, 2020
d32f11c
Removed outdated comment in ModuleLoader.cpp.
Dec 7, 2020
77fd2f2
Update comment in op2ext.h to reflect module dirs being relative to O…
Dec 7, 2020
303ee13
Add [mod dir]/libs to OS DLL search paths.
Dec 7, 2020
9ff800e
Bump version to 3.1.0. Update ReadMe.txt. Add license.
Jan 18, 2021
c707488
Update LICENSE
Feb 13, 2021
cd4d9c5
Fix GCC build errors
Arklon1 Feb 14, 2021
20c64d7
Fix more GCC build errors
Arklon1 Feb 14, 2021
7846556
Fix unit test ConsoleModuleLoader.ModuleWithoutDLL
Brett208 Feb 21, 2021
87851c8
Use std library call create_directories when creating module directories
Brett208 Mar 9, 2021
b2bf990
Rewrite function name to be more specific
Brett208 Mar 9, 2021
082a8dc
Remove tests that rely on specific module Count
Brett208 Mar 9, 2021
a738b74
Add a dll filename to ini file when testing
Brett208 Mar 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions test/ConsoleModule.test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ TEST(ConsoleModuleLoader, ModuleWithoutDLL)

// Test will need temporary module directory with no DLL present
// Ensure module directory ends with a trailing slash

const auto opuDirectory = GetOpuDirectory();
fs::create_directory(opuDirectory); // create_directory throws if parent directory does not exist

const auto moduleDirectory = fs::path(GetOpuDirectory()) / moduleName;
fs::create_directory(moduleDirectory);
Brett208 marked this conversation as resolved.
Show resolved Hide resolved

Expand All @@ -25,14 +29,17 @@ TEST(ConsoleModuleLoader, ModuleWithoutDLL)
EXPECT_NO_THROW(moduleLoader.LoadModules());
EXPECT_NO_THROW(moduleLoader.RunModules());

EXPECT_EQ(moduleName + "\\", moduleLoader.GetModuleDirectory(0));
EXPECT_EQ(moduleName, moduleLoader.GetModuleName(0));

EXPECT_TRUE(moduleLoader.IsModuleLoaded(moduleName));
EXPECT_FALSE(moduleLoader.IsModuleLoaded(""));
EXPECT_FALSE(moduleLoader.IsModuleLoaded("UnknownModule"));

EXPECT_EQ(1u, moduleLoader.Count());
// Because IsModuleLoaded returned true previously, moduleName will find a match
for (std::size_t i = 0; i < moduleLoader.Count(); ++i) {
if (moduleName == moduleLoader.GetModuleName(i)) {
EXPECT_EQ(moduleName + "\\", moduleLoader.GetModuleDirectory(i));
break;
}
}

EXPECT_NO_THROW(moduleLoader.UnloadModules());

Expand Down