Move all battle state from IPokemon to an ephemeral IBattlePokemon wrapper

Plugins/PkmnLib.Plugin.Gen7.Tests/Scripts/Moves/GrassyTerrainTests.cs

@@ -18,12 +18,10 @@ public class GrassyTerrainTests
         var move = Substitute.For<IExecutingMove>();
 
         var battle = Substitute.For<IBattle>();
-        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, battle);
     }
@@ -40,27 +38,9 @@ public class GrassyTerrainTests
         var (script, move, battle) = CreateTestSetup();
 
         // Act
-        script.OnSecondaryEffect(move, Substitute.For<IPokemon>(), 0);
+        script.OnSecondaryEffect(move, Substitute.For<IBattlePokemon>(), 0);
 
         // Assert
         battle.Received(1).SetTerrain(ScriptUtils.ResolveName<GrassyTerrainScript>());
     }
-
-    /// <summary>
-    /// Technical test: without battle data on the user (outside of battle) the effect does nothing and
-    /// does not throw.
-    /// </summary>
-    [Test]
-    public void OnSecondaryEffect_UserHasNoBattleData_DoesNotSetTerrain()
-    {
-        // Arrange
-        var (script, move, battle) = CreateTestSetup();
-        move.User.BattleData.Returns((IPokemonBattleData?)null);
-
-        // Act
-        script.OnSecondaryEffect(move, Substitute.For<IPokemon>(), 0);
-
-        // Assert
-        battle.DidNotReceiveWithAnyArgs().SetTerrain(default);
-    }
 }