diff --git a/include/test/test.h b/include/test/test.h index a708067585..9e95d837fa 100644 --- a/include/test/test.h +++ b/include/test/test.h @@ -259,7 +259,7 @@ static inline struct Benchmark BenchmarkStop(void) #define PARAMETRIZE if (gFunctionTestRunnerState->parameters++ == gFunctionTestRunnerState->runParameter) -#define PARAMETRIZE_LABEL(f, label) if (gFunctionTestRunnerState->parameters++ == gFunctionTestRunnerState->runParameter && (Test_MgbaPrintf(":N%s: " f " (%d/%d)", gTestRunnerState.test->name, label, gFunctionTestRunnerState->runParameter + 1, gFunctionTestRunnerState->parameters), 1)) +#define PARAMETRIZE_LABEL(f, ...) if (gFunctionTestRunnerState->parameters++ == gFunctionTestRunnerState->runParameter && (Test_MgbaPrintf(":N%s: (%d/%d) " f, gTestRunnerState.test->name, gFunctionTestRunnerState->runParameter + 1, gFunctionTestRunnerState->parameters, __VA_ARGS__), 1)) #define SET_RNG(tag, value) SetupRiggedRng(__LINE__, tag, value) diff --git a/test/species.c b/test/species.c index f9ca25fa74..aaa0e0a087 100644 --- a/test/species.c +++ b/test/species.c @@ -13,7 +13,7 @@ TEST("Form species ID tables are shared between all forms") { if (gSpeciesInfo[i].formSpeciesIdTable) { - PARAMETRIZE_LABEL("%S", gSpeciesInfo[i].speciesName) { species = i; } + PARAMETRIZE_LABEL("ID:%d - %S", i, gSpeciesInfo[i].speciesName) { species = i; } } } @@ -36,7 +36,7 @@ TEST("Form change tables contain only forms in the form species ID table") { if (gSpeciesInfo[i].formChangeTable) { - PARAMETRIZE_LABEL("%S", gSpeciesInfo[i].speciesName) { species = i; } + PARAMETRIZE_LABEL("ID:%d - %S", i, gSpeciesInfo[i].speciesName) { species = i; } } } @@ -71,7 +71,7 @@ TEST("Forms have the appropriate species form changes") || gSpeciesInfo[i].isUltraBurst || gSpeciesInfo[i].isPrimalReversion) { - PARAMETRIZE_LABEL("%S", gSpeciesInfo[i].speciesName) { species = i; } + PARAMETRIZE_LABEL("ID:%d - %S", i, gSpeciesInfo[i].speciesName) { species = i; } } } bool32 hasBattleEnd = FALSE, hasFaint = FALSE; @@ -111,7 +111,7 @@ TEST("Form change targets have the appropriate species flags") { if (gSpeciesInfo[i].formChangeTable) { - PARAMETRIZE_LABEL("%S", gSpeciesInfo[i].speciesName) { species = i; } + PARAMETRIZE_LABEL("ID:%d - %S", i, gSpeciesInfo[i].speciesName) { species = i; } } } @@ -148,7 +148,8 @@ TEST("No species has two evolutions that use the evolution tracker") for (i = 0; i < NUM_SPECIES; i++) { - if (IsSpeciesEnabled(i) && GetSpeciesEvolutions(i) != NULL) PARAMETRIZE { species = i; } + if (IsSpeciesEnabled(i) && GetSpeciesEvolutions(i) != NULL) + PARAMETRIZE_LABEL("ID:%d - %S", i, GetSpeciesName(i)) { species = i; } } evolutionTrackerEvolutions = 0; @@ -190,7 +191,7 @@ TEST("Every species has a description") for (i = 1; i < NUM_SPECIES; i++) { if (IsSpeciesEnabled(i)) - PARAMETRIZE { species = i; } + PARAMETRIZE_LABEL("ID:%d - %S", i, GetSpeciesName(i)) { species = i; } } EXPECT_NE(StringCompare(GetSpeciesPokedexDescription(species), gFallbackPokedexText), 0);