diff --git a/Sources/App/App.csproj b/Sources/App/App.csproj
index a9bd887..428ab87 100644
--- a/Sources/App/App.csproj
+++ b/Sources/App/App.csproj
@@ -7,7 +7,6 @@
-
diff --git a/Sources/App/Program.cs b/Sources/App/Program.cs
index badbca6..183b286 100644
--- a/Sources/App/Program.cs
+++ b/Sources/App/Program.cs
@@ -1,11 +1,11 @@
-using Data;
-using Model.Dice;
+using Model.Dice;
using Model.Dice.Faces;
using Model.Games;
using Model.Players;
using System;
using System.Collections.Generic;
using System.Linq;
+using Data;
namespace App
{
diff --git a/Sources/DiceApp.sln b/Sources/DiceApp.sln
index 7545479..7041b1a 100644
--- a/Sources/DiceApp.sln
+++ b/Sources/DiceApp.sln
@@ -7,10 +7,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Model", "Model\Model.csproj
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj", "{11BDDDA8-CBED-46EE-A224-144C3CD545A7}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Data", "Data\Data.csproj", "{3047BFD8-EF44-4095-9E54-45D47C7AB212}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{953D2D67-BCE7-412C-B7BB-7C63B5592359}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Data", "Data\Data.csproj", "{E9683741-E603-4ED3-8088-4099D67FCA6D}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -25,10 +25,10 @@ Global
{11BDDDA8-CBED-46EE-A224-144C3CD545A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{11BDDDA8-CBED-46EE-A224-144C3CD545A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{11BDDDA8-CBED-46EE-A224-144C3CD545A7}.Release|Any CPU.Build.0 = Release|Any CPU
- {3047BFD8-EF44-4095-9E54-45D47C7AB212}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3047BFD8-EF44-4095-9E54-45D47C7AB212}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3047BFD8-EF44-4095-9E54-45D47C7AB212}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3047BFD8-EF44-4095-9E54-45D47C7AB212}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E9683741-E603-4ED3-8088-4099D67FCA6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E9683741-E603-4ED3-8088-4099D67FCA6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E9683741-E603-4ED3-8088-4099D67FCA6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E9683741-E603-4ED3-8088-4099D67FCA6D}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Sources/DiceAppConsole.sln b/Sources/DiceAppConsole.sln
index a6b9d77..b7e99f6 100644
--- a/Sources/DiceAppConsole.sln
+++ b/Sources/DiceAppConsole.sln
@@ -12,10 +12,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "App", "App\App.csproj", "{8
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj", "{11BDDDA8-CBED-46EE-A224-144C3CD545A7}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Data", "Data\Data.csproj", "{3047BFD8-EF44-4095-9E54-45D47C7AB212}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{953D2D67-BCE7-412C-B7BB-7C63B5592359}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Data", "Data\Data.csproj", "{E9683741-E603-4ED3-8088-4099D67FCA6D}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -34,10 +34,10 @@ Global
{11BDDDA8-CBED-46EE-A224-144C3CD545A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{11BDDDA8-CBED-46EE-A224-144C3CD545A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{11BDDDA8-CBED-46EE-A224-144C3CD545A7}.Release|Any CPU.Build.0 = Release|Any CPU
- {3047BFD8-EF44-4095-9E54-45D47C7AB212}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3047BFD8-EF44-4095-9E54-45D47C7AB212}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3047BFD8-EF44-4095-9E54-45D47C7AB212}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3047BFD8-EF44-4095-9E54-45D47C7AB212}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E9683741-E603-4ED3-8088-4099D67FCA6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E9683741-E603-4ED3-8088-4099D67FCA6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E9683741-E603-4ED3-8088-4099D67FCA6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E9683741-E603-4ED3-8088-4099D67FCA6D}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Sources/Tests/Model_UTs/GameRunnerTest.cs b/Sources/Tests/Model_UTs/GameRunnerTest.cs
index e62d157..b440ba8 100644
--- a/Sources/Tests/Model_UTs/GameRunnerTest.cs
+++ b/Sources/Tests/Model_UTs/GameRunnerTest.cs
@@ -1,5 +1,4 @@
-using Data;
-using Model;
+using Model;
using Model.Dice;
using Model.Dice.Faces;
using Model.Games;
@@ -8,13 +7,14 @@ using System;
using System.Collections.Generic;
using System.Linq;
using Xunit;
+using Data;
namespace Tests.Model_UTs
{
public class GameRunnerTest
{
private readonly GameRunner stubGameRunner = new Stub().LoadApp();
-
+
[Fact]
public void TestConstructorWhenNoGamesThenNewIEnumerable()
{
diff --git a/Sources/Tests/Model_UTs/GameTest.cs b/Sources/Tests/Model_UTs/GameTest.cs
index 6eddc05..7a9f979 100644
--- a/Sources/Tests/Model_UTs/GameTest.cs
+++ b/Sources/Tests/Model_UTs/GameTest.cs
@@ -1,16 +1,12 @@
-using Model.Dice.Faces;
-using Model.Dice;
+using Model.Dice;
+using Model.Dice.Faces;
using Model.Games;
using Model.Players;
-using Model;
using System;
using System.Collections.Generic;
+using System.Diagnostics;
using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
using Xunit;
-using static System.Collections.Specialized.BitVector32;
-using System.Diagnostics;
namespace Tests.Model_UTs
{
diff --git a/Sources/Tests/Model_UTs/PlayerManagerTest.cs b/Sources/Tests/Model_UTs/PlayerManagerTest.cs
index fe94980..5d8e1b1 100644
--- a/Sources/Tests/Model_UTs/PlayerManagerTest.cs
+++ b/Sources/Tests/Model_UTs/PlayerManagerTest.cs
@@ -3,7 +3,6 @@ using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
-using System.Xml.Linq;
using Xunit;
namespace Tests.Model_UTs
diff --git a/Sources/Tests/Model_UTs/Point.cs b/Sources/Tests/Model_UTs/Point.cs
index a9274f7..89b5f7f 100644
--- a/Sources/Tests/Model_UTs/Point.cs
+++ b/Sources/Tests/Model_UTs/Point.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Tests.Model_UTs
+namespace Tests.Model_UTs
{
public class Point
{
diff --git a/Sources/Tests/Model_UTs/TurnTest.cs b/Sources/Tests/Model_UTs/TurnTest.cs
index b9e8310..cdfbfea 100644
--- a/Sources/Tests/Model_UTs/TurnTest.cs
+++ b/Sources/Tests/Model_UTs/TurnTest.cs
@@ -1,322 +1,322 @@
-using Model.Dice;
-using Model.Dice.Faces;
-using Model.Games;
-using Model.Players;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using Xunit;
-
-namespace Tests.Model_UTs
-{
- public class TurnTest
-
- {
- private readonly Dictionary, AbstractDieFace> DICE_N_FACES_1;
- private readonly Dictionary, AbstractDieFace> DICE_N_FACES_2;
-
- private static readonly AbstractDieFace FACE_ONE = new NumberDieFace(1);
- private static readonly AbstractDieFace FACE_TWO = new NumberDieFace(12);
- private static readonly AbstractDieFace FACE_THREE = new ImageDieFace(54);
- private static readonly AbstractDieFace FACE_FOUR = new ColorDieFace(16548);
-
- private readonly static NumberDieFace[] FACES1 = new NumberDieFace[]
- {
- FACE_ONE as NumberDieFace,
- new NumberDieFace(2),
- new NumberDieFace(3),
- new NumberDieFace(4)
- };
-
- private readonly static NumberDieFace[] FACES2 = new NumberDieFace[] {
- new NumberDieFace(9),
- new NumberDieFace(10),
- new NumberDieFace(11),
- FACE_TWO as NumberDieFace,
- new NumberDieFace(13),
- new NumberDieFace(14)
- };
-
- private readonly static ImageDieFace[] FACES3 = new ImageDieFace[] {
- new ImageDieFace(13),
- new ImageDieFace(27),
- new ImageDieFace(38),
- FACE_THREE as ImageDieFace
- };
-
- private readonly static ColorDieFace[] FACES4 = new ColorDieFace[] {
- new(11651),
- new(24651),
- FACE_FOUR as ColorDieFace,
- new(412)
- };
-
- private readonly AbstractDie NUM1 = new NumberDie(FACES1);
- private readonly AbstractDie NUM2 = new NumberDie(FACES2);
- private readonly AbstractDie IMG1 = new ImageDie(FACES3);
- private readonly AbstractDie CLR1 = new ColorDie(FACES4);
-
- public TurnTest()
- {
- DICE_N_FACES_1 = new()
- {
- { NUM1, FACE_ONE },
- { NUM2, FACE_TWO },
- { IMG1, FACE_THREE },
- { CLR1, FACE_FOUR }
- };
- DICE_N_FACES_2 = new()
- {
- { NUM1, FACE_TWO },
- { IMG1, FACE_THREE },
- { CLR1, FACE_FOUR }
- };
- }
-
-
-
- [Fact]
- public void TestCreateWithSpecifiedTimeNotUTCThenValid()
- {
- // Arrange
- DateTime dateTime = new(year: 2018, month: 06, day: 15, hour: 16, minute: 30, second: 0, kind: DateTimeKind.Local);
- Player player = new("Alice");
- Assert.NotEqual(DateTimeKind.Utc, dateTime.Kind);
-
- // Act
- Turn turn = Turn.CreateWithSpecifiedTime(dateTime, player, DICE_N_FACES_1);
-
- // Assert
- Assert.Equal(DateTimeKind.Utc, turn.When.Kind);
- Assert.Equal(dateTime.ToUniversalTime(), turn.When);
- }
-
-
-
- [Fact]
- public void TestCreateWithSpecifiedTimeUTCThenValid()
- {
- // Arrange
- DateTime dateTime = new(year: 2018, month: 06, day: 15, hour: 16, minute: 30, second: 0, kind: DateTimeKind.Utc);
- Player player = new("Bobby");
- Assert.Equal(DateTimeKind.Utc, dateTime.Kind);
-
- // Act
- Turn turn = Turn.CreateWithSpecifiedTime(dateTime, player, DICE_N_FACES_1);
-
- // Assert
- Assert.Equal(DateTimeKind.Utc, turn.When.Kind);
- Assert.Equal(dateTime.ToUniversalTime(), turn.When);
- }
-
-
- [Fact]
- public void TestCreateWithSpecifiedTimeNullPlayerThenException()
- {
- // Arrange
- DateTime dateTime = new(year: 2018, month: 06, day: 15, hour: 16, minute: 30, second: 0, kind: DateTimeKind.Utc);
-
- // Act
- void action() => Turn.CreateWithSpecifiedTime(dateTime, null, DICE_N_FACES_1);
-
- // Assert
- Assert.Throws(action);
- }
-
- [Fact]
- public void TestCreateWithSpecifiedTimeNullFacesThenException()
- {
- // Arrange
- DateTime dateTime = new(year: 2018, month: 06, day: 15, hour: 16, minute: 30, second: 0, kind: DateTimeKind.Utc);
- Player player = new("Chucky");
-
- // Act
- void action() => Turn.CreateWithSpecifiedTime(dateTime, player, null);
-
- // Assert
- Assert.Throws(action);
- }
-
-
- [Fact]
- public void TestCreateWithSpecifiedTimeEmptyFacesThenException()
- {
- // Arrange
- DateTime dateTime = new(year: 2018, month: 06, day: 15, hour: 16, minute: 30, second: 0, kind: DateTimeKind.Utc);
- Player player = new("Chucky");
- DICE_N_FACES_1.Clear();
-
- // Act
- void action() => Turn.CreateWithSpecifiedTime(dateTime, player, DICE_N_FACES_1);
-
- // Assert
- Assert.Throws(action);
- }
-
-
-
- [Fact]
- public void TestCreateWithDefaultTimeThenValid()
- {
- // Arrange
- Player player = new("Chloe");
-
- // Act
- Turn turn = Turn.CreateWithDefaultTime(player, DICE_N_FACES_1);
-
- // Assert
- Assert.Equal(DateTimeKind.Utc, turn.When.Kind);
- Assert.Equal(DateTime.Now.ToUniversalTime().Date, turn.When.Date);
- // N.B.: might fail between 11:59:59PM and 00:00:00AM
- }
-
-
-
- [Fact]
- public void TestToStringValidIfAllNormal()
- {
- // Arrange
- DateTime dateTime = new(year: 2018, month: 06, day: 15, hour: 16, minute: 30, second: 0, kind: DateTimeKind.Utc);
- string name = "Bobby";
- Player player = new(name);
- string expected = $"2018-06-15 16:30:00 -- {name} rolled: "
- + FACE_ONE.ToString() + " "
- + FACE_TWO.ToString() + " "
- + FACE_THREE.ToString() + " "
- + FACE_FOUR.ToString();
-
- Turn turn = Turn.CreateWithSpecifiedTime(dateTime, player, DICE_N_FACES_1);
-
- // Act
- string actual = turn.ToString();
- Debug.WriteLine(actual);
-
- // Assert
- Assert.Equal(expected, actual);
- }
-
- [Fact]
- public void TestDiceNFacesProperty()
- {
- // Arrange
- Player player = new("Erika");
-
- // Act
- Turn turn = Turn.CreateWithDefaultTime(player, DICE_N_FACES_1);
- IEnumerable, AbstractDieFace>> expected = DICE_N_FACES_1.AsEnumerable();
-
- // Assert
- Assert.Equal(expected, turn.DiceNFaces);
+using Model.Dice;
+using Model.Dice.Faces;
+using Model.Games;
+using Model.Players;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Xunit;
+
+namespace Tests.Model_UTs
+{
+ public class TurnTest
+
+ {
+ private readonly Dictionary, AbstractDieFace> DICE_N_FACES_1;
+ private readonly Dictionary, AbstractDieFace> DICE_N_FACES_2;
+
+ private static readonly AbstractDieFace FACE_ONE = new NumberDieFace(1);
+ private static readonly AbstractDieFace FACE_TWO = new NumberDieFace(12);
+ private static readonly AbstractDieFace FACE_THREE = new ImageDieFace(54);
+ private static readonly AbstractDieFace FACE_FOUR = new ColorDieFace(16548);
+
+ private readonly static NumberDieFace[] FACES1 = new NumberDieFace[]
+ {
+ FACE_ONE as NumberDieFace,
+ new NumberDieFace(2),
+ new NumberDieFace(3),
+ new NumberDieFace(4)
+ };
+
+ private readonly static NumberDieFace[] FACES2 = new NumberDieFace[] {
+ new NumberDieFace(9),
+ new NumberDieFace(10),
+ new NumberDieFace(11),
+ FACE_TWO as NumberDieFace,
+ new NumberDieFace(13),
+ new NumberDieFace(14)
+ };
+
+ private readonly static ImageDieFace[] FACES3 = new ImageDieFace[] {
+ new ImageDieFace(13),
+ new ImageDieFace(27),
+ new ImageDieFace(38),
+ FACE_THREE as ImageDieFace
+ };
+
+ private readonly static ColorDieFace[] FACES4 = new ColorDieFace[] {
+ new(11651),
+ new(24651),
+ FACE_FOUR as ColorDieFace,
+ new(412)
+ };
+
+ private readonly AbstractDie NUM1 = new NumberDie(FACES1);
+ private readonly AbstractDie NUM2 = new NumberDie(FACES2);
+ private readonly AbstractDie IMG1 = new ImageDie(FACES3);
+ private readonly AbstractDie CLR1 = new ColorDie(FACES4);
+
+ public TurnTest()
+ {
+ DICE_N_FACES_1 = new()
+ {
+ { NUM1, FACE_ONE },
+ { NUM2, FACE_TWO },
+ { IMG1, FACE_THREE },
+ { CLR1, FACE_FOUR }
+ };
+ DICE_N_FACES_2 = new()
+ {
+ { NUM1, FACE_TWO },
+ { IMG1, FACE_THREE },
+ { CLR1, FACE_FOUR }
+ };
+ }
+
+
+
+ [Fact]
+ public void TestCreateWithSpecifiedTimeNotUTCThenValid()
+ {
+ // Arrange
+ DateTime dateTime = new(year: 2018, month: 06, day: 15, hour: 16, minute: 30, second: 0, kind: DateTimeKind.Local);
+ Player player = new("Alice");
+ Assert.NotEqual(DateTimeKind.Utc, dateTime.Kind);
+
+ // Act
+ Turn turn = Turn.CreateWithSpecifiedTime(dateTime, player, DICE_N_FACES_1);
+
+ // Assert
+ Assert.Equal(DateTimeKind.Utc, turn.When.Kind);
+ Assert.Equal(dateTime.ToUniversalTime(), turn.When);
+ }
+
+
+
+ [Fact]
+ public void TestCreateWithSpecifiedTimeUTCThenValid()
+ {
+ // Arrange
+ DateTime dateTime = new(year: 2018, month: 06, day: 15, hour: 16, minute: 30, second: 0, kind: DateTimeKind.Utc);
+ Player player = new("Bobby");
+ Assert.Equal(DateTimeKind.Utc, dateTime.Kind);
+
+ // Act
+ Turn turn = Turn.CreateWithSpecifiedTime(dateTime, player, DICE_N_FACES_1);
+
+ // Assert
+ Assert.Equal(DateTimeKind.Utc, turn.When.Kind);
+ Assert.Equal(dateTime.ToUniversalTime(), turn.When);
+ }
+
+
+ [Fact]
+ public void TestCreateWithSpecifiedTimeNullPlayerThenException()
+ {
+ // Arrange
+ DateTime dateTime = new(year: 2018, month: 06, day: 15, hour: 16, minute: 30, second: 0, kind: DateTimeKind.Utc);
+
+ // Act
+ void action() => Turn.CreateWithSpecifiedTime(dateTime, null, DICE_N_FACES_1);
+
+ // Assert
+ Assert.Throws(action);
+ }
+
+ [Fact]
+ public void TestCreateWithSpecifiedTimeNullFacesThenException()
+ {
+ // Arrange
+ DateTime dateTime = new(year: 2018, month: 06, day: 15, hour: 16, minute: 30, second: 0, kind: DateTimeKind.Utc);
+ Player player = new("Chucky");
+
+ // Act
+ void action() => Turn.CreateWithSpecifiedTime(dateTime, player, null);
+
+ // Assert
+ Assert.Throws(action);
+ }
+
+
+ [Fact]
+ public void TestCreateWithSpecifiedTimeEmptyFacesThenException()
+ {
+ // Arrange
+ DateTime dateTime = new(year: 2018, month: 06, day: 15, hour: 16, minute: 30, second: 0, kind: DateTimeKind.Utc);
+ Player player = new("Chucky");
+ DICE_N_FACES_1.Clear();
+
+ // Act
+ void action() => Turn.CreateWithSpecifiedTime(dateTime, player, DICE_N_FACES_1);
+
+ // Assert
+ Assert.Throws(action);
+ }
+
+
+
+ [Fact]
+ public void TestCreateWithDefaultTimeThenValid()
+ {
+ // Arrange
+ Player player = new("Chloe");
+
+ // Act
+ Turn turn = Turn.CreateWithDefaultTime(player, DICE_N_FACES_1);
+
+ // Assert
+ Assert.Equal(DateTimeKind.Utc, turn.When.Kind);
+ Assert.Equal(DateTime.Now.ToUniversalTime().Date, turn.When.Date);
+ // N.B.: might fail between 11:59:59PM and 00:00:00AM
+ }
+
+
+
+ [Fact]
+ public void TestToStringValidIfAllNormal()
+ {
+ // Arrange
+ DateTime dateTime = new(year: 2018, month: 06, day: 15, hour: 16, minute: 30, second: 0, kind: DateTimeKind.Utc);
+ string name = "Bobby";
+ Player player = new(name);
+ string expected = $"2018-06-15 16:30:00 -- {name} rolled: "
+ + FACE_ONE.ToString() + " "
+ + FACE_TWO.ToString() + " "
+ + FACE_THREE.ToString() + " "
+ + FACE_FOUR.ToString();
+
+ Turn turn = Turn.CreateWithSpecifiedTime(dateTime, player, DICE_N_FACES_1);
+
+ // Act
+ string actual = turn.ToString();
+ Debug.WriteLine(actual);
+
+ // Assert
+ Assert.Equal(expected, actual);
+ }
+
+ [Fact]
+ public void TestDiceNFacesProperty()
+ {
+ // Arrange
+ Player player = new("Erika");
+
+ // Act
+ Turn turn = Turn.CreateWithDefaultTime(player, DICE_N_FACES_1);
+ IEnumerable, AbstractDieFace>> expected = DICE_N_FACES_1.AsEnumerable();
+
+ // Assert
+ Assert.Equal(expected, turn.DiceNFaces);
+ }
+
+ [Fact]
+ public void TestEqualsFalseIfNotTurn()
+ {
+ // Arrange
+ Point point;
+ Turn turn;
+ Player player = new("Freddie");
+
+ // Act
+ point = new(1, 2);
+ turn = Turn.CreateWithDefaultTime(player, DICE_N_FACES_1);
+
+ // Assert
+ Assert.False(point.Equals(turn));
+ Assert.False(point.GetHashCode().Equals(turn.GetHashCode()));
+ Assert.False(turn.Equals(point));
+ Assert.False(turn.GetHashCode().Equals(point.GetHashCode()));
+ }
+
+ [Fact]
+ public void TestGoesThruToSecondMethodIfObjIsTypeTurn()
+ {
+ // Arrange
+ Object t1;
+ Turn t2;
+ Player player1 = new Player("Marvin");
+ Player player2 = new Player("Noah");
+
+ // Act
+ t1 = Turn.CreateWithDefaultTime(player1, DICE_N_FACES_1);
+ t2 = Turn.CreateWithDefaultTime(player2, DICE_N_FACES_2);
+
+ // Assert
+ Assert.False(t1.Equals(t2));
+ Assert.False(t1.GetHashCode().Equals(t2.GetHashCode()));
+ Assert.False(t2.Equals(t1));
+ Assert.False(t2.GetHashCode().Equals(t1.GetHashCode()));
+ }
+
+
+ [Fact]
+ public void TestEqualsFalseIfNotSamePlayer()
+ {
+ // Arrange
+ Player player1= new("Panama");
+ Player player2= new("Clyde");
+
+ // Act
+ Turn t1 = Turn.CreateWithDefaultTime(player1, DICE_N_FACES_2);
+ Turn t2 = Turn.CreateWithDefaultTime(player2, DICE_N_FACES_2);
+
+ // Assert
+ Assert.False(t1.Equals(t2));
+ Assert.False(t1.GetHashCode().Equals(t2.GetHashCode()));
+ Assert.False(t2.Equals(t1));
+ Assert.False(t2.GetHashCode().Equals(t1.GetHashCode()));
}
- [Fact]
- public void TestEqualsFalseIfNotTurn()
- {
- // Arrange
- Point point;
- Turn turn;
- Player player = new("Freddie");
-
- // Act
- point = new(1, 2);
- turn = Turn.CreateWithDefaultTime(player, DICE_N_FACES_1);
-
- // Assert
- Assert.False(point.Equals(turn));
- Assert.False(point.GetHashCode().Equals(turn.GetHashCode()));
- Assert.False(turn.Equals(point));
- Assert.False(turn.GetHashCode().Equals(point.GetHashCode()));
- }
-
- [Fact]
- public void TestGoesThruToSecondMethodIfObjIsTypeTurn()
- {
- // Arrange
- Object t1;
- Turn t2;
- Player player1 = new Player("Marvin");
- Player player2 = new Player("Noah");
-
- // Act
- t1 = Turn.CreateWithDefaultTime(player1, DICE_N_FACES_1);
- t2 = Turn.CreateWithDefaultTime(player2, DICE_N_FACES_2);
-
- // Assert
- Assert.False(t1.Equals(t2));
- Assert.False(t1.GetHashCode().Equals(t2.GetHashCode()));
- Assert.False(t2.Equals(t1));
- Assert.False(t2.GetHashCode().Equals(t1.GetHashCode()));
- }
-
-
- [Fact]
- public void TestEqualsFalseIfNotSamePlayer()
- {
- // Arrange
- Player player1= new("Panama");
- Player player2= new("Clyde");
-
- // Act
- Turn t1 = Turn.CreateWithDefaultTime(player1, DICE_N_FACES_2);
- Turn t2 = Turn.CreateWithDefaultTime(player2, DICE_N_FACES_2);
-
- // Assert
- Assert.False(t1.Equals(t2));
- Assert.False(t1.GetHashCode().Equals(t2.GetHashCode()));
- Assert.False(t2.Equals(t1));
- Assert.False(t2.GetHashCode().Equals(t1.GetHashCode()));
+ [Fact]
+ public void TestEqualsFalseIfNotSameTime()
+ {
+ // Arrange
+ Player player = new("Oscar");
+
+ // Act
+ Turn t1 = Turn.CreateWithSpecifiedTime(new DateTime(1994, 07, 10), player, DICE_N_FACES_1);
+ Turn t2 = Turn.CreateWithSpecifiedTime(new DateTime(1991, 08, 20), player, DICE_N_FACES_1);
+
+ // Assert
+ Assert.False(t1.Equals(t2));
+ Assert.False(t1.GetHashCode().Equals(t2.GetHashCode()));
+ Assert.False(t2.Equals(t1));
+ Assert.False(t2.GetHashCode().Equals(t1.GetHashCode()));
}
- [Fact]
- public void TestEqualsFalseIfNotSameTime()
- {
- // Arrange
- Player player = new("Oscar");
-
- // Act
- Turn t1 = Turn.CreateWithSpecifiedTime(new DateTime(1994, 07, 10), player, DICE_N_FACES_1);
- Turn t2 = Turn.CreateWithSpecifiedTime(new DateTime(1991, 08, 20), player, DICE_N_FACES_1);
-
- // Assert
- Assert.False(t1.Equals(t2));
- Assert.False(t1.GetHashCode().Equals(t2.GetHashCode()));
- Assert.False(t2.Equals(t1));
- Assert.False(t2.GetHashCode().Equals(t1.GetHashCode()));
+ [Fact]
+ public void TestEqualsFalseIfNotSameDiceNFaces()
+ {
+ // Arrange
+ Player player = new("Django");
+
+ // Act
+ Turn t1 = Turn.CreateWithDefaultTime(player, DICE_N_FACES_1);
+ Turn t2 = Turn.CreateWithDefaultTime(player, DICE_N_FACES_2);
+
+ // Assert
+ Assert.False(t1.Equals(t2));
+ Assert.False(t1.GetHashCode().Equals(t2.GetHashCode()));
+ Assert.False(t2.Equals(t1));
+ Assert.False(t2.GetHashCode().Equals(t1.GetHashCode()));
}
- [Fact]
- public void TestEqualsFalseIfNotSameDiceNFaces()
- {
- // Arrange
- Player player = new("Django");
-
- // Act
- Turn t1 = Turn.CreateWithDefaultTime(player, DICE_N_FACES_1);
- Turn t2 = Turn.CreateWithDefaultTime(player, DICE_N_FACES_2);
-
- // Assert
- Assert.False(t1.Equals(t2));
- Assert.False(t1.GetHashCode().Equals(t2.GetHashCode()));
- Assert.False(t2.Equals(t1));
- Assert.False(t2.GetHashCode().Equals(t1.GetHashCode()));
- }
-
- [Fact]
- public void TestEqualsTrueIfExactlySameProperties()
- {
- // Arrange
- Player player = new("Elyse");
-
- // Act
- Turn t1 = Turn.CreateWithSpecifiedTime(new DateTime(1990, 04, 29), player, DICE_N_FACES_1);
- Turn t2 = Turn.CreateWithSpecifiedTime(new DateTime(1990, 04, 29), player, DICE_N_FACES_1);
-
- // Assert
- Assert.True(t1.Equals(t2));
- Assert.True(t1.GetHashCode().Equals(t2.GetHashCode()));
- Assert.True(t2.Equals(t1));
- Assert.True(t2.GetHashCode().Equals(t1.GetHashCode()));
- }
- }
-}
+ [Fact]
+ public void TestEqualsTrueIfExactlySameProperties()
+ {
+ // Arrange
+ Player player = new("Elyse");
+
+ // Act
+ Turn t1 = Turn.CreateWithSpecifiedTime(new DateTime(1990, 04, 29), player, DICE_N_FACES_1);
+ Turn t2 = Turn.CreateWithSpecifiedTime(new DateTime(1990, 04, 29), player, DICE_N_FACES_1);
+
+ // Assert
+ Assert.True(t1.Equals(t2));
+ Assert.True(t1.GetHashCode().Equals(t2.GetHashCode()));
+ Assert.True(t2.Equals(t1));
+ Assert.True(t2.GetHashCode().Equals(t1.GetHashCode()));
+ }
+ }
+}
diff --git a/Sources/Tests/Tests.csproj b/Sources/Tests/Tests.csproj
index 2d2506b..2075e70 100644
--- a/Sources/Tests/Tests.csproj
+++ b/Sources/Tests/Tests.csproj
@@ -21,7 +21,6 @@
-