Deukhoofd/PkmnLibSharp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adds ScopedOwner class, that disposes owned values when garbage collected.

Browse Source
This commit is contained in:
Deukhoofd
2021-01-15 16:53:32 +01:00
parent 7e31bba05e
commit 7807ee9676
18 changed files with 195 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
PkmnLibSharpTests/Battling/BattleTests/BasicBattleTests.cs
View File

@@ -16,12 +16,12 @@ namespace PkmnLibSharpTests.Battling.BattleTests
{
var lib = BattleLibraryHelper.GetLibrary();
var battle = new BattleBuilder(lib, true, 2, 1).Build();
Assert.AreEqual(lib, battle.Library);
Assert.AreEqual(true, battle.CanFlee);
Assert.AreEqual(2, battle.SidesCount);
Assert.AreEqual(false, battle.HasEnded);
Assert.AreEqual(0, battle.PartiesCount);
battle.Dispose();
Assert.AreEqual(lib, battle.Value.Library);
Assert.AreEqual(true, battle.Value.CanFlee);
Assert.AreEqual(2, battle.Value.SidesCount);
Assert.AreEqual(false, battle.Value.HasEnded);
Assert.AreEqual(0, battle.Value.PartiesCount);
battle.Value.Dispose();
}
private static PokemonParty BuildTestParty(BattleLibrary lib)
@@ -45,10 +45,10 @@ namespace PkmnLibSharpTests.Battling.BattleTests
.WithPartyOnPositions(p1, new BattlePosition(0, 0))
.WithPartyOnPositions(p2, new BattlePosition(1, 0))
.Build();
Assert.AreEqual(2, battle.PartiesCount);
Assert.AreEqual(p1, battle.Parties[0].Party);
Assert.AreEqual(p2, battle.Parties[1].Party);
battle.Dispose();
Assert.AreEqual(2, battle.Value.PartiesCount);
Assert.AreEqual(p1, battle.Value.Parties[0].Party);
Assert.AreEqual(p2, battle.Value.Parties[1].Party);
battle.Value.Dispose();
}
[Test]
@@ -63,19 +63,19 @@ namespace PkmnLibSharpTests.Battling.BattleTests
.WithPartyOnPositions(p2, new BattlePosition(1, 0))
.Build();
battle.SwitchPokemon(0, 0, p1.GetAtIndex(0));
battle.SwitchPokemon(1, 0, p2.GetAtIndex(0));
Assert.AreEqual(0, battle.CurrentTurn);
battle.Value.SwitchPokemon(0, 0, p1.GetAtIndex(0));
battle.Value.SwitchPokemon(1, 0, p2.GetAtIndex(0));
Assert.AreEqual(0, battle.Value.CurrentTurn);
var moveTurn1 = new MoveTurnChoice(p1.GetAtIndex(0), p1.GetAtIndex(0).Moves[0], 1, 0 );
var moveTurn2 = new MoveTurnChoice(p2.GetAtIndex(0), p2.GetAtIndex(0).Moves[0], 0, 0 );
Assert.That(battle.TrySetChoice(moveTurn1));
Assert.That(battle.TrySetChoice(moveTurn2));
Assert.That(battle.Value.TrySetChoice(moveTurn1));
Assert.That(battle.Value.TrySetChoice(moveTurn2));
Assert.AreEqual(battle.CurrentTurn, 1);
Assert.AreEqual(battle.Value.CurrentTurn, 1);
battle.Dispose();
battle.Value.Dispose();
}
[Test]
@@ -97,18 +97,18 @@ namespace PkmnLibSharpTests.Battling.BattleTests
evts.Add(evt);
return Task.CompletedTask;
});
battle.RegisterEventListener(eventListener);
battle.Value.RegisterEventListener(eventListener);
battle.SwitchPokemon(0, 0, p1.GetAtIndex(0));
battle.SwitchPokemon(1, 0, p2.GetAtIndex(0));
Assert.AreEqual(0, battle.CurrentTurn);
battle.Value.SwitchPokemon(0, 0, p1.GetAtIndex(0));
battle.Value.SwitchPokemon(1, 0, p2.GetAtIndex(0));
Assert.AreEqual(0, battle.Value.CurrentTurn);
var moveTurn1 = new MoveTurnChoice(p1.GetAtIndex(0), p1.GetAtIndex(0).Moves[0], 1, 0 );
var moveTurn2 = new MoveTurnChoice(p2.GetAtIndex(0), p2.GetAtIndex(0).Moves[0], 0, 0 );
Assert.That(battle.TrySetChoice(moveTurn1));
Assert.That(battle.TrySetChoice(moveTurn2));
Assert.AreEqual(1, battle.CurrentTurn);
Assert.That(battle.Value.TrySetChoice(moveTurn1));
Assert.That(battle.Value.TrySetChoice(moveTurn2));
Assert.AreEqual(1, battle.Value.CurrentTurn);
eventListener.EnsureFinishedListening();
@@ -117,7 +117,7 @@ namespace PkmnLibSharpTests.Battling.BattleTests
Assert.AreEqual(damageEvents[0].Pokemon, p2.GetAtIndex(0));
Assert.AreEqual(damageEvents[1].Pokemon, p1.GetAtIndex(0));
battle.Dispose();
battle.Value.Dispose();
}
[Test]
@@ -140,21 +140,21 @@ namespace PkmnLibSharpTests.Battling.BattleTests
evts.Add(evt);
return Task.CompletedTask;
});
battle.RegisterEventListener(eventListener);
battle.Value.RegisterEventListener(eventListener);
battle.SwitchPokemon(0, 0, p1.GetAtIndex(0));
battle.SwitchPokemon(1, 0, p2.GetAtIndex(0));
Assert.AreEqual(0, battle.CurrentTurn);
battle.Value.SwitchPokemon(0, 0, p1.GetAtIndex(0));
battle.Value.SwitchPokemon(1, 0, p2.GetAtIndex(0));
Assert.AreEqual(0, battle.Value.CurrentTurn);
var moveTurn1 = new MoveTurnChoice(p1.GetAtIndex(0), p1.GetAtIndex(0).Moves[0], 1, 0 );
var moveTurn2 = new MoveTurnChoice(p2.GetAtIndex(0), p2.GetAtIndex(0).Moves[0], 0, 0 );
Assert.That(battle.TrySetChoice(moveTurn1));
Assert.That(battle.TrySetChoice(moveTurn2));
Assert.That(battle.Value.TrySetChoice(moveTurn1));
Assert.That(battle.Value.TrySetChoice(moveTurn2));
Assert.AreEqual(battle.CurrentTurn, 1);
Assert.AreEqual(battle.Value.CurrentTurn, 1);
battle.Dispose();
battle.Value.Dispose();
mon1.Heal(1000, true);
mon2.Heal(1000, true);

14
PkmnLibSharpTests/Battling/PokemonBuilderTests.cs
View File

@@ -13,9 +13,9 @@ namespace PkmnLibSharpTests.Battling
var lib = BattleLibraryHelper.GetLibrary();
var pokemon = new PokemonBuilder(lib, "testSpecies", 50)
.Build();
Assert.AreEqual("testSpecies", pokemon.Species.Name);
Assert.AreEqual(50, pokemon.Level);
Assert.AreEqual("default", pokemon.Forme.Name);
Assert.AreEqual("testSpecies", pokemon.Value.Species.Name);
Assert.AreEqual(50, pokemon.Value.Level);
Assert.AreEqual("default", pokemon.Value.Forme.Name);
pokemon.Dispose();
}
@@ -26,7 +26,7 @@ namespace PkmnLibSharpTests.Battling
var pokemon = new PokemonBuilder(lib, "testSpecies", 50)
.WithNickname("cuteNickname")
.Build();
Assert.AreEqual("cuteNickname", pokemon.Nickname);
Assert.AreEqual("cuteNickname", pokemon.Value.Nickname);
pokemon.Dispose();
}
@@ -37,7 +37,7 @@ namespace PkmnLibSharpTests.Battling
var pokemon = new PokemonBuilder(lib, "testSpecies", 50)
.WithGender(Gender.Female)
.Build();
Assert.AreEqual(Gender.Female, pokemon.Gender);
Assert.AreEqual(Gender.Female, pokemon.Value.Gender);
pokemon.Dispose();
}
@@ -49,8 +49,8 @@ namespace PkmnLibSharpTests.Battling
.LearnMove("testMove", MoveLearnMethod.Unknown)
.LearnMove("testMove2", MoveLearnMethod.Level)
.Build();
Assert.AreEqual("testMove", pokemon.Moves[0].Move.Name);
Assert.AreEqual("testMove2", pokemon.Moves[1].Move.Name);
Assert.AreEqual("testMove", pokemon.Value.Moves[0].Move.Name);
Assert.AreEqual("testMove2", pokemon.Value.Moves[1].Move.Name);
pokemon.Dispose();
}