alexis.drai
/
dice_app
0
0
Fork 0
Code Issues 60 Pull Requests Packages Projects 1 Releases Wiki Activity

🔥 Clean up imports
continuous-integration/drone/push Build is passing Details

Browse Source
pull/107/head
Alexis Drai 2 years ago
parent c28a36292a
commit a987f36eac
17 changed files with 252 additions and 313 deletions
Show Stats Download Patch File Download Diff File

5
Sources/Data/EF/DiceAppDbContext.cs
Unescape View File

@ -1,10 +1,5 @@
using Data.EF.Players; using Data.EF.Players;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Data.EF namespace Data.EF
{ {

5
Sources/Data/EF/DiceAppDbContextWithStub.cs
Unescape View File

@ -1,10 +1,5 @@
using Data.EF.Players; using Data.EF.Players;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Data.EF namespace Data.EF
{ {

5
Sources/Data/EF/Players/PlayerDBManager.cs
Unescape View File

@ -1,10 +1,5 @@
using Microsoft.EntityFrameworkCore.ChangeTracking; using Microsoft.EntityFrameworkCore.ChangeTracking;
using Model; using Model;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Data.EF.Players namespace Data.EF.Players
{ {

6
Sources/Data/EF/Players/PlayerEntity.cs
Unescape View File

@ -1,10 +1,4 @@
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Model.Players;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Data.EF.Players namespace Data.EF.Players
{ {

7
Sources/Data/ILoader.cs
Unescape View File

@ -1,9 +1,4 @@
using System; using Model.Games;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Model.Games;
namespace Data namespace Data
{ {

9
Sources/Data/Program.cs
Unescape View File

@ -1,13 +1,6 @@
 using Data.EF.Players;
using Data.EF;
using Data.EF.Players;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Internal;
using Model.Players; using Model.Players;
using System.Collections;
using System.ComponentModel;
using System.Diagnostics; using System.Diagnostics;
using System.Runtime.Intrinsics.Arm;
namespace Data namespace Data
{ {

4
Sources/Data/Stub.cs
Unescape View File

@ -1,9 +1,7 @@
using Model; using Model.Dice;
using Model.Dice;
using Model.Dice.Faces; using Model.Dice.Faces;
using Model.Games; using Model.Games;
using Model.Players; using Model.Players;
using System.Collections.Generic;
using System.Drawing; using System.Drawing;
namespace Data namespace Data

5
Sources/Model/Dice/DieManager.cs
Unescape View File

@ -1,4 +1,3 @@
using Model.Dice.Faces;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -59,8 +58,6 @@ namespace Model.Dice
{ {
diceGroups.Remove(toRemove.Key); diceGroups.Remove(toRemove.Key);
} }
} }
public KeyValuePair<string, IEnumerable<Die>> Update(KeyValuePair<string, IEnumerable<Die>> before, KeyValuePair<string, IEnumerable<Die>> after) public KeyValuePair<string, IEnumerable<Die>> Update(KeyValuePair<string, IEnumerable<Die>> before, KeyValuePair<string, IEnumerable<Die>> after)
@ -79,7 +76,5 @@ namespace Model.Dice
} }
return before; return before;
} }
} }
} }

5
Sources/Model/Dice/NumberDie.cs
Unescape View File

@ -1,9 +1,4 @@
using Model.Dice.Faces; using Model.Dice.Faces;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Model.Dice namespace Model.Dice
{ {

2
Sources/Model/Games/Game.cs
Unescape View File

@ -3,9 +3,7 @@ using Model.Dice.Faces;
using Model.Players; using Model.Players;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Numerics;
using System.Text; using System.Text;
namespace Model.Games namespace Model.Games

13
Sources/Model/Games/GameRunner.cs
Unescape View File

@ -1,11 +1,8 @@
using System; using Model.Dice;
using Model.Players;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Model.Dice;
using Model.Dice.Faces;
using Model.Players;
namespace Model.Games namespace Model.Games
{ {
@ -23,7 +20,7 @@ namespace Model.Games
} }
public GameRunner(IManager<Player> globalPlayerManager, IManager<KeyValuePair<string, IEnumerable<Die>>> globalDieManager) public GameRunner(IManager<Player> globalPlayerManager, IManager<KeyValuePair<string, IEnumerable<Die>>> globalDieManager)
: this(globalPlayerManager, globalDieManager, null){ } : this(globalPlayerManager, globalDieManager, null) { }
public IEnumerable<Game> GetAll() => games.AsEnumerable(); public IEnumerable<Game> GetAll() => games.AsEnumerable();
@ -55,7 +52,7 @@ namespace Model.Games
{ {
throw new ArgumentNullException(nameof(toAdd), "param should not be null"); throw new ArgumentNullException(nameof(toAdd), "param should not be null");
} }
games.Remove(games.FirstOrDefault(g => g.Name == toAdd.Name)); games.Remove(games.FirstOrDefault(g => g.Name == toAdd.Name));
// will often be an update: if game with that name exists, it is removed, else, nothing happens above // will often be an update: if game with that name exists, it is removed, else, nothing happens above
games.Add(toAdd); games.Add(toAdd);

12
Sources/Model/Games/Turn.cs
Unescape View File

@ -1,10 +1,10 @@
using System; using Model.Dice;
using Model.Dice.Faces;
using Model.Players;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using Model.Dice;
using Model.Dice.Faces;
using Model.Players;
namespace Model.Games namespace Model.Games
{ {
@ -116,8 +116,8 @@ namespace Model.Games
public bool Equals(Turn other) public bool Equals(Turn other)
{ {
return Player.Equals(other.Player) return Player.Equals(other.Player)
&& When.Equals(other.When) && When.Equals(other.When)
&& DiceNFaces.SequenceEqual(other.DiceNFaces); && DiceNFaces.SequenceEqual(other.DiceNFaces);
} }

9
Sources/Tests/Data_UTs/Players/PlayerEntityTest.cs
Unescape View File

@ -1,12 +1,7 @@
using Model.Players; using Data.EF.Players;
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Xunit;
using Data.EF.Players;
using Tests.Model_UTs; using Tests.Model_UTs;
using Xunit;
namespace Tests.Data_UTs.Players namespace Tests.Data_UTs.Players
{ {

3
Sources/Tests/Data_UTs/Players/PlayerExtensionsTest.cs
Unescape View File

@ -1,10 +1,7 @@
using Data.EF.Players; using Data.EF.Players;
using Model.Players; using Model.Players;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Xunit; using Xunit;
namespace Tests.Data_UTs.Players namespace Tests.Data_UTs.Players

4
Sources/Tests/Model_UTs/Games/GameRunnerTest.cs
Unescape View File

@ -1,13 +1,11 @@
using Model; using Data;
using Model.Dice; using Model.Dice;
using Model.Dice.Faces;
using Model.Games; using Model.Games;
using Model.Players; using Model.Players;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Xunit; using Xunit;
using Data;
namespace Tests.Model_UTs.Games namespace Tests.Model_UTs.Games
{ {

457
Sources/Tests/Model_UTs/Games/TurnTest.cs
Unescape View File

@ -1,245 +1,244 @@
using Data; using Data;
using Model.Dice; using Model.Dice;
using Model.Dice.Faces; using Model.Dice.Faces;
using Model.Games; using Model.Games;
using Model.Players; using Model.Players;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Linq;
using System.Linq; using Xunit;
using Xunit;
namespace Tests.Model_UTs.Games namespace Tests.Model_UTs.Games
{ {
public class TurnTest public class TurnTest
{ {
private readonly GameRunner stubGameRunner = new Stub().LoadApp(); private readonly GameRunner stubGameRunner = new Stub().LoadApp();
Dictionary<Die, Face> DICE_N_FACES_1, DICE_N_FACES_2; Dictionary<Die, Face> DICE_N_FACES_1, DICE_N_FACES_2;
public TurnTest() public TurnTest()
{ {
DICE_N_FACES_1 = (Dictionary<Die, Face>)stubGameRunner.GetAll().First().GetHistory().First().DiceNFaces; DICE_N_FACES_1 = (Dictionary<Die, Face>)stubGameRunner.GetAll().First().GetHistory().First().DiceNFaces;
DICE_N_FACES_2 = (Dictionary<Die, Face>)stubGameRunner.GetAll().Last().GetHistory().Last().DiceNFaces; DICE_N_FACES_2 = (Dictionary<Die, Face>)stubGameRunner.GetAll().Last().GetHistory().Last().DiceNFaces;
} }
[Fact] [Fact]
public void TestCreateWithSpecifiedTimeNotUTCThenValid() public void TestCreateWithSpecifiedTimeNotUTCThenValid()
{ {
// Arrange // Arrange
DateTime dateTime = new(year: 2018, month: 06, day: 15, hour: 16, minute: 30, second: 0, kind: DateTimeKind.Local); DateTime dateTime = new(year: 2018, month: 06, day: 15, hour: 16, minute: 30, second: 0, kind: DateTimeKind.Local);
Player player = new("Alice"); Player player = new("Alice");
Assert.NotEqual(DateTimeKind.Utc, dateTime.Kind); Assert.NotEqual(DateTimeKind.Utc, dateTime.Kind);
// Act // Act
Turn turn = Turn.CreateWithSpecifiedTime(dateTime, player, DICE_N_FACES_1); Turn turn = Turn.CreateWithSpecifiedTime(dateTime, player, DICE_N_FACES_1);
// Assert // Assert
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()
{ {
// Arrange // Arrange
DateTime dateTime = new(year: 2018, month: 06, day: 15, hour: 16, minute: 30, second: 0, kind: DateTimeKind.Utc); DateTime dateTime = new(year: 2018, month: 06, day: 15, hour: 16, minute: 30, second: 0, kind: DateTimeKind.Utc);
Player player = new("Bobby"); Player player = new("Bobby");
Assert.Equal(DateTimeKind.Utc, dateTime.Kind); Assert.Equal(DateTimeKind.Utc, dateTime.Kind);
// Act // Act
Turn turn = Turn.CreateWithSpecifiedTime(dateTime, player, DICE_N_FACES_1); Turn turn = Turn.CreateWithSpecifiedTime(dateTime, player, DICE_N_FACES_1);
// Assert // Assert
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()
{ {
// Arrange // Arrange
DateTime dateTime = new(year: 2018, month: 06, day: 15, hour: 16, minute: 30, second: 0, kind: DateTimeKind.Utc); DateTime dateTime = new(year: 2018, month: 06, day: 15, hour: 16, minute: 30, second: 0, kind: DateTimeKind.Utc);
// Act // Act
void action() => Turn.CreateWithSpecifiedTime(dateTime, null, DICE_N_FACES_1); void action() => Turn.CreateWithSpecifiedTime(dateTime, null, DICE_N_FACES_1);
// Assert // Assert
Assert.Throws<ArgumentNullException>(action); Assert.Throws<ArgumentNullException>(action);
} }
[Fact] [Fact]
public void TestCreateWithSpecifiedTimeNullFacesThenException() public void TestCreateWithSpecifiedTimeNullFacesThenException()
{ {
// Arrange // Arrange
DateTime dateTime = new(year: 2018, month: 06, day: 15, hour: 16, minute: 30, second: 0, kind: DateTimeKind.Utc); DateTime dateTime = new(year: 2018, month: 06, day: 15, hour: 16, minute: 30, second: 0, kind: DateTimeKind.Utc);
Player player = new("Chucky"); Player player = new("Chucky");
// Act // Act
void action() => Turn.CreateWithSpecifiedTime(dateTime, player, null); void action() => Turn.CreateWithSpecifiedTime(dateTime, player, null);
// Assert // Assert
Assert.Throws<ArgumentNullException>(action); Assert.Throws<ArgumentNullException>(action);
} }
[Fact] [Fact]
public void TestCreateWithSpecifiedTimeEmptyFacesThenException() public void TestCreateWithSpecifiedTimeEmptyFacesThenException()
{ {
// Arrange // Arrange
DateTime dateTime = new(year: 2018, month: 06, day: 15, hour: 16, minute: 30, second: 0, kind: DateTimeKind.Utc); DateTime dateTime = new(year: 2018, month: 06, day: 15, hour: 16, minute: 30, second: 0, kind: DateTimeKind.Utc);
Player player = new("Chucky"); Player player = new("Chucky");
DICE_N_FACES_1.Clear(); DICE_N_FACES_1.Clear();
// Act // Act
void action() => Turn.CreateWithSpecifiedTime(dateTime, player, DICE_N_FACES_1); void action() => Turn.CreateWithSpecifiedTime(dateTime, player, DICE_N_FACES_1);
// Assert // Assert
Assert.Throws<ArgumentException>(action); Assert.Throws<ArgumentException>(action);
} }
[Fact] [Fact]
public void TestCreateWithDefaultTimeThenValid() public void TestCreateWithDefaultTimeThenValid()
{ {
// Arrange // Arrange
Player player = new("Chloe"); Player player = new("Chloe");
// Act // Act
Turn turn = Turn.CreateWithDefaultTime(player, DICE_N_FACES_1); Turn turn = Turn.CreateWithDefaultTime(player, DICE_N_FACES_1);
// Assert // Assert
Assert.Equal(DateTimeKind.Utc, turn.When.Kind); Assert.Equal(DateTimeKind.Utc, turn.When.Kind);
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 TestDiceNFacesProperty() public void TestDiceNFacesProperty()
{ {
// Arrange // Arrange
Player player = new("Erika"); Player player = new("Erika");
// Act // Act
Turn turn = Turn.CreateWithDefaultTime(player, DICE_N_FACES_1); Turn turn = Turn.CreateWithDefaultTime(player, DICE_N_FACES_1);
IEnumerable<KeyValuePair<Die, Face>> expected = DICE_N_FACES_1.AsEnumerable(); IEnumerable<KeyValuePair<Die, Face>> expected = DICE_N_FACES_1.AsEnumerable();
// Assert // Assert
Assert.Equal(expected, turn.DiceNFaces); Assert.Equal(expected, turn.DiceNFaces);
} }
[Fact] [Fact]
public void TestEqualsFalseIfNotTurn() public void TestEqualsFalseIfNotTurn()
{ {
// Arrange // Arrange
Point point; Point point;
Turn turn; Turn turn;
Player player = new("Freddie"); Player player = new("Freddie");
// Act // Act
point = new(1, 2); point = new(1, 2);
turn = Turn.CreateWithDefaultTime(player, DICE_N_FACES_1); turn = Turn.CreateWithDefaultTime(player, DICE_N_FACES_1);
// Assert // Assert
Assert.False(point.Equals(turn)); Assert.False(point.Equals(turn));
Assert.False(point.GetHashCode().Equals(turn.GetHashCode())); Assert.False(point.GetHashCode().Equals(turn.GetHashCode()));
Assert.False(turn.Equals(point)); Assert.False(turn.Equals(point));
Assert.False(turn.GetHashCode().Equals(point.GetHashCode())); Assert.False(turn.GetHashCode().Equals(point.GetHashCode()));
} }
[Fact] [Fact]
public void TestGoesThruToSecondMethodIfObjIsTypeTurn() public void TestGoesThruToSecondMethodIfObjIsTypeTurn()
{ {
// Arrange // Arrange
object t1; object t1;
Turn t2; Turn t2;
Player player1 = new Player("Marvin"); Player player1 = new Player("Marvin");
Player player2 = new Player("Noah"); Player player2 = new Player("Noah");
// Act // Act
t1 = Turn.CreateWithDefaultTime(player1, DICE_N_FACES_1); t1 = Turn.CreateWithDefaultTime(player1, DICE_N_FACES_1);
t2 = Turn.CreateWithDefaultTime(player2, DICE_N_FACES_2); t2 = Turn.CreateWithDefaultTime(player2, DICE_N_FACES_2);
// Assert // Assert
Assert.False(t1.Equals(t2)); Assert.False(t1.Equals(t2));
Assert.False(t1.GetHashCode().Equals(t2.GetHashCode())); Assert.False(t1.GetHashCode().Equals(t2.GetHashCode()));
Assert.False(t2.Equals(t1)); Assert.False(t2.Equals(t1));
Assert.False(t2.GetHashCode().Equals(t1.GetHashCode())); Assert.False(t2.GetHashCode().Equals(t1.GetHashCode()));
} }
[Fact] [Fact]
public void TestEqualsFalseIfNotSamePlayer() public void TestEqualsFalseIfNotSamePlayer()
{ {
// Arrange // Arrange
Player player1 = new("Panama"); Player player1 = new("Panama");
Player player2 = new("Clyde"); Player player2 = new("Clyde");
// Act // Act
Turn t1 = Turn.CreateWithDefaultTime(player1, DICE_N_FACES_2); Turn t1 = Turn.CreateWithDefaultTime(player1, DICE_N_FACES_2);
Turn t2 = Turn.CreateWithDefaultTime(player2, DICE_N_FACES_2); Turn t2 = Turn.CreateWithDefaultTime(player2, DICE_N_FACES_2);
// Assert // Assert
Assert.False(t1.Equals(t2)); Assert.False(t1.Equals(t2));
Assert.False(t1.GetHashCode().Equals(t2.GetHashCode())); Assert.False(t1.GetHashCode().Equals(t2.GetHashCode()));
Assert.False(t2.Equals(t1)); Assert.False(t2.Equals(t1));
Assert.False(t2.GetHashCode().Equals(t1.GetHashCode())); 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] [Fact]
public void TestEqualsFalseIfNotSameTime() public void TestEqualsFalseIfNotSameDiceNFaces()
{ {
// Arrange // Arrange
Player player = new("Oscar"); Player player = new("Django");
// Act // Act
Turn t1 = Turn.CreateWithSpecifiedTime(new DateTime(1994, 07, 10), player, DICE_N_FACES_1); Turn t1 = Turn.CreateWithDefaultTime(player, DICE_N_FACES_1);
Turn t2 = Turn.CreateWithSpecifiedTime(new DateTime(1991, 08, 20), player, DICE_N_FACES_1); Turn t2 = Turn.CreateWithDefaultTime(player, DICE_N_FACES_2);
// Assert // Assert
Assert.False(t1.Equals(t2)); Assert.False(t1.Equals(t2));
Assert.False(t1.GetHashCode().Equals(t2.GetHashCode())); Assert.False(t1.GetHashCode().Equals(t2.GetHashCode()));
Assert.False(t2.Equals(t1)); Assert.False(t2.Equals(t1));
Assert.False(t2.GetHashCode().Equals(t1.GetHashCode())); Assert.False(t2.GetHashCode().Equals(t1.GetHashCode()));
} }
[Fact] [Fact]
public void TestEqualsFalseIfNotSameDiceNFaces() public void TestEqualsTrueIfExactlySameProperties()
{ {
// Arrange // Arrange
Player player = new("Django"); Player player = new("Elyse");
// Act // Act
Turn t1 = Turn.CreateWithDefaultTime(player, DICE_N_FACES_1); Turn t1 = Turn.CreateWithSpecifiedTime(new DateTime(1990, 04, 29), player, DICE_N_FACES_1);
Turn t2 = Turn.CreateWithDefaultTime(player, DICE_N_FACES_2); Turn t2 = Turn.CreateWithSpecifiedTime(new DateTime(1990, 04, 29), player, DICE_N_FACES_1);
// Assert // Assert
Assert.False(t1.Equals(t2)); Assert.True(t1.Equals(t2));
Assert.False(t1.GetHashCode().Equals(t2.GetHashCode())); Assert.True(t1.GetHashCode().Equals(t2.GetHashCode()));
Assert.False(t2.Equals(t1)); Assert.True(t2.Equals(t1));
Assert.False(t2.GetHashCode().Equals(t1.GetHashCode())); 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()));
}
}
}

14
Sources/Tests/Model_UTs/Point.cs
Unescape View File

@ -2,12 +2,12 @@
{ {
public class Point public class Point
{ {
public int X { get; private set; } public int X { get; private set; }
public int Y { get; private set; } public int Y { get; private set; }
public Point(int x, int y) public Point(int x, int y)
{ {
X = x; Y = y; X = x; Y = y;
} }
} }
} }

Write Preview
Loading…
Cancel
Save