Move all battle state from IPokemon to an ephemeral IBattlePokemon wrapper
This commit is contained in:
@@ -12,7 +12,7 @@ namespace PkmnLib.Plugin.Gen7.Tests.Scripts.Moves;
|
||||
/// </summary>
|
||||
public class AfterYouTests
|
||||
{
|
||||
private static IMoveChoice CreateChoice(IPokemon user, uint speed)
|
||||
private static IMoveChoice CreateChoice(IBattlePokemon user, uint speed)
|
||||
{
|
||||
var choice = Substitute.For<IMoveChoice>();
|
||||
choice.User.Returns(user);
|
||||
@@ -25,16 +25,14 @@ public class AfterYouTests
|
||||
var script = new AfterYou();
|
||||
var move = Substitute.For<IExecutingMove>();
|
||||
var hitData = Substitute.For<IHitData>();
|
||||
move.GetHitData(Arg.Any<IPokemon>(), Arg.Any<byte>()).Returns(hitData);
|
||||
move.GetHitData(Arg.Any<IBattlePokemon>(), Arg.Any<byte>()).Returns(hitData);
|
||||
|
||||
var battle = Substitute.For<IBattle>();
|
||||
battle.ChoiceQueue.Returns(queue);
|
||||
var battleData = Substitute.For<IPokemonBattleData>();
|
||||
battleData.Battle.Returns(battle);
|
||||
|
||||
var user = Substitute.For<IPokemon>();
|
||||
user.BattleData.Returns(battleData);
|
||||
var user = Substitute.For<IBattlePokemon>();
|
||||
move.User.Returns(user);
|
||||
user.Battle.Returns(battle);
|
||||
|
||||
return (script, move, hitData);
|
||||
}
|
||||
@@ -47,9 +45,9 @@ public class AfterYouTests
|
||||
public async Task OnSecondaryEffect_TargetLaterInQueue_TargetMovesNext()
|
||||
{
|
||||
// Arrange
|
||||
var user = Substitute.For<IPokemon>();
|
||||
var target = Substitute.For<IPokemon>();
|
||||
var other = Substitute.For<IPokemon>();
|
||||
var user = Substitute.For<IBattlePokemon>();
|
||||
var target = Substitute.For<IBattlePokemon>();
|
||||
var other = Substitute.For<IBattlePokemon>();
|
||||
// Sorted by speed: user (100), other (75), target (50)
|
||||
var queue = new BattleChoiceQueue([
|
||||
CreateChoice(user, 100), CreateChoice(other, 75), CreateChoice(target, 50),
|
||||
@@ -75,8 +73,8 @@ public class AfterYouTests
|
||||
public void OnSecondaryEffect_TargetAlreadyMoved_Fails()
|
||||
{
|
||||
// Arrange
|
||||
var user = Substitute.For<IPokemon>();
|
||||
var target = Substitute.For<IPokemon>();
|
||||
var user = Substitute.For<IBattlePokemon>();
|
||||
var target = Substitute.For<IBattlePokemon>();
|
||||
// Sorted by speed: target (100), user (50)
|
||||
var queue = new BattleChoiceQueue([
|
||||
CreateChoice(target, 100), CreateChoice(user, 50),
|
||||
@@ -103,8 +101,8 @@ public class AfterYouTests
|
||||
public void OnSecondaryEffect_TargetAlreadyNext_Fails()
|
||||
{
|
||||
// Arrange
|
||||
var user = Substitute.For<IPokemon>();
|
||||
var target = Substitute.For<IPokemon>();
|
||||
var user = Substitute.For<IBattlePokemon>();
|
||||
var target = Substitute.For<IBattlePokemon>();
|
||||
// Sorted by speed: user (100), target (50)
|
||||
var queue = new BattleChoiceQueue([
|
||||
CreateChoice(user, 100), CreateChoice(target, 50),
|
||||
@@ -132,7 +130,7 @@ public class AfterYouTests
|
||||
var (script, move, hitData) = CreateTestSetup(null);
|
||||
|
||||
// Act
|
||||
script.OnSecondaryEffect(move, Substitute.For<IPokemon>(), 0);
|
||||
script.OnSecondaryEffect(move, Substitute.For<IBattlePokemon>(), 0);
|
||||
|
||||
// Assert
|
||||
hitData.DidNotReceive().Fail();
|
||||
|
||||
Reference in New Issue
Block a user