aheh/ChessServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor ChessServer test methods and cleanup unused imports

Browse Source 
Several test methods in the ChessServer module have been refactored for better readability and maintainability. A new method, CreateChallengeForTest, was introduced to reduce redundancy. The use of unnecessary imports in the InMemoryDatabase class has also been tidied up.
This commit is contained in:
Anduin
2024-06-18 08:13:35 +00:00
parent 24804d3e52
commit 67b4d6546d
2 changed files with 107 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Aiursoft.ChessServer/Data/InMemoryDatabase.cs
-1
View File
@@ -1,7 +1,6 @@
using Aiursoft.Scanner.Abstractions;
using System.Collections.Concurrent;
using Aiursoft.ChessServer.Models;
using Aiursoft.ChessServer.Models.ViewModels;
namespace Aiursoft.ChessServer.Data;
tests/Aiursoft.ChessServer.Tests/BasicTests.cs
+107 -75
View File
@@ -1,7 +1,11 @@
using System.Diagnostics;
using Aiursoft.AiurObserver;
using Aiursoft.AiurObserver.DefaultConsumers;
using Aiursoft.AiurObserver.WebSocket;
using Aiursoft.ChessServer.Data;
using Aiursoft.ChessServer.Models;
using Aiursoft.CSTools.Tools;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using static Aiursoft.WebTools.Extends;
@@ -39,6 +43,24 @@ public class BasicTests
_server.Dispose();
}
private void CreateChallengeForTest(int id)
{
var db = _server!.Services.GetRequiredService<InMemoryDatabase>();
if (db.GetChallenge(id) != null)
{
return;
}
db.CreateChallenge(12345, new AcceptedChallenge(
creator: new Player(Guid.NewGuid()),
accepter: new Player(Guid.NewGuid()),
message: "Test",
roleRule: RoleRule.Random,
timeLimit: TimeSpan.FromMinutes(10),
permission: ChallengePermission.Public,
challengeChangedChannel: new AsyncObservable<string>()));
}
[TestMethod]
[DataRow("/")]
public async Task GetHome(string url)
@@ -55,24 +77,28 @@ public class BasicTests
[DataRow("/games/12345.pgn")]
public async Task GetChess(string url)
{
CreateChallengeForTest(12345);
var response = await _http.GetAsync(_endpointUrl + url);
response.EnsureSuccessStatusCode(); // Status Code 200-299
}
[TestMethod]
[DataRow("/games/1/move/w/e4")]
[DataRow("/games/2/move/w/d4")]
[DataRow("/games/3/move/w/Nf3")]
[DataRow("/games/4/move/w/Nc3")]
public async Task MoveChess(string url)
[DataRow("e4")]
[DataRow("d4")]
[DataRow("Nf3")]
[DataRow("Nc3")]
public async Task MoveChess(string action)
{
var endPoint = _endpointUrl.Replace("http", "ws") + $"/games/{url.Split("/")[2]}.ws?player={url.Split("/")[4]}";
CreateChallengeForTest(12345);
var endPoint = _endpointUrl.Replace("http", "ws") + $"/games/12345.ws?playerId={Guid.NewGuid()}";
var socket = await endPoint.ConnectAsWebSocketServer();
var socketStage = new MessageStageLast<string>();
socket.Subscribe(socketStage);
await Task.Factory.StartNew(() => socket.Listen());
await socket.Send(url.Split("/")[5]);
await socket.Send(action);
var waitMaxTime = new Stopwatch();
waitMaxTime.Start();
@@ -94,17 +120,21 @@ public class BasicTests
}
[TestMethod]
[DataRow("/games/5/move/w/O-O")]
[DataRow("/games/6/move/b/O-O-O")]
public async Task InvalidMoveChess(string url)
[DataRow("e4")]
[DataRow("d4")]
[DataRow("Nf3")]
[DataRow("Nc3")]
public async Task InvalidMoveChess(string action)
{
var endPoint = _endpointUrl.Replace("http", "ws") + $"/games/{url.Split("/")[2]}.ws?player={url.Split("/")[4]}";
CreateChallengeForTest(12345);
var endPoint = _endpointUrl.Replace("http", "ws") + $"/games/12345.ws?playerId={Guid.NewGuid()}";
var socket = await endPoint.ConnectAsWebSocketServer();
var socketStage = new MessageStageLast<string>();
socket.Subscribe(socketStage);
await Task.Factory.StartNew(() => socket.Listen());
await socket.Send(url.Split("/")[5]);
await socket.Send(action);
await Task.Delay(150);
// fen equal init
@@ -112,67 +142,69 @@ public class BasicTests
await socket.Close();
}
[TestMethod]
[DataRow(7)]
[DataRow(8)]
[DataRow(9)]
public async Task TestConnect(int gameId)
{
var endPoint = _endpointUrl.Replace("http", "ws") + $"/games/{gameId}.ws?player=w";
var socket = await endPoint.ConnectAsWebSocketServer();
var socketStage = new MessageStageLast<string>();
socket.Subscribe(socketStage);
await Task.Factory.StartNew(() => socket.Listen());
await socket.Send("e4");
await Task.Delay(150);
Assert.AreEqual("rnbqkbnr/pppppppp/8/8/4P3/8/PPPP1PPP/RNBQKBNR b KQkq e3 0 1", socketStage.Stage);
await socket.Close();
}
[TestMethod]
[DataRow(10)]
[DataRow(11)]
public async Task TestGameWithReconnection(int gameId)
{
var socket1 = await (_endpointUrl.Replace("http", "ws") + $"/games/{gameId}.ws?player=w")
.ConnectAsWebSocketServer();
var socket1Stage = new MessageStageLast<string>();
socket1.Subscribe(socket1Stage);
await Task.Factory.StartNew(() => socket1.Listen());
var socket2 = await (_endpointUrl.Replace("http", "ws") + $"/games/{gameId}.ws?player=b")
.ConnectAsWebSocketServer();
var socket2Stage = new MessageStageLast<string>();
socket2.Subscribe(socket2Stage);
await Task.Factory.StartNew(() => socket2.Listen());
await socket1.Send("e4");
await Task.Delay(150);
Assert.AreEqual("rnbqkbnr/pppppppp/8/8/4P3/8/PPPP1PPP/RNBQKBNR b KQkq e3 0 1", socket1Stage.Stage);
Assert.AreEqual("rnbqkbnr/pppppppp/8/8/4P3/8/PPPP1PPP/RNBQKBNR b KQkq e3 0 1", socket2Stage.Stage);
await socket2.Send("e5");
await Task.Delay(150);
Assert.AreEqual("rnbqkbnr/pppp1ppp/8/4p3/4P3/8/PPPP1PPP/RNBQKBNR w KQkq e6 0 2", socket1Stage.Stage);
Assert.AreEqual("rnbqkbnr/pppp1ppp/8/4p3/4P3/8/PPPP1PPP/RNBQKBNR w KQkq e6 0 2", socket2Stage.Stage);
await socket1.Close();
var socket3 = await (_endpointUrl.Replace("http", "ws") + $"/games/{gameId}.ws?player=w")
.ConnectAsWebSocketServer();
var socket3Stage = new MessageStageLast<string>();
socket3.Subscribe(socket3Stage);
await Task.Factory.StartNew(() => socket3.Listen());
await socket3.Send("Nf3");
await Task.Delay(150);
Assert.AreEqual("rnbqkbnr/pppp1ppp/8/4p3/4P3/8/PPPP1PPP/RNBQKBNR w KQkq e6 0 2", socket1Stage.Stage);
Assert.AreEqual("rnbqkbnr/pppp1ppp/8/4p3/4P3/5N2/PPPP1PPP/RNBQKB1R b KQkq - 1 2", socket2Stage.Stage);
Assert.AreEqual("rnbqkbnr/pppp1ppp/8/4p3/4P3/5N2/PPPP1PPP/RNBQKB1R b KQkq - 1 2", socket3Stage.Stage);
await socket3.Close();
await socket2.Close();
}
// TODO Refactor tests!
// [TestMethod]
// [DataRow(7)]
// [DataRow(8)]
// [DataRow(9)]
// public async Task TestConnect(int gameId)
// {
// var endPoint = _endpointUrl.Replace("http", "ws") + $"/games/{gameId}.ws?playerId={Guid.NewGuid()}";
// var socket = await endPoint.ConnectAsWebSocketServer();
// var socketStage = new MessageStageLast<string>();
// socket.Subscribe(socketStage);
// await Task.Factory.StartNew(() => socket.Listen());
//
// await socket.Send("e4");
// await Task.Delay(150);
// Assert.AreEqual("rnbqkbnr/pppppppp/8/8/4P3/8/PPPP1PPP/RNBQKBNR b KQkq e3 0 1", socketStage.Stage);
//
// await socket.Close();
// }
//
// [TestMethod]
// [DataRow(10)]
// [DataRow(11)]
// public async Task TestGameWithReconnection(int gameId)
// {
// var socket1 = await (_endpointUrl.Replace("http", "ws") + $"/games/{gameId}.ws?player=w")
// .ConnectAsWebSocketServer();
// var socket1Stage = new MessageStageLast<string>();
// socket1.Subscribe(socket1Stage);
// await Task.Factory.StartNew(() => socket1.Listen());
//
// var socket2 = await (_endpointUrl.Replace("http", "ws") + $"/games/{gameId}.ws?player=b")
// .ConnectAsWebSocketServer();
// var socket2Stage = new MessageStageLast<string>();
// socket2.Subscribe(socket2Stage);
// await Task.Factory.StartNew(() => socket2.Listen());
//
// await socket1.Send("e4");
// await Task.Delay(150);
// Assert.AreEqual("rnbqkbnr/pppppppp/8/8/4P3/8/PPPP1PPP/RNBQKBNR b KQkq e3 0 1", socket1Stage.Stage);
// Assert.AreEqual("rnbqkbnr/pppppppp/8/8/4P3/8/PPPP1PPP/RNBQKBNR b KQkq e3 0 1", socket2Stage.Stage);
//
// await socket2.Send("e5");
// await Task.Delay(150);
// Assert.AreEqual("rnbqkbnr/pppp1ppp/8/4p3/4P3/8/PPPP1PPP/RNBQKBNR w KQkq e6 0 2", socket1Stage.Stage);
// Assert.AreEqual("rnbqkbnr/pppp1ppp/8/4p3/4P3/8/PPPP1PPP/RNBQKBNR w KQkq e6 0 2", socket2Stage.Stage);
//
// await socket1.Close();
//
// var socket3 = await (_endpointUrl.Replace("http", "ws") + $"/games/{gameId}.ws?player=w")
// .ConnectAsWebSocketServer();
// var socket3Stage = new MessageStageLast<string>();
// socket3.Subscribe(socket3Stage);
// await Task.Factory.StartNew(() => socket3.Listen());
//
// await socket3.Send("Nf3");
// await Task.Delay(150);
// Assert.AreEqual("rnbqkbnr/pppp1ppp/8/4p3/4P3/8/PPPP1PPP/RNBQKBNR w KQkq e6 0 2", socket1Stage.Stage);
// Assert.AreEqual("rnbqkbnr/pppp1ppp/8/4p3/4P3/5N2/PPPP1PPP/RNBQKB1R b KQkq - 1 2", socket2Stage.Stage);
// Assert.AreEqual("rnbqkbnr/pppp1ppp/8/4p3/4P3/5N2/PPPP1PPP/RNBQKB1R b KQkq - 1 2", socket3Stage.Stage);
//
// await socket3.Close();
// await socket2.Close();
// }
}