diff --git a/Sources/Model/Games/Turn.cs b/Sources/Model/Games/Turn.cs index 0385c16..7b2abca 100644 --- a/Sources/Model/Games/Turn.cs +++ b/Sources/Model/Games/Turn.cs @@ -68,6 +68,10 @@ namespace Model.Games { throw new ArgumentNullException(nameof(diceNFaces), "param should not be null"); } + if (diceNFaces.Count == 0) + { + throw new ArgumentException("param should not be null", nameof(diceNFaces)); + } if (when.Kind != DateTimeKind.Utc) { when = when.ToUniversalTime(); @@ -103,7 +107,7 @@ namespace Model.Games date, time, Player.ToString()); - foreach ((_, AbstractDieFace face) in DiceNFaces) + foreach (AbstractDieFace face in DiceNFaces.Values) { sb.Append(" " + face.ToString()); } diff --git a/Sources/Tests/Model_UTs/TurnTest.cs b/Sources/Tests/Model_UTs/TurnTest.cs index 7a8d598..a00ac87 100644 --- a/Sources/Tests/Model_UTs/TurnTest.cs +++ b/Sources/Tests/Model_UTs/TurnTest.cs @@ -2,9 +2,7 @@ using Model.Dice.Faces; using Model.Games; using Model.Players; -using Newtonsoft.Json.Linq; using System; -using System.Collections; using System.Collections.Generic; using System.Diagnostics; using Xunit; @@ -51,14 +49,14 @@ namespace Tests.Model_UTs 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 = new() @@ -69,9 +67,9 @@ namespace Tests.Model_UTs { CLR1, FACE_FOUR } }; } - */ - /* + + [Fact] public void TestCreateWithSpecifiedTimeNotUTCThenValid() { @@ -87,9 +85,9 @@ namespace Tests.Model_UTs Assert.Equal(DateTimeKind.Utc, turn.When.Kind); Assert.Equal(dateTime.ToUniversalTime(), turn.When); } - */ - /* + + [Fact] public void TestCreateWithSpecifiedTimeUTCThenValid() { @@ -105,7 +103,7 @@ namespace Tests.Model_UTs Assert.Equal(DateTimeKind.Utc, turn.When.Kind); Assert.Equal(dateTime.ToUniversalTime(), turn.When); } - */ + [Fact] public void TestCreateWithSpecifiedTimeNullPlayerThenException() @@ -134,7 +132,7 @@ namespace Tests.Model_UTs Assert.Throws(action); } - /* + [Fact] public void TestCreateWithSpecifiedTimeEmptyFacesThenException() { @@ -149,9 +147,9 @@ namespace Tests.Model_UTs // Assert Assert.Throws(action); } - */ - /* + + [Fact] public void TestCreateWithDefaultTimeThenValid() { @@ -166,9 +164,9 @@ namespace Tests.Model_UTs 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() { @@ -178,8 +176,8 @@ namespace Tests.Model_UTs Player player = new(name); string expected = $"2018-06-15 16:30:00 -- {name} rolled: " + FACE_ONE.ToString() + " " - + FACE_TWO.ToString() - + " Assets/images/" + FACE_THREE.ToString() + " " + + FACE_TWO.ToString() + " " + + FACE_THREE.ToString() + " " + FACE_FOUR.ToString(); Turn turn = Turn.CreateWithSpecifiedTime(dateTime, player, DICE_N_FACES); @@ -191,6 +189,5 @@ namespace Tests.Model_UTs // Assert Assert.Equal(expected, actual); } - */ } }