Organized tests into subfolders (#2822)

rh-hideout · Aug 12, 2023 · d62c0d6 · d62c0d6
1 parent ada2931
commit d62c0d6
Show file tree

Hide file tree

Showing 166 changed files with 527 additions and 489 deletions.
diff --git a/Makefile b/Makefile
@@ -450,7 +450,7 @@ $(OBJ_DIR)/sym_ewram.ld: sym_ewram.txt
 
 # NOTE: Based on C_DEP above, but without NODEP and KEEP_TEMPS handling.
 define TEST_DEP
-$1: $2 $$(shell $(SCANINC) -I include -I tools/agbcc/include -I gflib -I test $2)
+$1: $2 $$(shell $(SCANINC) -I include -I tools/agbcc/include -I gflib $2)
 	@echo "$$(CC1) <flags> -o $$@ $$<"
 	@$$(CPP) $$(CPPFLAGS) $$< | $$(PREPROC) $$< charmap.txt -i | $$(CC1) $$(CFLAGS) -o - - | cat - <(echo -e ".text\n\t.align\t2, 0") | $$(AS) $$(ASFLAGS) -o $$@ -
 endef

diff --git a/test/test_battle.h → include/test/battle.h b/test/test_battle.h → include/test/battle.h
@@ -447,13 +447,13 @@
 #ifndef GUARD_TEST_BATTLE_H
 #define GUARD_TEST_BATTLE_H
 
+#include "global.h"
 #include "battle.h"
 #include "battle_anim.h"
 #include "data.h"
 #include "item.h"
 #include "random.h"
 #include "recorded_battle.h"
-#include "test.h"
 #include "util.h"
 #include "constants/abilities.h"
 #include "constants/battle_anim.h"
@@ -462,6 +462,7 @@
 #include "constants/items.h"
 #include "constants/moves.h"
 #include "constants/species.h"
+#include "test/test.h"
 
 // NOTE: If the stack is too small the test runner will probably crash
 // or loop.

diff --git a/test/test.h → include/test/test.h b/test/test.h → include/test/test.h
diff --git a/test/ability_bad_dreams.c → test/battle/ability/bad_dreams.c b/test/ability_bad_dreams.c → test/battle/ability/bad_dreams.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 ASSUMPTIONS
 {

diff --git a/test/ability_beads_of_ruin.c → test/battle/ability/beads_of_ruin.c b/test/ability_beads_of_ruin.c → test/battle/ability/beads_of_ruin.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 ASSUMPTIONS
 {

diff --git a/test/ability_blaze.c → test/battle/ability/blaze.c b/test/ability_blaze.c → test/battle/ability/blaze.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 SINGLE_BATTLE_TEST("Blaze boosts Fire-type moves in a pinch", s16 damage)
 {

diff --git a/test/ability_clear_body.c → test/battle/ability/clear_body.c b/test/ability_clear_body.c → test/battle/ability/clear_body.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 SINGLE_BATTLE_TEST("Clear Body prevents intimidate")
 {

diff --git a/test/ability_cloud_nine.c → test/battle/ability/cloud_nine.c b/test/ability_cloud_nine.c → test/battle/ability/cloud_nine.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 SINGLE_BATTLE_TEST("Cloud Nine prevents weather effects")
 {

diff --git a/test/ability_compound_eyes.c → test/battle/ability/compound_eyes.c b/test/ability_compound_eyes.c → test/battle/ability/compound_eyes.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 SINGLE_BATTLE_TEST("Compound Eyes raises accuracy")
 {

diff --git a/test/ability_contrary.c → test/battle/ability/contrary.c b/test/ability_contrary.c → test/battle/ability/contrary.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 ASSUMPTIONS
 {

diff --git a/test/ability_cute_charm.c → test/battle/ability/cute_charm.c b/test/ability_cute_charm.c → test/battle/ability/cute_charm.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 SINGLE_BATTLE_TEST("Cute Charm inflicts infatuation on contact")
 {

diff --git a/test/ability_damp.c → test/battle/ability/damp.c b/test/ability_damp.c → test/battle/ability/damp.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 SINGLE_BATTLE_TEST("Damp prevents explosion-like moves from enemies")
 {

diff --git a/test/primal_weather.c → test/battle/ability/desolate_land.c b/test/primal_weather.c → test/battle/ability/desolate_land.c
@@ -1,72 +1,12 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 ASSUMPTIONS
 {
-    ASSUME(gBattleMoves[MOVE_EMBER].power != 0);
-    ASSUME(gBattleMoves[MOVE_EMBER].type == TYPE_FIRE);
     ASSUME(gBattleMoves[MOVE_WATER_GUN].power != 0);
     ASSUME(gBattleMoves[MOVE_WATER_GUN].type == TYPE_WATER);
 }
 
-SINGLE_BATTLE_TEST("Primordial Sea blocks damaging Fire-type moves")
-{
-    GIVEN {
-        PLAYER(SPECIES_KYOGRE) {Item(ITEM_BLUE_ORB);}
-        OPPONENT(SPECIES_WOBBUFFET);
-    } WHEN {
-        TURN { MOVE(opponent, MOVE_EMBER); }
-        TURN { MOVE(opponent, MOVE_EMBER); }
-    } SCENE {
-        MESSAGE("Foe Wobbuffet used Ember!");
-        NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_EMBER, opponent);
-        MESSAGE("The Fire-type attack fizzled out\nin the heavy rain!");
-        NOT HP_BAR(player);
-        MESSAGE("Foe Wobbuffet used Ember!");
-        NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_EMBER, opponent);
-        MESSAGE("The Fire-type attack fizzled out\nin the heavy rain!");
-        NOT HP_BAR(player);
-    } THEN {
-        EXPECT_EQ(player->hp, player->maxHP);
-    }
-}
-
-DOUBLE_BATTLE_TEST("Primordial Sea blocks damaging Fire-type moves and prints the message only once with moves hitting multiple targets")
-{
-    GIVEN {
-        ASSUME(gBattleMoves[MOVE_ERUPTION].power != 0);
-        ASSUME(gBattleMoves[MOVE_ERUPTION].type == TYPE_FIRE);
-        ASSUME(gBattleMoves[MOVE_ERUPTION].target == MOVE_TARGET_BOTH);
-        PLAYER(SPECIES_KYOGRE) {Item(ITEM_BLUE_ORB); {Speed(5);}}
-        PLAYER(SPECIES_WOBBUFFET) {Speed(5);}
-        OPPONENT(SPECIES_WOBBUFFET) {Speed(10);}
-        OPPONENT(SPECIES_WOBBUFFET) {Speed(8);}
-    } WHEN {
-        TURN { MOVE(opponentLeft, MOVE_ERUPTION); }
-    } SCENE {
-        MESSAGE("Foe Wobbuffet used Eruption!");
-        NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_ERUPTION, opponentLeft);
-        MESSAGE("The Fire-type attack fizzled out\nin the heavy rain!");
-        NOT MESSAGE("The Fire-type attack fizzled out\nin the heavy rain!");
-    } THEN {
-        EXPECT_EQ(playerLeft->hp, playerLeft->maxHP);
-        EXPECT_EQ(playerRight->hp, playerRight->maxHP);
-    }
-}
-
-SINGLE_BATTLE_TEST("Primordial Sea does not block a move if pokemon is asleep and uses a Fire-type move") // Sleep/confusion/paralysis all happen before the check for primal weather
-{
-    GIVEN {
-        PLAYER(SPECIES_KYOGRE) {Item(ITEM_BLUE_ORB);}
-        OPPONENT(SPECIES_WOBBUFFET) {Status1(STATUS1_SLEEP);}
-    } WHEN {
-        TURN { MOVE(opponent, MOVE_EMBER); }
-    } SCENE {
-        NOT MESSAGE("The Fire-type attack fizzled out\nin the heavy rain!");
-        MESSAGE("Foe Wobbuffet is fast asleep.");
-    }
-}
-
 SINGLE_BATTLE_TEST("Desolate Land blocks damaging Water-type moves")
 {
     GIVEN {

diff --git a/test/ability_download.c → test/battle/ability/download.c b/test/ability_download.c → test/battle/ability/download.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 ASSUMPTIONS
 {

diff --git a/test/ability_drizzle.c → test/battle/ability/drizzle.c b/test/ability_drizzle.c → test/battle/ability/drizzle.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 SINGLE_BATTLE_TEST("Drizzle summons rain", s16 damage)
 {

diff --git a/test/ability_dry_skin.c → test/battle/ability/dry_skin.c b/test/ability_dry_skin.c → test/battle/ability/dry_skin.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 SINGLE_BATTLE_TEST("Dry Skin causes 1/8th Max HP damage in Sun")
 {

diff --git a/test/ability_electromorphosis.c → test/battle/ability/electromorphosis.c b/test/ability_electromorphosis.c → test/battle/ability/electromorphosis.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 SINGLE_BATTLE_TEST("Electromorphosis sets up Charge when hit by any move")
 {

diff --git a/test/ability_flame_body.c → test/battle/ability/flame_body.c b/test/ability_flame_body.c → test/battle/ability/flame_body.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 SINGLE_BATTLE_TEST("Flame Body inflicts burn on contact")
 {

diff --git a/test/ability_flower_gift.c → test/battle/ability/flower_gift.c b/test/ability_flower_gift.c → test/battle/ability/flower_gift.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 SINGLE_BATTLE_TEST("Flower Gift transforms Cherrim in harsh sunlight")
 {

diff --git a/test/ability_forecast.c → test/battle/ability/forecast.c b/test/ability_forecast.c → test/battle/ability/forecast.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 SINGLE_BATTLE_TEST("Forecast transforms Castform in weather from an opponent's move")
 {

diff --git a/test/ability_full_metal_body.c → test/battle/ability/full_metal_body.c b/test/ability_full_metal_body.c → test/battle/ability/full_metal_body.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 SINGLE_BATTLE_TEST("Full Metal Body prevents intimidate")
 {

diff --git a/test/ability_hunger_switch.c → test/battle/ability/hunger_switch.c b/test/ability_hunger_switch.c → test/battle/ability/hunger_switch.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 SINGLE_BATTLE_TEST("Hunger Switch switches Morpeko's forms at the end of the turn")
 {

diff --git a/test/ability_hydration.c → test/battle/ability/hydration.c b/test/ability_hydration.c → test/battle/ability/hydration.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 SINGLE_BATTLE_TEST("Hydration cures non-volatile Status conditions if it is raining")
 {

diff --git a/test/ability_hyper_cutter.c → test/battle/ability/hyper_cutter.c b/test/ability_hyper_cutter.c → test/battle/ability/hyper_cutter.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 SINGLE_BATTLE_TEST("Hyper Cutter prevents intimidate")
 {

diff --git a/test/ability_ice_body.c → test/battle/ability/ice_body.c b/test/ability_ice_body.c → test/battle/ability/ice_body.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 SINGLE_BATTLE_TEST("Ice Body prevents damage from hail")
 {

diff --git a/test/ability_immunity.c → test/battle/ability/immunity.c b/test/ability_immunity.c → test/battle/ability/immunity.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 SINGLE_BATTLE_TEST("Immunity prevents Poison Sting poison")
 {

diff --git a/test/ability_inner_focus.c → test/battle/ability/inner_focus.c b/test/ability_inner_focus.c → test/battle/ability/inner_focus.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 SINGLE_BATTLE_TEST("Inner Focus prevents intimidate")
 {

diff --git a/test/ability_insomnia.c → test/battle/ability/insomnia.c b/test/ability_insomnia.c → test/battle/ability/insomnia.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 SINGLE_BATTLE_TEST("Insomnia prevents sleep")
 {

diff --git a/test/ability_intimidate.c → test/battle/ability/intimidate.c b/test/ability_intimidate.c → test/battle/ability/intimidate.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 ASSUMPTIONS
 {

diff --git a/test/ability_leaf_guard.c → test/battle/ability/leaf_guard.c b/test/ability_leaf_guard.c → test/battle/ability/leaf_guard.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 SINGLE_BATTLE_TEST("Leaf Guard prevents non-volatile status conditions in sun")
 {

diff --git a/test/ability_limber.c → test/battle/ability/limber.c b/test/ability_limber.c → test/battle/ability/limber.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 SINGLE_BATTLE_TEST("Limber prevents paralysis")
 {

diff --git a/test/ability_magic_bounce.c → test/battle/ability/magic_bounce.c b/test/ability_magic_bounce.c → test/battle/ability/magic_bounce.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 
 SINGLE_BATTLE_TEST("Magic Bounce bounces back status moves")

diff --git a/test/ability_mirror_armor.c → test/battle/ability/mirror_armor.c b/test/ability_mirror_armor.c → test/battle/ability/mirror_armor.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 ASSUMPTIONS
 {

diff --git a/test/ability_oblivious.c → test/battle/ability/oblivious.c b/test/ability_oblivious.c → test/battle/ability/oblivious.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 SINGLE_BATTLE_TEST("Oblivious prevents Infatuation")
 {

diff --git a/test/battle/ability/overcoat.c b/test/battle/ability/overcoat.c
@@ -0,0 +1,21 @@
+#include "global.h"
+#include "test/battle.h"
+
+SINGLE_BATTLE_TEST("Overcoat blocks powder and spore moves")
+{
+    GIVEN {
+        ASSUME(gBattleMoves[MOVE_STUN_SPORE].flags & FLAG_POWDER);
+        PLAYER(SPECIES_WYNAUT);
+        OPPONENT(SPECIES_PINECO) { Ability(ABILITY_OVERCOAT); }
+    } WHEN {
+        TURN { MOVE(player, MOVE_STUN_SPORE); }
+    } SCENE {
+        ABILITY_POPUP(opponent, ABILITY_OVERCOAT);
+        NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_STUN_SPORE, player);
+        MESSAGE("It doesn't affect Foe Pineco…");
+    }
+}
+
+TO_DO_BATTLE_TEST("Overcoat blocks damage from hail");
+TO_DO_BATTLE_TEST("Overcoat blocks damage from sandstorm");
+TO_DO_BATTLE_TEST("Overcoat blocks Effect Spore's effect");
diff --git a/test/ability_overgrow.c → test/battle/ability/overgrow.c b/test/ability_overgrow.c → test/battle/ability/overgrow.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 SINGLE_BATTLE_TEST("Overgrow boosts Grass-type moves in a pinch", s16 damage)
 {

diff --git a/test/ability_own_tempo.c → test/battle/ability/own_tempo.c b/test/ability_own_tempo.c → test/battle/ability/own_tempo.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 SINGLE_BATTLE_TEST("Own Tempo prevents intimidate")
 {

diff --git a/test/ability_pastel_veil.c → test/battle/ability/pastel_veil.c b/test/ability_pastel_veil.c → test/battle/ability/pastel_veil.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 SINGLE_BATTLE_TEST("Pastel Veil prevents Poison Sting poison")
 {

diff --git a/test/ability_poison_point.c → test/battle/ability/poison_point.c b/test/ability_poison_point.c → test/battle/ability/poison_point.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "test_battle.h"
+#include "test/battle.h"
 
 SINGLE_BATTLE_TEST("Poison Point inflicts poison on contact")
 {