Compare commits
14 Commits
f6005f3d81
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 73ba6d36a2 | |||
| c656206513 | |||
|
|
55750bb5e5 | ||
|
|
9f9032d9af | ||
|
|
effa82a069 | ||
|
|
25a4d10229 | ||
|
|
ebc50f693d | ||
|
|
396d8070d5 | ||
|
|
6342cc4296 | ||
|
|
bf67c69899 | ||
| 97e5f6876b | |||
| 0503e95d64 | |||
| 4a5fc49c31 | |||
| b5a6b1c653 |
@@ -8,14 +8,14 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
dotnet-version: [ '8.0.x' ]
|
||||
dotnet-version: [ '10.0.x' ]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/checkout@v6
|
||||
- name: Setup dotnet
|
||||
uses: actions/setup-dotnet@v3
|
||||
with:
|
||||
dotnet-version: '8.0.x'
|
||||
dotnet-version: '10.0.x'
|
||||
- name: Install dependencies
|
||||
run: dotnet restore ./src/LittleTown.sln
|
||||
- name: Build
|
||||
|
||||
@@ -24,19 +24,19 @@ jobs:
|
||||
|
||||
steps:
|
||||
- name: Check out the code
|
||||
uses: actions/checkout@v4
|
||||
uses: actions/checkout@v6
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Setup .NET
|
||||
uses: actions/setup-dotnet@v4
|
||||
with:
|
||||
dotnet-version: |
|
||||
8.x
|
||||
10.x
|
||||
- name: "Restore/Build/Test"
|
||||
run: |
|
||||
dotnet test ./src/LittleTown.sln --configuration Release --verbosity normal --logger trx --collect:"XPlat Code Coverage" --logger:"trx;LogFileName=test_results.xml"
|
||||
- name: Combine Coverage Reports # This is because one report is produced per project, and we want one result for all of them.
|
||||
uses: danielpalme/ReportGenerator-GitHub-Action@5.3.8
|
||||
uses: danielpalme/ReportGenerator-GitHub-Action@v5.5.1
|
||||
with:
|
||||
reports: "**/*.cobertura.xml" # REQUIRED # The coverage reports that should be parsed (separated by semicolon). Globbing is supported.
|
||||
targetdir: "${{ github.workspace }}" # REQUIRED # The directory where the generated report should be saved.
|
||||
|
||||
4
.gitignore
vendored
4
.gitignore
vendored
@@ -14,4 +14,6 @@
|
||||
|
||||
bin
|
||||
obj
|
||||
|
||||
report
|
||||
tools/
|
||||
TestResults
|
||||
6
documentation/Coverage.adoc
Normal file
6
documentation/Coverage.adoc
Normal file
@@ -0,0 +1,6 @@
|
||||
Pour générer la couverture en local il faut installer l'outil :
|
||||
- dotnet tool install -g dotnet-reportgenerator-globaltool
|
||||
- dotnet tool install dotnet-reportgenerator-globaltool --tool-path tools
|
||||
|
||||
Pour le lancer
|
||||
- reportgenerator "-reports:src/**/TestResults/**/coverage.cobertura.xml" "-targetdir:./report" "-reporttypes:Html"
|
||||
16
renovate.json
Normal file
16
renovate.json
Normal file
@@ -0,0 +1,16 @@
|
||||
{
|
||||
"extends": [
|
||||
"config:base"
|
||||
],
|
||||
"packageRules": [
|
||||
{
|
||||
"updateTypes": [
|
||||
"minor",
|
||||
"patch",
|
||||
"pin",
|
||||
"digest"
|
||||
],
|
||||
"automerge": false
|
||||
}
|
||||
]
|
||||
}
|
||||
13
scripts/windows/generateCoverage.ps1
Normal file
13
scripts/windows/generateCoverage.ps1
Normal file
@@ -0,0 +1,13 @@
|
||||
|
||||
|
||||
#supprimer les dossiers de tests précédents
|
||||
get-childitem -Include TestResults -Recurse -force | Remove-Item -Force -Recurse
|
||||
|
||||
#lancer les tests
|
||||
dotnet test ./src/LittleTown.sln --configuration Release --verbosity normal --logger trx --collect:"XPlat Code Coverage" --logger:"trx;LogFileName=test_results.xml"
|
||||
|
||||
#générer le rapport html
|
||||
reportgenerator "-reports:src/**/TestResults/**/coverage.cobertura.xml" "-targetdir:./report" "-reporttypes:Html"
|
||||
|
||||
#ouvrir le fichier html
|
||||
report/index.html
|
||||
@@ -1,15 +1,15 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net10.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<InvariantGlobalization>true</InvariantGlobalization>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.1" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.2" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
18
src/LittleTown.Core.Tests/ExceptionTesting.cs
Normal file
18
src/LittleTown.Core.Tests/ExceptionTesting.cs
Normal file
@@ -0,0 +1,18 @@
|
||||
using System.Text.Json;
|
||||
using LittleTown.StaticDataAcces;
|
||||
|
||||
namespace LittleTown.Core.Tests;
|
||||
|
||||
public class ExceptionTesting
|
||||
{
|
||||
[Fact]
|
||||
public void ExceptionForStaticData()
|
||||
{
|
||||
StaticDataGetter getter = new StaticDataGetter("null", "null", "null");
|
||||
|
||||
|
||||
Assert.Throws<JsonException>(() => getter.GetBoard(1));
|
||||
Assert.Throws<JsonException>(() => getter.GetObjectives());
|
||||
Assert.Throws<JsonException>(() => getter.GetBuildings());
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net10.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
|
||||
@@ -10,15 +10,16 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoMapper" Version="13.0.1" />
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
|
||||
<PackageReference Include="AutoMapper" Version="16.0.0" />
|
||||
<PackageReference Include="Microsoft.CodeCoverage" Version="17.14.1" />
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
|
||||
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
|
||||
<PackageReference Include="xunit" Version="2.4.2" />
|
||||
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
|
||||
<PackageReference Include="xunit" Version="2.9.2" />
|
||||
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="coverlet.collector" Version="6.0.0">
|
||||
<PackageReference Include="coverlet.collector" Version="6.0.4">
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
</PackageReference>
|
||||
|
||||
@@ -17,6 +17,7 @@ public class MatchTesting
|
||||
Match match2 = new Match(getter);
|
||||
match2.AddPlayer("Player1");
|
||||
match2.AddPlayer("Player2");
|
||||
Assert.Throws<MatchConfigException>(() => match2.AddPlayer("Player2"));
|
||||
match2.Init();
|
||||
|
||||
Match match3 = new Match(getter);
|
||||
@@ -51,10 +52,23 @@ public class MatchTesting
|
||||
|
||||
PlayerZone player1 = match.GetPlayerZone("Player1");
|
||||
PlayerZone player1_3 = match.GetPlayerZone("Player2");
|
||||
|
||||
Assert.Equal(3, player1.Ressources[Enums.ResourceType.Piece]);
|
||||
player1.AddRessources(ResourceType.Piece, 1);
|
||||
Assert.Equal(3, player1_3.Ressources[Enums.ResourceType.Piece]);
|
||||
|
||||
Assert.Equal(4, player1.Objectives.Count);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void MatchGetters()
|
||||
{
|
||||
StaticDataGetter getter = new();
|
||||
Match match = new Match(getter);
|
||||
match.AddPlayer("Player1");
|
||||
match.AddPlayer("Player2");
|
||||
match.Init();
|
||||
|
||||
Assert.Throws<ArgumentException>(() => match.GetPlayerZone("UnknownPlayer"));
|
||||
}
|
||||
}
|
||||
34
src/LittleTown.Core.Tests/MatchWorkflowTesting.cs
Normal file
34
src/LittleTown.Core.Tests/MatchWorkflowTesting.cs
Normal file
@@ -0,0 +1,34 @@
|
||||
using LittleTown.Core.Actions;
|
||||
using LittleTown.Core.Exceptions;
|
||||
using LittleTown.StaticDataAcces;
|
||||
|
||||
namespace LittleTown.Core.Tests;
|
||||
|
||||
public class MatchWorkflowTesting
|
||||
{
|
||||
|
||||
|
||||
[Fact]
|
||||
public void Simple2PlayerGame()
|
||||
{
|
||||
StaticDataGetter getter = new StaticDataGetter();
|
||||
|
||||
Match match = new Match(getter);
|
||||
match.AddPlayer("Player1");
|
||||
match.AddPlayer("Player2");
|
||||
match.Init();
|
||||
|
||||
int count = 0;
|
||||
while (!match.IsDone)
|
||||
{
|
||||
EmptyAction action = new EmptyAction();
|
||||
match.ExecuteAction(action);
|
||||
count++;
|
||||
if (count > 40)
|
||||
{
|
||||
Assert.Fail("Trop d'action pour une partie vide");
|
||||
}
|
||||
}
|
||||
Assert.Throws<MatchFinishedException>(() => match.ExecuteAction(new EmptyAction()));
|
||||
}
|
||||
}
|
||||
@@ -1,3 +1,4 @@
|
||||
using LittleTown.Core.Actions;
|
||||
using LittleTown.Core.Exceptions;
|
||||
using LittleTown.Core.Ports;
|
||||
|
||||
@@ -8,6 +9,18 @@ namespace LittleTown.Core;
|
||||
/// </summary>
|
||||
public class Match
|
||||
{
|
||||
/// <summary> LE numero du tour en cours (Partant de 1) </summary>
|
||||
public int CurrentTurn { get; private set; } = 1;
|
||||
|
||||
/// <summary> l'id du joueur a qui c'est le tour de jouer</summary>
|
||||
public string CurrentPlayer { get => _players[_playerTurnsOrder[_currentPlayerIndex]].PlayerName; }
|
||||
|
||||
/// <summary> Indique si le match est terminé </summary>
|
||||
public bool IsDone { get; private set; }
|
||||
|
||||
/// <summary>la liste indiquant l'ordre des joueurs, _playerTurnsOrder[0] donne l'index du 1er joueur, _playerTurnsOrder[1] du second..... </summary>
|
||||
private List<int> _playerTurnsOrder = new List<int>();
|
||||
|
||||
private const int _minPlayerCount = 2;
|
||||
private const int _maxPlayerCount = 4;
|
||||
|
||||
@@ -20,18 +33,12 @@ public class Match
|
||||
|
||||
private Random _random = new Random();
|
||||
|
||||
private Dictionary<string, PlayerZone> _players = new();
|
||||
|
||||
/// <summary> LE numero du tour en cours (Partant de 1) </summary>
|
||||
public int CurrentTurn { get; private set; } = 1;
|
||||
|
||||
/// <summary>la liste indiquant l'ordre des joueurs, _playerTurnsOrder[0] donne l'index du 1er joueur, _playerTurnsOrder[1] du second..... </summary>
|
||||
private List<int> _playerTurnsOrder = new List<int>();
|
||||
private List<PlayerZone> _players = new();
|
||||
private int _currentPlayerIndex;
|
||||
|
||||
/// <summary>
|
||||
/// Constructeur d'une nouvelle partie avec un nombre de joueurs données en parametres
|
||||
/// </summary>
|
||||
/// <param name="nbPlayer"></param>
|
||||
/// <param name="staticData">un objet permettant de récupérer les données statiques du jeu</param>
|
||||
public Match(IStaticDataGetter staticData)
|
||||
{
|
||||
@@ -48,11 +55,14 @@ public class Match
|
||||
{
|
||||
if (_players.Count < _maxPlayerCount)
|
||||
{
|
||||
if (_players.ContainsKey(playerName))
|
||||
if (_players.Any(p => p.PlayerName == playerName))
|
||||
{
|
||||
throw new MatchConfigException("Un joueur existe déjà avec ce nom");
|
||||
}
|
||||
_players.Add(playerName, new PlayerZone());
|
||||
_players.Add(new PlayerZone()
|
||||
{
|
||||
PlayerName = playerName
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -60,6 +70,25 @@ public class Match
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Demander au match d'executer une action si elle est autorisée
|
||||
/// </summary>
|
||||
/// <param name="action">l'action a réaliser</param>
|
||||
public void ExecuteAction(IAction action)
|
||||
{
|
||||
ArgumentNullException.ThrowIfNull(action);
|
||||
|
||||
//quelques vérification génériques pour savoir si l'action peut être jouée
|
||||
if (IsDone)
|
||||
{
|
||||
throw new MatchFinishedException("Impossible d'effectuer une action sur un match terminé");
|
||||
}
|
||||
|
||||
//autoriser l'action a s'executer en lui donner les getters dont elle a besoin
|
||||
action.Execute(this);
|
||||
}
|
||||
|
||||
/// <summary> Initialiser la partie, il faut avoir ajouté les joueurs au préalable </summary>
|
||||
/// <exception cref="MatchConfigException"></exception>
|
||||
public void Init()
|
||||
@@ -70,13 +99,14 @@ public class Match
|
||||
ArgumentOutOfRangeException.ThrowIfGreaterThan(nbPlayer, _maxPlayerCount);
|
||||
|
||||
List<int> freeObjectiveIndexs = Enumerable.Range(0, _objectives.Count).ToList();
|
||||
foreach (PlayerZone zone in _players.Values)
|
||||
foreach (PlayerZone zone in _players)
|
||||
{
|
||||
zone.AddObjectives(GetRandomObjectives(nbPlayer switch
|
||||
{
|
||||
2 => 4,
|
||||
3 => 3,
|
||||
4 => 2,
|
||||
_ => throw new MatchConfigException("Mauvais nombre de joueurs lors Workers")
|
||||
}, freeObjectiveIndexs));
|
||||
zone.AddRessources(Enums.ResourceType.Piece, 3);
|
||||
}
|
||||
@@ -106,6 +136,8 @@ public class Match
|
||||
index = 0;
|
||||
}
|
||||
|
||||
_currentPlayerIndex = 0;
|
||||
|
||||
}
|
||||
|
||||
/// <summary> Permet de récuperer une player zone(une copie) </summary>
|
||||
@@ -113,7 +145,10 @@ public class Match
|
||||
/// <returns></returns>
|
||||
public PlayerZone GetPlayerZone(string playerName)
|
||||
{
|
||||
if (!_players.TryGetValue(playerName, out PlayerZone? value))
|
||||
var value = _players.Where(p => p.PlayerName == playerName).FirstOrDefault();
|
||||
|
||||
|
||||
if (null == value)
|
||||
throw new ArgumentException("playerID is out of bound");
|
||||
|
||||
return value.Clone() as PlayerZone ?? throw new ArgumentException("Cast exception in GetPlayerZone"); ;
|
||||
@@ -131,4 +166,18 @@ public class Match
|
||||
}
|
||||
return result;
|
||||
}
|
||||
/// <summary> Changer le joueur en cours pour passer au suivant </summary>
|
||||
public void NextPlayer()
|
||||
{
|
||||
_currentPlayerIndex++;
|
||||
if (_currentPlayerIndex >= _players.Count)
|
||||
{
|
||||
_currentPlayerIndex = 0;
|
||||
CurrentTurn++;
|
||||
}
|
||||
if (CurrentTurn >= 4)
|
||||
{
|
||||
IsDone = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -7,7 +7,8 @@ public class PlayerZone : ICloneable
|
||||
/// <summary> Les ressources que possede le joueur </summary>
|
||||
public IDictionary<ResourceType, int> Ressources { get; init; } = new Dictionary<ResourceType, int>();
|
||||
|
||||
|
||||
/// <summary> l'id du joueur a cette zone </summary>
|
||||
public required string PlayerName { get; init; }
|
||||
|
||||
/// <summary> La liste des objectifs que le joueur possede/// </summary>
|
||||
public IReadOnlyCollection<Objective> Objectives { get => _objectives.AsReadOnly(); init => _objectives = new List<Objective>(value); }
|
||||
@@ -32,6 +33,10 @@ public class PlayerZone : ICloneable
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Assigner des objectifs au joueur
|
||||
/// </summary>
|
||||
/// <param name="objectives"></param>
|
||||
public void AddObjectives(ICollection<Objective> objectives)
|
||||
{
|
||||
_objectives.AddRange(objectives);
|
||||
@@ -45,7 +50,8 @@ public class PlayerZone : ICloneable
|
||||
{
|
||||
Ressources = new Dictionary<ResourceType, int>(Ressources),
|
||||
Objectives = new List<Objective>(Objectives),
|
||||
ScoreMarker = ScoreMarker
|
||||
ScoreMarker = ScoreMarker,
|
||||
PlayerName = PlayerName
|
||||
};
|
||||
|
||||
return result;
|
||||
21
src/LittleTown.Core/Exceptions/MatchFinishedException.cs
Normal file
21
src/LittleTown.Core/Exceptions/MatchFinishedException.cs
Normal file
@@ -0,0 +1,21 @@
|
||||
namespace LittleTown.Core.Exceptions;
|
||||
|
||||
/// <summary>
|
||||
/// Exception levee quand on essais d'executer une actin dans un match terminé
|
||||
/// </summary>
|
||||
public class MatchFinishedException : Exception
|
||||
{
|
||||
/// <summary> constructeur de base </summary>
|
||||
public MatchFinishedException() : base() { }
|
||||
|
||||
/// <summary> Constructeur avec un message d'erreur </summary>
|
||||
/// <param name="message">le message decrivant l'exception en detail</param>
|
||||
public MatchFinishedException(string message) : base(message) { }
|
||||
|
||||
/// <summary>
|
||||
/// Constructeur avec un message et une exception interne
|
||||
/// </summary>
|
||||
/// <param name="message">Le message de l'erreur</param>
|
||||
/// <param name="innerException">l'exception encapsulée</param>
|
||||
public MatchFinishedException(string message, Exception innerException) : base(message, innerException) { }
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net10.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||
|
||||
21
src/LittleTown.Core/UseCases/Actions/EmptyAction.cs
Normal file
21
src/LittleTown.Core/UseCases/Actions/EmptyAction.cs
Normal file
@@ -0,0 +1,21 @@
|
||||
namespace LittleTown.Core.Actions;
|
||||
|
||||
/// <summary>
|
||||
/// Un action de test qui permet de faire le déroulé d'une partie, cette action ne fait rien qu'utiliser un ouvrier du joueur et passer au suivant
|
||||
/// </summary>
|
||||
public class EmptyAction : IAction
|
||||
{
|
||||
/// <inheritdoc/>
|
||||
public void Execute(Match match)
|
||||
{
|
||||
ArgumentNullException.ThrowIfNull(match);
|
||||
|
||||
match.NextPlayer();
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
public bool CanExecute(Match match)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
19
src/LittleTown.Core/UseCases/Actions/FieldAction.cs
Normal file
19
src/LittleTown.Core/UseCases/Actions/FieldAction.cs
Normal file
@@ -0,0 +1,19 @@
|
||||
namespace LittleTown.Core.Actions;
|
||||
|
||||
/// <summary>
|
||||
/// Action qui consiste a poser un pion sur le une case du plateau
|
||||
/// </summary>
|
||||
public class FieldAction : IAction
|
||||
{
|
||||
/// <inheritdoc/>>
|
||||
public void Execute(Match match)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
/// <inheritdoc/>>
|
||||
public bool CanExecute(Match match)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
20
src/LittleTown.Core/UseCases/Actions/IAction.cs
Normal file
20
src/LittleTown.Core/UseCases/Actions/IAction.cs
Normal file
@@ -0,0 +1,20 @@
|
||||
namespace LittleTown.Core.Actions;
|
||||
|
||||
/// <summary>
|
||||
/// Interface qui représente ce que doivent implémenter les actions
|
||||
/// </summary>
|
||||
public interface IAction
|
||||
{
|
||||
/// <summary>
|
||||
/// Methode demandant a l'action d'appliquer ses changement au match
|
||||
/// </summary>
|
||||
/// <param name="match">le match a modifier avec cette action</param>
|
||||
public void Execute(Match match);
|
||||
|
||||
/// <summary>
|
||||
/// Verifier si cette action peut être effectuée, si elle est légale
|
||||
/// </summary>
|
||||
/// <param name="match"></param>
|
||||
/// <returns></returns>
|
||||
public bool CanExecute(Match match);
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<TargetFramework>net10.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||
|
||||
@@ -9,23 +9,50 @@ namespace LittleTown.StaticDataAcces;
|
||||
/// </summary>
|
||||
public class StaticDataGetter : IStaticDataGetter
|
||||
{
|
||||
string _boardData = "";
|
||||
string _buildingData = "";
|
||||
string _objectivesData = "";
|
||||
|
||||
/// <summary>
|
||||
/// Constructeur avec les chemin des fichiers de données
|
||||
/// </summary>
|
||||
/// <param name="boardData">structure json definissant le plateau</param>
|
||||
/// <param name="buildingData">structure json definissant les building</param>
|
||||
/// <param name="objectivesData">structure json definissant les objectifs</param>
|
||||
public StaticDataGetter(string boardData, string buildingData, string objectivesData)
|
||||
{
|
||||
_boardData = boardData;
|
||||
_objectivesData = objectivesData;
|
||||
_buildingData = buildingData;
|
||||
}
|
||||
|
||||
/// <summary> Constructeur avec les chemins par défaut, à utiliser pour les tests seulement </summary>
|
||||
public StaticDataGetter()
|
||||
{
|
||||
string boardPath = Path.Combine(Environment.CurrentDirectory, "../../../../LittleTown.StaticDataAccess/Data/Board1.json");
|
||||
string buildingPath = Path.Combine(Environment.CurrentDirectory, "../../../../LittleTown.StaticDataAccess/Data/Buildings.json");
|
||||
string objectivesPath = Path.Combine(Environment.CurrentDirectory, "../../../../LittleTown.StaticDataAccess/Data/Objectives.json");
|
||||
ReadFiles(boardPath, buildingPath, objectivesPath);
|
||||
}
|
||||
|
||||
private void ReadFiles(string boardPath, string buildingPath, string objectivesPath)
|
||||
{
|
||||
_boardData = File.ReadAllText(boardPath);
|
||||
_buildingData = File.ReadAllText(buildingPath);
|
||||
_objectivesData = File.ReadAllText(objectivesPath);
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
public Board GetBoard(int version)
|
||||
{
|
||||
|
||||
string path = Path.Combine(Environment.CurrentDirectory, "../../../../LittleTown.StaticDataAccess/Data/Board1.json");
|
||||
string data = File.ReadAllText(path);
|
||||
Board board = JsonSerializer.Deserialize<Board>(data) ?? throw new JsonException("Cannot deserialize Board");
|
||||
Board board = JsonSerializer.Deserialize<Board>(_boardData) ?? throw new JsonException("Cannot deserialize Board");
|
||||
return board;
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
public ICollection<Building> GetBuildings()
|
||||
{
|
||||
string path = Path.Combine(Environment.CurrentDirectory, "../../../../LittleTown.StaticDataAccess/Data/Buildings.json");
|
||||
string data = System.IO.File.ReadAllText(path);
|
||||
List<Building> buildings = JsonSerializer.Deserialize<List<Building>>(data) ?? throw new JsonException("Cannot deserialize Buildings");
|
||||
List<Building> buildings = JsonSerializer.Deserialize<List<Building>>(_buildingData) ?? throw new JsonException("Cannot deserialize Buildings");
|
||||
|
||||
return buildings;
|
||||
}
|
||||
@@ -33,9 +60,7 @@ public class StaticDataGetter : IStaticDataGetter
|
||||
/// <inheritdoc/>
|
||||
public ICollection<Objective> GetObjectives()
|
||||
{
|
||||
string path = Path.Combine(Environment.CurrentDirectory, "../../../../LittleTown.StaticDataAccess/Data/Objectives.json");
|
||||
string data = System.IO.File.ReadAllText(path);
|
||||
List<Objective> objectives = JsonSerializer.Deserialize<List<Objective>>(data) ?? throw new JsonException("Cannot deserialize Objectives");
|
||||
List<Objective> objectives = JsonSerializer.Deserialize<List<Objective>>(_objectivesData) ?? throw new JsonException("Cannot deserialize Objectives");
|
||||
|
||||
return objectives;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user