From e61643e6814d49c4244c49fa561745dc3fc3e80a Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Mon, 11 Nov 2013 21:33:14 -0600 Subject: use set_battle_mon_hp in a test --- tests/test_vba_battle.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tests/test_vba_battle.py') diff --git a/tests/test_vba_battle.py b/tests/test_vba_battle.py index 61c0297..8b02cef 100644 --- a/tests/test_vba_battle.py +++ b/tests/test_vba_battle.py @@ -67,8 +67,7 @@ class BattleTests(unittest.TestCase): self.vba.press(["a"], after=20) # set partymon1 hp to very low - self.vba.write_memory_at(0xc63c, 0) - self.vba.write_memory_at(0xc63d, 1) + self.cry.set_battle_mon_hp(1) # let the enemy attack and kill the pokemon self.battle.skip_until_input_required() -- cgit v1.2.3 From ba6eb203b4afef6179d30a13f6f4037349d79272 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Mon, 11 Nov 2013 21:48:29 -0600 Subject: a test for detecting the yes/no prompt --- tests/test_vba_battle.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'tests/test_vba_battle.py') diff --git a/tests/test_vba_battle.py b/tests/test_vba_battle.py index 8b02cef..8299bea 100644 --- a/tests/test_vba_battle.py +++ b/tests/test_vba_battle.py @@ -88,5 +88,30 @@ class BattleTests(unittest.TestCase): self.assertTrue(self.battle.is_player_turn()) + def test_is_battle_switch_prompt(self): + self.battle.skip_start_text() + self.battle.skip_until_input_required() + + # press "FIGHT" + self.vba.press(["a"], after=20) + + # press the first move ("SCRATCH") + self.vba.press(["a"], after=20) + + # set enemy hp to very low + self.cry.lower_enemy_hp() + + # attack the enemy and kill it + self.battle.skip_until_input_required() + + import time + time.sleep(1) + + # yes/no menu is present, should be detected + self.assertTrue(self.battle.is_switch_prompt()) + + # but it's not mandatory + self.assertFalse(self.battle.is_mandatory_switch()) + if __name__ == "__main__": unittest.main() -- cgit v1.2.3 From 993eaa34517c271f3e076744f96aa479008fdf16 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Mon, 11 Nov 2013 21:52:33 -0600 Subject: fix the is_switch_prompt test --- tests/test_vba_battle.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/test_vba_battle.py') diff --git a/tests/test_vba_battle.py b/tests/test_vba_battle.py index 8299bea..a0338e5 100644 --- a/tests/test_vba_battle.py +++ b/tests/test_vba_battle.py @@ -104,12 +104,12 @@ class BattleTests(unittest.TestCase): # attack the enemy and kill it self.battle.skip_until_input_required() - import time - time.sleep(1) - # yes/no menu is present, should be detected self.assertTrue(self.battle.is_switch_prompt()) + # and input should be required + self.assertTrue(self.is_input_required()) + # but it's not mandatory self.assertFalse(self.battle.is_mandatory_switch()) -- cgit v1.2.3 From d9bb01f2c0aef6d270bc4e2da93af94ea210e8db Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Mon, 11 Nov 2013 21:56:34 -0600 Subject: rename the switch prompt detector --- tests/test_vba_battle.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/test_vba_battle.py') diff --git a/tests/test_vba_battle.py b/tests/test_vba_battle.py index a0338e5..0faa26e 100644 --- a/tests/test_vba_battle.py +++ b/tests/test_vba_battle.py @@ -105,7 +105,7 @@ class BattleTests(unittest.TestCase): self.battle.skip_until_input_required() # yes/no menu is present, should be detected - self.assertTrue(self.battle.is_switch_prompt()) + self.assertTrue(self.battle.is_trainer_switch_prompt()) # and input should be required self.assertTrue(self.is_input_required()) -- cgit v1.2.3 From 2ff3478bfda330fbc379f5278a6d37d7065dd9df Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Mon, 11 Nov 2013 21:57:08 -0600 Subject: fix a typo in the switch prompt test --- tests/test_vba_battle.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/test_vba_battle.py') diff --git a/tests/test_vba_battle.py b/tests/test_vba_battle.py index 0faa26e..c6debc3 100644 --- a/tests/test_vba_battle.py +++ b/tests/test_vba_battle.py @@ -108,7 +108,7 @@ class BattleTests(unittest.TestCase): self.assertTrue(self.battle.is_trainer_switch_prompt()) # and input should be required - self.assertTrue(self.is_input_required()) + self.assertTrue(self.battle.is_input_required()) # but it's not mandatory self.assertFalse(self.battle.is_mandatory_switch()) -- cgit v1.2.3