Switch to Vector2

This commit is contained in:
2021-02-26 17:11:08 -06:00
parent 640db4f4a2
commit 715b328ef5
9 changed files with 154 additions and 219 deletions

View File

@@ -1,26 +0,0 @@
using FluentAssertions;
using Gameboard.ShogiUI.BoardState;
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace Gameboard.ShogiUI.UnitTests.BoardState
{
[TestClass]
public class BoardVectorShould
{
[TestMethod]
public void BeEqualWhenPropertiesAreEqual()
{
var a = new BoardVector(3, 2);
var b = new BoardVector(3, 2);
a.Should().Be(b);
a.GetHashCode().Should().Be(b.GetHashCode());
(a == b).Should().BeTrue();
// Properties should not be transitively equal.
b = new BoardVector(2, 3);
a.Should().NotBe(b);
a.GetHashCode().Should().NotBe(b.GetHashCode());
(a == b).Should().BeFalse();
}
}
}

View File

@@ -1,8 +1,9 @@
using FluentAssertions;
using Gameboard.ShogiUI.BoardState;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System;
using System.Linq;
using System.Numerics;
namespace Gameboard.ShogiUI.UnitTests.BoardState
{
[TestClass]
@@ -70,11 +71,11 @@ namespace Gameboard.ShogiUI.UnitTests.BoardState
new Move
{
// Pawn
From = new BoardVector(0, 2),
To = new BoardVector(0, 3)
From = new Vector2(0, 2),
To = new Vector2(0, 3)
}
};
var shogi = new ShogiBoard(moves);
var shogi = ShogiBoard.ConstructWithMoves(moves);
shogi.Board[0, 2].Should().BeNull();
shogi.Board[0, 3].WhichPiece.Should().Be(WhichPiece.Pawn);
}
@@ -86,7 +87,7 @@ namespace Gameboard.ShogiUI.UnitTests.BoardState
var shogi = new ShogiBoard();
// Act - P1 "moves" pawn to the position it already exists at.
var moveSuccess = shogi.TryMove(new Move { From = new BoardVector(0, 2), To = new BoardVector(0, 2) });
var moveSuccess = shogi.Move(new Move { From = new Vector2(0, 2), To = new Vector2(0, 2) });
// Assert
moveSuccess.Should().BeFalse();
@@ -99,12 +100,12 @@ namespace Gameboard.ShogiUI.UnitTests.BoardState
var invalidLanceMove = new Move
{
// Lance moving adjacent
From = new BoardVector(0, 0),
To = new BoardVector(1, 5)
From = new Vector2(0, 0),
To = new Vector2(1, 5)
};
var shogi = new ShogiBoard();
var moveSuccess = shogi.TryMove(invalidLanceMove);
var moveSuccess = shogi.Move(invalidLanceMove);
moveSuccess.Should().BeFalse();
// Assert the Lance has not actually moved.
@@ -118,7 +119,7 @@ namespace Gameboard.ShogiUI.UnitTests.BoardState
var shogi = new ShogiBoard();
// Act - Move Player2 Pawn when it's Player1 turn.
var moveSuccess = shogi.TryMove(new Move { From = new BoardVector(8, 6), To = new BoardVector(8, 5) });
var moveSuccess = shogi.Move(new Move { From = new Vector2(8, 6), To = new Vector2(8, 5) });
// Assert
moveSuccess.Should().BeFalse();
@@ -132,12 +133,12 @@ namespace Gameboard.ShogiUI.UnitTests.BoardState
var invalidLanceMove = new Move
{
// Lance moving through the pawn before it.
From = new BoardVector(0, 0),
To = new BoardVector(0, 5)
From = new Vector2(0, 0),
To = new Vector2(0, 5)
};
var shogi = new ShogiBoard();
var moveSuccess = shogi.TryMove(invalidLanceMove);
var moveSuccess = shogi.Move(invalidLanceMove);
moveSuccess.Should().BeFalse();
// Assert the Lance has not actually moved.
@@ -150,12 +151,12 @@ namespace Gameboard.ShogiUI.UnitTests.BoardState
var invalidKnightMove = new Move
{
// Knight capturing allied Pawn
From = new BoardVector(1, 0),
To = new BoardVector(0, 2)
From = new Vector2(1, 0),
To = new Vector2(0, 2)
};
var shogi = new ShogiBoard();
var moveSuccess = shogi.TryMove(invalidKnightMove);
var moveSuccess = shogi.Move(invalidKnightMove);
moveSuccess.Should().BeFalse();
// Assert the Knight has not actually moved or captured.
@@ -170,20 +171,24 @@ namespace Gameboard.ShogiUI.UnitTests.BoardState
var moves = new[]
{
// P1 Pawn
new Move { From = new BoardVector(2, 2), To = new BoardVector(2, 3) },
new Move { From = new Vector2(2, 2), To = new Vector2(2, 3) },
// P2 Pawn
new Move { From = new BoardVector(6, 6), To = new BoardVector(6, 5) },
new Move { From = new Vector2(6, 6), To = new Vector2(6, 5) },
// P1 Bishop puts P2 in check
new Move { From = new BoardVector(1, 1), To = new BoardVector(6, 6) }
new Move { From = new Vector2(1, 1), To = new Vector2(6, 6) }
};
var shogi = new ShogiBoard(moves);
var shogi = ShogiBoard.ConstructWithMoves(moves);
//foreach(var m in moves)
//{
// shogi.Move(m);
//}
// Prerequisit
shogi.InCheck.Should().Be(WhichPlayer.Player2);
// Act - P2 moves Lance while remaining in check.
var moveSuccess = shogi.TryMove(new Move { From = new BoardVector(8, 8), To = new BoardVector(8, 7) });
var moveSuccess = shogi.Move(new Move { From = new Vector2(8, 8), To = new Vector2(8, 7) });
// Assert
moveSuccess.Should().BeFalse();
@@ -199,15 +204,15 @@ namespace Gameboard.ShogiUI.UnitTests.BoardState
var moves = new[]
{
// P1 Pawn
new Move { From = new BoardVector(2, 2), To = new BoardVector(2, 3) },
new Move { From = new Vector2(2, 2), To = new Vector2(2, 3) },
// P2 Pawn
new Move { From = new BoardVector(6, 6), To = new BoardVector(6, 5) },
new Move { From = new Vector2(6, 6), To = new Vector2(6, 5) },
};
var shogi = new ShogiBoard(moves);
var shogi = ShogiBoard.ConstructWithMoves(moves);
// Act - P1 Bishop, check
shogi.TryMove(new Move { From = new BoardVector(1, 1), To = new BoardVector(6, 6) });
shogi.Move(new Move { From = new Vector2(1, 1), To = new Vector2(6, 6) });
// Assert
shogi.InCheck.Should().Be(WhichPlayer.Player2);
@@ -220,14 +225,14 @@ namespace Gameboard.ShogiUI.UnitTests.BoardState
var moves = new[]
{
// P1 Pawn
new Move { From = new BoardVector(2, 2), To = new BoardVector(2, 3) },
new Move { From = new Vector2(2, 2), To = new Vector2(2, 3) },
// P2 Pawn
new Move { From = new BoardVector(6, 6), To = new BoardVector(6, 5) }
new Move { From = new Vector2(6, 6), To = new Vector2(6, 5) }
};
var shogi = new ShogiBoard(moves);
var shogi = ShogiBoard.ConstructWithMoves(moves);
// Act - P1 Bishop captures P2 Bishop
var moveSuccess = shogi.TryMove(new Move { From = new BoardVector(1, 1), To = new BoardVector(7, 7) });
var moveSuccess = shogi.Move(new Move { From = new Vector2(1, 1), To = new Vector2(7, 7) });
// Assert
moveSuccess.Should().BeTrue();
@@ -244,7 +249,7 @@ namespace Gameboard.ShogiUI.UnitTests.BoardState
// Act - P2 Silver captures P1 Bishop
moveSuccess = shogi.TryMove(new Move { From = new BoardVector(6, 8), To = new BoardVector(7, 7) });
moveSuccess = shogi.Move(new Move { From = new Vector2(6, 8), To = new Vector2(7, 7) });
// Assert
moveSuccess.Should().BeTrue();
@@ -266,14 +271,14 @@ namespace Gameboard.ShogiUI.UnitTests.BoardState
var moves = new[]
{
// P1 Pawn
new Move { From = new BoardVector(2, 2), To = new BoardVector(2, 3) },
new Move { From = new Vector2(2, 2), To = new Vector2(2, 3) },
// P2 Pawn
new Move { From = new BoardVector(6, 6), To = new BoardVector(6, 5) }
new Move { From = new Vector2(6, 6), To = new Vector2(6, 5) }
};
var shogi = new ShogiBoard(moves);
var shogi = ShogiBoard.ConstructWithMoves(moves);
// Act - P1 moves across promote threshold.
var moveSuccess = shogi.TryMove(new Move { From = new BoardVector(1, 1), To = new BoardVector(6, 6), IsPromotion = true });
var moveSuccess = shogi.Move(new Move { From = new Vector2(1, 1), To = new Vector2(6, 6), IsPromotion = true });
// Assert
moveSuccess.Should().BeTrue();
@@ -288,30 +293,30 @@ namespace Gameboard.ShogiUI.UnitTests.BoardState
var moves = new[]
{
// P1 Rook
new Move { From = new BoardVector(7, 1), To = new BoardVector(4, 1) },
new Move { From = new Vector2(7, 1), To = new Vector2(4, 1) },
// P2 Gold
new Move { From = new BoardVector(3, 8), To = new BoardVector(2, 7) },
new Move { From = new Vector2(3, 8), To = new Vector2(2, 7) },
// P1 Pawn
new Move { From = new BoardVector(4, 2), To = new BoardVector(4, 3) },
new Move { From = new Vector2(4, 2), To = new Vector2(4, 3) },
// P2 other Gold
new Move { From = new BoardVector(5, 8), To = new BoardVector(6, 7) },
new Move { From = new Vector2(5, 8), To = new Vector2(6, 7) },
// P1 same Pawn
new Move { From = new BoardVector(4, 3), To = new BoardVector(4, 4) },
new Move { From = new Vector2(4, 3), To = new Vector2(4, 4) },
// P2 Pawn
new Move { From = new BoardVector(4, 6), To = new BoardVector(4, 5) },
new Move { From = new Vector2(4, 6), To = new Vector2(4, 5) },
// P1 Pawn takes P2 Pawn
new Move { From = new BoardVector(4, 4), To = new BoardVector(4, 5) },
new Move { From = new Vector2(4, 4), To = new Vector2(4, 5) },
// P2 King
new Move { From = new BoardVector(4, 8), To = new BoardVector(4, 7) },
new Move { From = new Vector2(4, 8), To = new Vector2(4, 7) },
// P1 Pawn promotes
new Move { From = new BoardVector(4, 5), To = new BoardVector(4, 6), IsPromotion = true },
new Move { From = new Vector2(4, 5), To = new Vector2(4, 6), IsPromotion = true },
// P2 King retreat
new Move { From = new BoardVector(4, 7), To = new BoardVector(4, 8) },
new Move { From = new Vector2(4, 7), To = new Vector2(4, 8) },
};
var shogi = new ShogiBoard(moves);
var shogi = ShogiBoard.ConstructWithMoves(moves);
// Act - P1 Pawn wins by checkmate.
var moveSuccess = shogi.TryMove(new Move { From = new BoardVector(4, 6), To = new BoardVector(4, 7) });
var moveSuccess = shogi.Move(new Move { From = new Vector2(4, 6), To = new Vector2(4, 7) });
// Assert
moveSuccess.Should().BeTrue();