thunderbrewhq/squall
1
0
Fork 0
mirror of https://github.com/thunderbrewhq/squall.git synced 2026-02-03 16:39:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(test): add options for other versions of storm.dll

Browse source
This commit is contained in:
Adam Heinermann 2025-10-16 11:50:41 -07:00 • committed by fallenoak
parent 737728b9e8
commit 5190c49019
4 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -80,7 +80,13 @@ if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_BUILD_TYPE STREQUAL "Debug")
endif()
if(WHOA_TEST_STORMDLL)
# Doesn't build squall, but still builds the tests to run against a real Storm.dll
add_definitions(-DWHOA_TEST_STORMDLL)
if(WHOA_STORMDLL_VERSION)
add_definitions(-DWHOA_STORMDLL_VERSION=${WHOA_STORMDLL_VERSION})
else()
add_definitions(-DWHOA_STORMDLL_VERSION=2016)
endif()
add_subdirectory(test/stormdll)
else()
add_subdirectory(storm)

8
CONTRIBUTING.md
View file

@ -21,3 +21,11 @@ Only runnable on Windows. Allows running tests against the original `storm.dll`
3. `cmake --build .`
4. Copy `storm.dll` from your Starcraft 1.17 installation folder to the same directory as `StormTest.exe`.
5. Run `StormTest.exe` from the command line.
To use a different version of Storm.dll, use the following arguments in the cmake command:
| Arguments | Games |
|-----------|-------|
|`-DWHOA_STORMDLL_VERSION=2016`| Starcraft 1.17 |
|`-DWHOA_STORMDLL_VERSION=2009`| Starcraft 1.16.1 |
|`-DWHOA_STORMDLL_VERSION=2003`| Starcraft 1.10 ~ 1.16.0, Diablo II 1.10 ~ 1.13d |

11
test/Region.cpp
View file

@ -809,14 +809,13 @@ TEST_CASE("SRgnGetBoundingRecti", "[region]") {
CHECK_THAT(result, MatchesRecti({ 0, 0, 0, 0 }));
}
SECTION("returns invalid rect when using an invalid region object") {
SECTION("can be called when using an invalid region object") {
HSRGN inval = reinterpret_cast<HSRGN>(1234);
SRgnGetBoundingRecti(inval, &result);
// Casting huge float values to int is inconsistent between compilers
// It is also inconsistent between compile and runtime with the same compiler
// So don't even bother comparing with a value
CHECK_THAT(result, !MatchesRecti({ 0, 0, 0, 0 }));
// Casting huge float values to int is inconsistent between compilers,
// compiler versions, and even between compile and runtime with the same compiler.
// Since this behaviour is undefined and outcomes differ greatly, don't even bother testing the value.
CHECK_NOTHROW(SRgnGetBoundingRecti(inval, &result));
}
SECTION("returns the dimensions of 1 rect (pass-through)") {

4
test/String.cpp
View file

@ -543,6 +543,7 @@ TEST_CASE("SStrVPrintf", "[string]") {
}
}
#if !defined(WHOA_STORMDLL_VERSION) || WHOA_STORMDLL_VERSION >= 2009
TEST_CASE("SStrStr", "[string]") {
char string[] = "foobar";
@ -688,6 +689,7 @@ TEST_CASE("SStrStrI const", "[string]") {
REQUIRE(substring == nullptr);
}
}
#endif
TEST_CASE("SStrTokenize", "[string]") {
SECTION("finds all tokens in comma-delimited string") {
@ -762,6 +764,7 @@ TEST_CASE("SStrTokenize", "[string]") {
}
}
#if !defined(WHOA_STORMDLL_VERSION) || WHOA_STORMDLL_VERSION >= 2016
TEST_CASE("SStrToDouble", "[string]") {
SECTION("converts empty string to double") {
auto result = SStrToDouble("");
@ -920,6 +923,7 @@ TEST_CASE("SStrToFloat", "[string]") {
REQUIRE(SStrToFloat("-1.79769e+310") == -HUGE_VALF);
}
}
#endif
TEST_CASE("SStrToInt", "[string]") {
SECTION("converts empty string to int") {