👔 ♻️ Fix #68

pull/79/head
Alexis Drai 2 years ago
parent 1403b5d7fb
commit 5937a1cc28

@ -68,6 +68,10 @@ namespace Model.Games
{ {
throw new ArgumentNullException(nameof(diceNFaces), "param should not be null"); 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) if (when.Kind != DateTimeKind.Utc)
{ {
when = when.ToUniversalTime(); when = when.ToUniversalTime();
@ -103,7 +107,7 @@ namespace Model.Games
date, date,
time, time,
Player.ToString()); Player.ToString());
foreach ((_, AbstractDieFace face) in DiceNFaces) foreach (AbstractDieFace face in DiceNFaces.Values)
{ {
sb.Append(" " + face.ToString()); sb.Append(" " + face.ToString());
} }

@ -2,9 +2,7 @@
using Model.Dice.Faces; using Model.Dice.Faces;
using Model.Games; using Model.Games;
using Model.Players; using Model.Players;
using Newtonsoft.Json.Linq;
using System; using System;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using Xunit; using Xunit;
@ -51,14 +49,14 @@ namespace Tests.Model_UTs
new(412) new(412)
}; };
/*
private readonly AbstractDie<AbstractDieFace> NUM1 = new NumberDie(FACES1); private readonly AbstractDie<AbstractDieFace> NUM1 = new NumberDie(FACES1);
private readonly AbstractDie<AbstractDieFace> NUM2 = new NumberDie(FACES2); private readonly AbstractDie<AbstractDieFace> NUM2 = new NumberDie(FACES2);
private readonly AbstractDie<AbstractDieFace> IMG1 = new ImageDie(FACES3); private readonly AbstractDie<AbstractDieFace> IMG1 = new ImageDie(FACES3);
private readonly AbstractDie<AbstractDieFace> CLR1 = new ColorDie(FACES4); private readonly AbstractDie<AbstractDieFace> CLR1 = new ColorDie(FACES4);
*/
/*
public TurnTest() public TurnTest()
{ {
DICE_N_FACES = new() DICE_N_FACES = new()
@ -69,9 +67,9 @@ namespace Tests.Model_UTs
{ CLR1, FACE_FOUR } { CLR1, FACE_FOUR }
}; };
} }
*/
/*
[Fact] [Fact]
public void TestCreateWithSpecifiedTimeNotUTCThenValid() public void TestCreateWithSpecifiedTimeNotUTCThenValid()
{ {
@ -87,9 +85,9 @@ namespace Tests.Model_UTs
Assert.Equal(DateTimeKind.Utc, turn.When.Kind); Assert.Equal(DateTimeKind.Utc, turn.When.Kind);
Assert.Equal(dateTime.ToUniversalTime(), turn.When); Assert.Equal(dateTime.ToUniversalTime(), turn.When);
} }
*/
/*
[Fact] [Fact]
public void TestCreateWithSpecifiedTimeUTCThenValid() public void TestCreateWithSpecifiedTimeUTCThenValid()
{ {
@ -105,7 +103,7 @@ namespace Tests.Model_UTs
Assert.Equal(DateTimeKind.Utc, turn.When.Kind); Assert.Equal(DateTimeKind.Utc, turn.When.Kind);
Assert.Equal(dateTime.ToUniversalTime(), turn.When); Assert.Equal(dateTime.ToUniversalTime(), turn.When);
} }
*/
[Fact] [Fact]
public void TestCreateWithSpecifiedTimeNullPlayerThenException() public void TestCreateWithSpecifiedTimeNullPlayerThenException()
@ -134,7 +132,7 @@ namespace Tests.Model_UTs
Assert.Throws<ArgumentNullException>(action); Assert.Throws<ArgumentNullException>(action);
} }
/*
[Fact] [Fact]
public void TestCreateWithSpecifiedTimeEmptyFacesThenException() public void TestCreateWithSpecifiedTimeEmptyFacesThenException()
{ {
@ -149,9 +147,9 @@ namespace Tests.Model_UTs
// Assert // Assert
Assert.Throws<ArgumentException>(action); Assert.Throws<ArgumentException>(action);
} }
*/
/*
[Fact] [Fact]
public void TestCreateWithDefaultTimeThenValid() public void TestCreateWithDefaultTimeThenValid()
{ {
@ -166,9 +164,9 @@ namespace Tests.Model_UTs
Assert.Equal(DateTime.Now.ToUniversalTime().Date, turn.When.Date); Assert.Equal(DateTime.Now.ToUniversalTime().Date, turn.When.Date);
// N.B.: might fail between 11:59:59PM and 00:00:00AM // N.B.: might fail between 11:59:59PM and 00:00:00AM
} }
*/
/*
[Fact] [Fact]
public void TestToStringValidIfAllNormal() public void TestToStringValidIfAllNormal()
{ {
@ -178,8 +176,8 @@ namespace Tests.Model_UTs
Player player = new(name); Player player = new(name);
string expected = $"2018-06-15 16:30:00 -- {name} rolled: " string expected = $"2018-06-15 16:30:00 -- {name} rolled: "
+ FACE_ONE.ToString() + " " + FACE_ONE.ToString() + " "
+ FACE_TWO.ToString() + FACE_TWO.ToString() + " "
+ " Assets/images/" + FACE_THREE.ToString() + " " + FACE_THREE.ToString() + " "
+ FACE_FOUR.ToString(); + FACE_FOUR.ToString();
Turn turn = Turn.CreateWithSpecifiedTime(dateTime, player, DICE_N_FACES); Turn turn = Turn.CreateWithSpecifiedTime(dateTime, player, DICE_N_FACES);
@ -191,6 +189,5 @@ namespace Tests.Model_UTs
// Assert // Assert
Assert.Equal(expected, actual); Assert.Equal(expected, actual);
} }
*/
} }
} }

Loading…
Cancel
Save