From dfe2a8aea97dad7d838bf0db4698da06aeb17401 Mon Sep 17 00:00:00 2001 From: "jeremy.mouyon" Date: Sun, 2 Jun 2024 12:40:40 +0200 Subject: [PATCH] fix smellll --- Qwirkle/Files/game.json | 1427 +-------------------------------- Qwirkle/TestBase/TestBoard.cs | 44 +- Qwirkle/TestBase/TestGame.cs | 2 +- Qwirkle/TestBase/TestScore.cs | 2 +- Qwirkle/TestBase/TestTile.cs | 33 +- 5 files changed, 46 insertions(+), 1462 deletions(-) diff --git a/Qwirkle/Files/game.json b/Qwirkle/Files/game.json index d4f31f8..6796780 100644 --- a/Qwirkle/Files/game.json +++ b/Qwirkle/Files/game.json @@ -1,1426 +1 @@ -{ - "GameRunning": true, - "bag": { - "tiles": [ - { - "color": 0, - "shape": 0 - }, - { - "color": 1, - "shape": 0 - }, - { - "color": 2, - "shape": 0 - }, - { - "color": 3, - "shape": 0 - }, - { - "color": 4, - "shape": 0 - }, - { - "color": 5, - "shape": 0 - }, - { - "color": 1, - "shape": 1 - }, - { - "color": 2, - "shape": 1 - }, - { - "color": 3, - "shape": 1 - }, - { - "color": 4, - "shape": 1 - }, - { - "color": 5, - "shape": 1 - }, - { - "color": 0, - "shape": 2 - }, - { - "color": 1, - "shape": 2 - }, - { - "color": 2, - "shape": 2 - }, - { - "color": 3, - "shape": 2 - }, - { - "color": 4, - "shape": 2 - }, - { - "color": 5, - "shape": 2 - }, - { - "color": 0, - "shape": 3 - }, - { - "color": 1, - "shape": 3 - }, - { - "color": 2, - "shape": 3 - }, - { - "color": 4, - "shape": 3 - }, - { - "color": 5, - "shape": 3 - }, - { - "color": 1, - "shape": 4 - }, - { - "color": 2, - "shape": 4 - }, - { - "color": 3, - "shape": 4 - }, - { - "color": 4, - "shape": 4 - }, - { - "color": 5, - "shape": 4 - }, - { - "color": 0, - "shape": 5 - }, - { - "color": 1, - "shape": 5 - }, - { - "color": 2, - "shape": 5 - }, - { - "color": 3, - "shape": 5 - }, - { - "color": 4, - "shape": 5 - }, - { - "color": 5, - "shape": 5 - }, - { - "color": 0, - "shape": 0 - }, - { - "color": 1, - "shape": 0 - }, - { - "color": 2, - "shape": 0 - }, - { - "color": 3, - "shape": 0 - }, - { - "color": 4, - "shape": 0 - }, - { - "color": 5, - "shape": 0 - }, - { - "color": 0, - "shape": 1 - }, - { - "color": 1, - "shape": 1 - }, - { - "color": 2, - "shape": 1 - }, - { - "color": 3, - "shape": 1 - }, - { - "color": 4, - "shape": 1 - }, - { - "color": 5, - "shape": 1 - }, - { - "color": 0, - "shape": 2 - }, - { - "color": 1, - "shape": 2 - }, - { - "color": 2, - "shape": 2 - }, - { - "color": 3, - "shape": 2 - }, - { - "color": 4, - "shape": 2 - }, - { - "color": 5, - "shape": 2 - }, - { - "color": 0, - "shape": 3 - }, - { - "color": 1, - "shape": 3 - }, - { - "color": 2, - "shape": 3 - }, - { - "color": 3, - "shape": 3 - }, - { - "color": 1, - "shape": 4 - }, - { - "color": 2, - "shape": 4 - }, - { - "color": 3, - "shape": 4 - }, - { - "color": 4, - "shape": 4 - }, - { - "color": 5, - "shape": 4 - }, - { - "color": 0, - "shape": 5 - }, - { - "color": 1, - "shape": 5 - }, - { - "color": 2, - "shape": 5 - }, - { - "color": 3, - "shape": 5 - }, - { - "color": 4, - "shape": 5 - }, - { - "color": 3, - "shape": 0 - }, - { - "color": 4, - "shape": 0 - }, - { - "color": 5, - "shape": 0 - }, - { - "color": 0, - "shape": 1 - }, - { - "color": 1, - "shape": 1 - }, - { - "color": 2, - "shape": 1 - }, - { - "color": 3, - "shape": 1 - }, - { - "color": 4, - "shape": 1 - }, - { - "color": 5, - "shape": 1 - }, - { - "color": 0, - "shape": 2 - }, - { - "color": 1, - "shape": 2 - }, - { - "color": 2, - "shape": 2 - }, - { - "color": 3, - "shape": 2 - }, - { - "color": 4, - "shape": 2 - }, - { - "color": 5, - "shape": 2 - }, - { - "color": 0, - "shape": 3 - }, - { - "color": 1, - "shape": 3 - }, - { - "color": 4, - "shape": 3 - }, - { - "color": 5, - "shape": 3 - }, - { - "color": 0, - "shape": 4 - }, - { - "color": 1, - "shape": 4 - }, - { - "color": 2, - "shape": 4 - }, - { - "color": 4, - "shape": 4 - }, - { - "color": 5, - "shape": 4 - }, - { - "color": 0, - "shape": 5 - }, - { - "color": 1, - "shape": 5 - }, - { - "color": 2, - "shape": 5 - }, - { - "color": 4, - "shape": 5 - }, - { - "color": 5, - "shape": 5 - } - ] - }, - "board": { - "Columns": 15, - "Rows": 12, - "cells": [ - { - "Tile": { - "color": 3, - "shape": 4 - }, - "x": 0, - "y": 0 - }, - { - "Tile": null, - "x": 0, - "y": 1 - }, - { - "Tile": null, - "x": 0, - "y": 2 - }, - { - "Tile": null, - "x": 0, - "y": 3 - }, - { - "Tile": null, - "x": 0, - "y": 4 - }, - { - "Tile": null, - "x": 0, - "y": 5 - }, - { - "Tile": null, - "x": 0, - "y": 6 - }, - { - "Tile": null, - "x": 0, - "y": 7 - }, - { - "Tile": null, - "x": 0, - "y": 8 - }, - { - "Tile": null, - "x": 0, - "y": 9 - }, - { - "Tile": null, - "x": 0, - "y": 10 - }, - { - "Tile": null, - "x": 0, - "y": 11 - }, - { - "Tile": null, - "x": 0, - "y": 12 - }, - { - "Tile": null, - "x": 0, - "y": 13 - }, - { - "Tile": null, - "x": 0, - "y": 14 - }, - { - "Tile": { - "color": 3, - "shape": 5 - }, - "x": 1, - "y": 0 - }, - { - "Tile": null, - "x": 1, - "y": 1 - }, - { - "Tile": null, - "x": 1, - "y": 2 - }, - { - "Tile": null, - "x": 1, - "y": 3 - }, - { - "Tile": null, - "x": 1, - "y": 4 - }, - { - "Tile": null, - "x": 1, - "y": 5 - }, - { - "Tile": null, - "x": 1, - "y": 6 - }, - { - "Tile": null, - "x": 1, - "y": 7 - }, - { - "Tile": null, - "x": 1, - "y": 8 - }, - { - "Tile": null, - "x": 1, - "y": 9 - }, - { - "Tile": null, - "x": 1, - "y": 10 - }, - { - "Tile": null, - "x": 1, - "y": 11 - }, - { - "Tile": null, - "x": 1, - "y": 12 - }, - { - "Tile": null, - "x": 1, - "y": 13 - }, - { - "Tile": null, - "x": 1, - "y": 14 - }, - { - "Tile": null, - "x": 2, - "y": 0 - }, - { - "Tile": null, - "x": 2, - "y": 1 - }, - { - "Tile": null, - "x": 2, - "y": 2 - }, - { - "Tile": null, - "x": 2, - "y": 3 - }, - { - "Tile": null, - "x": 2, - "y": 4 - }, - { - "Tile": null, - "x": 2, - "y": 5 - }, - { - "Tile": null, - "x": 2, - "y": 6 - }, - { - "Tile": null, - "x": 2, - "y": 7 - }, - { - "Tile": null, - "x": 2, - "y": 8 - }, - { - "Tile": null, - "x": 2, - "y": 9 - }, - { - "Tile": null, - "x": 2, - "y": 10 - }, - { - "Tile": null, - "x": 2, - "y": 11 - }, - { - "Tile": null, - "x": 2, - "y": 12 - }, - { - "Tile": null, - "x": 2, - "y": 13 - }, - { - "Tile": null, - "x": 2, - "y": 14 - }, - { - "Tile": null, - "x": 3, - "y": 0 - }, - { - "Tile": null, - "x": 3, - "y": 1 - }, - { - "Tile": null, - "x": 3, - "y": 2 - }, - { - "Tile": null, - "x": 3, - "y": 3 - }, - { - "Tile": null, - "x": 3, - "y": 4 - }, - { - "Tile": null, - "x": 3, - "y": 5 - }, - { - "Tile": null, - "x": 3, - "y": 6 - }, - { - "Tile": null, - "x": 3, - "y": 7 - }, - { - "Tile": null, - "x": 3, - "y": 8 - }, - { - "Tile": null, - "x": 3, - "y": 9 - }, - { - "Tile": null, - "x": 3, - "y": 10 - }, - { - "Tile": null, - "x": 3, - "y": 11 - }, - { - "Tile": null, - "x": 3, - "y": 12 - }, - { - "Tile": null, - "x": 3, - "y": 13 - }, - { - "Tile": null, - "x": 3, - "y": 14 - }, - { - "Tile": null, - "x": 4, - "y": 0 - }, - { - "Tile": null, - "x": 4, - "y": 1 - }, - { - "Tile": null, - "x": 4, - "y": 2 - }, - { - "Tile": null, - "x": 4, - "y": 3 - }, - { - "Tile": null, - "x": 4, - "y": 4 - }, - { - "Tile": null, - "x": 4, - "y": 5 - }, - { - "Tile": null, - "x": 4, - "y": 6 - }, - { - "Tile": null, - "x": 4, - "y": 7 - }, - { - "Tile": null, - "x": 4, - "y": 8 - }, - { - "Tile": null, - "x": 4, - "y": 9 - }, - { - "Tile": null, - "x": 4, - "y": 10 - }, - { - "Tile": null, - "x": 4, - "y": 11 - }, - { - "Tile": null, - "x": 4, - "y": 12 - }, - { - "Tile": null, - "x": 4, - "y": 13 - }, - { - "Tile": null, - "x": 4, - "y": 14 - }, - { - "Tile": null, - "x": 5, - "y": 0 - }, - { - "Tile": null, - "x": 5, - "y": 1 - }, - { - "Tile": null, - "x": 5, - "y": 2 - }, - { - "Tile": null, - "x": 5, - "y": 3 - }, - { - "Tile": null, - "x": 5, - "y": 4 - }, - { - "Tile": null, - "x": 5, - "y": 5 - }, - { - "Tile": null, - "x": 5, - "y": 6 - }, - { - "Tile": null, - "x": 5, - "y": 7 - }, - { - "Tile": null, - "x": 5, - "y": 8 - }, - { - "Tile": null, - "x": 5, - "y": 9 - }, - { - "Tile": null, - "x": 5, - "y": 10 - }, - { - "Tile": null, - "x": 5, - "y": 11 - }, - { - "Tile": null, - "x": 5, - "y": 12 - }, - { - "Tile": null, - "x": 5, - "y": 13 - }, - { - "Tile": null, - "x": 5, - "y": 14 - }, - { - "Tile": null, - "x": 6, - "y": 0 - }, - { - "Tile": null, - "x": 6, - "y": 1 - }, - { - "Tile": null, - "x": 6, - "y": 2 - }, - { - "Tile": null, - "x": 6, - "y": 3 - }, - { - "Tile": null, - "x": 6, - "y": 4 - }, - { - "Tile": null, - "x": 6, - "y": 5 - }, - { - "Tile": null, - "x": 6, - "y": 6 - }, - { - "Tile": null, - "x": 6, - "y": 7 - }, - { - "Tile": null, - "x": 6, - "y": 8 - }, - { - "Tile": null, - "x": 6, - "y": 9 - }, - { - "Tile": null, - "x": 6, - "y": 10 - }, - { - "Tile": null, - "x": 6, - "y": 11 - }, - { - "Tile": null, - "x": 6, - "y": 12 - }, - { - "Tile": null, - "x": 6, - "y": 13 - }, - { - "Tile": null, - "x": 6, - "y": 14 - }, - { - "Tile": null, - "x": 7, - "y": 0 - }, - { - "Tile": null, - "x": 7, - "y": 1 - }, - { - "Tile": null, - "x": 7, - "y": 2 - }, - { - "Tile": null, - "x": 7, - "y": 3 - }, - { - "Tile": null, - "x": 7, - "y": 4 - }, - { - "Tile": null, - "x": 7, - "y": 5 - }, - { - "Tile": null, - "x": 7, - "y": 6 - }, - { - "Tile": null, - "x": 7, - "y": 7 - }, - { - "Tile": null, - "x": 7, - "y": 8 - }, - { - "Tile": null, - "x": 7, - "y": 9 - }, - { - "Tile": null, - "x": 7, - "y": 10 - }, - { - "Tile": null, - "x": 7, - "y": 11 - }, - { - "Tile": null, - "x": 7, - "y": 12 - }, - { - "Tile": null, - "x": 7, - "y": 13 - }, - { - "Tile": null, - "x": 7, - "y": 14 - }, - { - "Tile": null, - "x": 8, - "y": 0 - }, - { - "Tile": null, - "x": 8, - "y": 1 - }, - { - "Tile": null, - "x": 8, - "y": 2 - }, - { - "Tile": null, - "x": 8, - "y": 3 - }, - { - "Tile": null, - "x": 8, - "y": 4 - }, - { - "Tile": null, - "x": 8, - "y": 5 - }, - { - "Tile": null, - "x": 8, - "y": 6 - }, - { - "Tile": null, - "x": 8, - "y": 7 - }, - { - "Tile": null, - "x": 8, - "y": 8 - }, - { - "Tile": null, - "x": 8, - "y": 9 - }, - { - "Tile": null, - "x": 8, - "y": 10 - }, - { - "Tile": null, - "x": 8, - "y": 11 - }, - { - "Tile": null, - "x": 8, - "y": 12 - }, - { - "Tile": null, - "x": 8, - "y": 13 - }, - { - "Tile": null, - "x": 8, - "y": 14 - }, - { - "Tile": null, - "x": 9, - "y": 0 - }, - { - "Tile": null, - "x": 9, - "y": 1 - }, - { - "Tile": null, - "x": 9, - "y": 2 - }, - { - "Tile": null, - "x": 9, - "y": 3 - }, - { - "Tile": null, - "x": 9, - "y": 4 - }, - { - "Tile": null, - "x": 9, - "y": 5 - }, - { - "Tile": null, - "x": 9, - "y": 6 - }, - { - "Tile": null, - "x": 9, - "y": 7 - }, - { - "Tile": null, - "x": 9, - "y": 8 - }, - { - "Tile": null, - "x": 9, - "y": 9 - }, - { - "Tile": null, - "x": 9, - "y": 10 - }, - { - "Tile": null, - "x": 9, - "y": 11 - }, - { - "Tile": null, - "x": 9, - "y": 12 - }, - { - "Tile": null, - "x": 9, - "y": 13 - }, - { - "Tile": null, - "x": 9, - "y": 14 - }, - { - "Tile": null, - "x": 10, - "y": 0 - }, - { - "Tile": null, - "x": 10, - "y": 1 - }, - { - "Tile": null, - "x": 10, - "y": 2 - }, - { - "Tile": null, - "x": 10, - "y": 3 - }, - { - "Tile": null, - "x": 10, - "y": 4 - }, - { - "Tile": null, - "x": 10, - "y": 5 - }, - { - "Tile": null, - "x": 10, - "y": 6 - }, - { - "Tile": null, - "x": 10, - "y": 7 - }, - { - "Tile": null, - "x": 10, - "y": 8 - }, - { - "Tile": null, - "x": 10, - "y": 9 - }, - { - "Tile": null, - "x": 10, - "y": 10 - }, - { - "Tile": null, - "x": 10, - "y": 11 - }, - { - "Tile": null, - "x": 10, - "y": 12 - }, - { - "Tile": null, - "x": 10, - "y": 13 - }, - { - "Tile": null, - "x": 10, - "y": 14 - }, - { - "Tile": null, - "x": 11, - "y": 0 - }, - { - "Tile": null, - "x": 11, - "y": 1 - }, - { - "Tile": null, - "x": 11, - "y": 2 - }, - { - "Tile": null, - "x": 11, - "y": 3 - }, - { - "Tile": null, - "x": 11, - "y": 4 - }, - { - "Tile": null, - "x": 11, - "y": 5 - }, - { - "Tile": null, - "x": 11, - "y": 6 - }, - { - "Tile": null, - "x": 11, - "y": 7 - }, - { - "Tile": null, - "x": 11, - "y": 8 - }, - { - "Tile": null, - "x": 11, - "y": 9 - }, - { - "Tile": null, - "x": 11, - "y": 10 - }, - { - "Tile": null, - "x": 11, - "y": 11 - }, - { - "Tile": null, - "x": 11, - "y": 12 - }, - { - "Tile": null, - "x": 11, - "y": 13 - }, - { - "Tile": null, - "x": 11, - "y": 14 - } - ] - }, - "cellUsed": [], - "players": [ - { - "IsPlaying": false, - "NameTag": "Jules", - "Tiles": [ - { - "color": 0, - "shape": 1 - }, - { - "color": 0, - "shape": 4 - }, - { - "color": 0, - "shape": 0 - }, - { - "color": 2, - "shape": 0 - }, - { - "color": 5, - "shape": 5 - }, - { - "color": 0, - "shape": 4 - } - ] - }, - { - "IsPlaying": true, - "NameTag": "Jérémy", - "Tiles": [ - { - "color": 4, - "shape": 3 - }, - { - "color": 3, - "shape": 3 - }, - { - "color": 1, - "shape": 0 - }, - { - "color": 2, - "shape": 3 - }, - { - "color": 3, - "shape": 3 - }, - { - "color": 5, - "shape": 3 - } - ] - } - ], - "scoreBoard": [ - { - "Key": { - "IsPlaying": false, - "NameTag": "Jules", - "Tiles": [ - { - "color": 0, - "shape": 1 - }, - { - "color": 0, - "shape": 4 - }, - { - "color": 0, - "shape": 0 - }, - { - "color": 2, - "shape": 0 - }, - { - "color": 5, - "shape": 5 - }, - { - "color": 0, - "shape": 4 - } - ] - }, - "Value": 2 - }, - { - "Key": { - "IsPlaying": true, - "NameTag": "Jérémy", - "Tiles": [ - { - "color": 4, - "shape": 3 - }, - { - "color": 3, - "shape": 3 - }, - { - "color": 1, - "shape": 0 - }, - { - "color": 2, - "shape": 3 - }, - { - "color": 3, - "shape": 3 - }, - { - "color": 5, - "shape": 3 - } - ] - }, - "Value": 0 - } - ] -} \ No newline at end of file +{"GameRunning":false,"bag":null,"board":{"Columns":15,"Rows":12,"cells":[{"Tile":null,"x":0,"y":0},{"Tile":null,"x":0,"y":1},{"Tile":null,"x":0,"y":2},{"Tile":null,"x":0,"y":3},{"Tile":null,"x":0,"y":4},{"Tile":null,"x":0,"y":5},{"Tile":null,"x":0,"y":6},{"Tile":null,"x":0,"y":7},{"Tile":null,"x":0,"y":8},{"Tile":null,"x":0,"y":9},{"Tile":null,"x":0,"y":10},{"Tile":null,"x":0,"y":11},{"Tile":null,"x":0,"y":12},{"Tile":null,"x":0,"y":13},{"Tile":null,"x":0,"y":14},{"Tile":null,"x":1,"y":0},{"Tile":null,"x":1,"y":1},{"Tile":null,"x":1,"y":2},{"Tile":null,"x":1,"y":3},{"Tile":null,"x":1,"y":4},{"Tile":null,"x":1,"y":5},{"Tile":null,"x":1,"y":6},{"Tile":null,"x":1,"y":7},{"Tile":null,"x":1,"y":8},{"Tile":null,"x":1,"y":9},{"Tile":null,"x":1,"y":10},{"Tile":null,"x":1,"y":11},{"Tile":null,"x":1,"y":12},{"Tile":null,"x":1,"y":13},{"Tile":null,"x":1,"y":14},{"Tile":null,"x":2,"y":0},{"Tile":null,"x":2,"y":1},{"Tile":null,"x":2,"y":2},{"Tile":null,"x":2,"y":3},{"Tile":null,"x":2,"y":4},{"Tile":null,"x":2,"y":5},{"Tile":null,"x":2,"y":6},{"Tile":null,"x":2,"y":7},{"Tile":null,"x":2,"y":8},{"Tile":null,"x":2,"y":9},{"Tile":null,"x":2,"y":10},{"Tile":null,"x":2,"y":11},{"Tile":null,"x":2,"y":12},{"Tile":null,"x":2,"y":13},{"Tile":null,"x":2,"y":14},{"Tile":null,"x":3,"y":0},{"Tile":null,"x":3,"y":1},{"Tile":null,"x":3,"y":2},{"Tile":null,"x":3,"y":3},{"Tile":null,"x":3,"y":4},{"Tile":null,"x":3,"y":5},{"Tile":null,"x":3,"y":6},{"Tile":null,"x":3,"y":7},{"Tile":null,"x":3,"y":8},{"Tile":null,"x":3,"y":9},{"Tile":null,"x":3,"y":10},{"Tile":null,"x":3,"y":11},{"Tile":null,"x":3,"y":12},{"Tile":null,"x":3,"y":13},{"Tile":null,"x":3,"y":14},{"Tile":null,"x":4,"y":0},{"Tile":null,"x":4,"y":1},{"Tile":null,"x":4,"y":2},{"Tile":null,"x":4,"y":3},{"Tile":null,"x":4,"y":4},{"Tile":null,"x":4,"y":5},{"Tile":null,"x":4,"y":6},{"Tile":null,"x":4,"y":7},{"Tile":null,"x":4,"y":8},{"Tile":null,"x":4,"y":9},{"Tile":null,"x":4,"y":10},{"Tile":null,"x":4,"y":11},{"Tile":null,"x":4,"y":12},{"Tile":null,"x":4,"y":13},{"Tile":null,"x":4,"y":14},{"Tile":null,"x":5,"y":0},{"Tile":null,"x":5,"y":1},{"Tile":null,"x":5,"y":2},{"Tile":null,"x":5,"y":3},{"Tile":null,"x":5,"y":4},{"Tile":null,"x":5,"y":5},{"Tile":null,"x":5,"y":6},{"Tile":null,"x":5,"y":7},{"Tile":null,"x":5,"y":8},{"Tile":null,"x":5,"y":9},{"Tile":null,"x":5,"y":10},{"Tile":null,"x":5,"y":11},{"Tile":null,"x":5,"y":12},{"Tile":null,"x":5,"y":13},{"Tile":null,"x":5,"y":14},{"Tile":null,"x":6,"y":0},{"Tile":null,"x":6,"y":1},{"Tile":null,"x":6,"y":2},{"Tile":null,"x":6,"y":3},{"Tile":null,"x":6,"y":4},{"Tile":null,"x":6,"y":5},{"Tile":null,"x":6,"y":6},{"Tile":null,"x":6,"y":7},{"Tile":null,"x":6,"y":8},{"Tile":null,"x":6,"y":9},{"Tile":null,"x":6,"y":10},{"Tile":null,"x":6,"y":11},{"Tile":null,"x":6,"y":12},{"Tile":null,"x":6,"y":13},{"Tile":null,"x":6,"y":14},{"Tile":null,"x":7,"y":0},{"Tile":null,"x":7,"y":1},{"Tile":null,"x":7,"y":2},{"Tile":null,"x":7,"y":3},{"Tile":null,"x":7,"y":4},{"Tile":null,"x":7,"y":5},{"Tile":null,"x":7,"y":6},{"Tile":null,"x":7,"y":7},{"Tile":null,"x":7,"y":8},{"Tile":null,"x":7,"y":9},{"Tile":null,"x":7,"y":10},{"Tile":null,"x":7,"y":11},{"Tile":null,"x":7,"y":12},{"Tile":null,"x":7,"y":13},{"Tile":null,"x":7,"y":14},{"Tile":null,"x":8,"y":0},{"Tile":null,"x":8,"y":1},{"Tile":null,"x":8,"y":2},{"Tile":null,"x":8,"y":3},{"Tile":null,"x":8,"y":4},{"Tile":null,"x":8,"y":5},{"Tile":null,"x":8,"y":6},{"Tile":null,"x":8,"y":7},{"Tile":null,"x":8,"y":8},{"Tile":null,"x":8,"y":9},{"Tile":null,"x":8,"y":10},{"Tile":null,"x":8,"y":11},{"Tile":null,"x":8,"y":12},{"Tile":null,"x":8,"y":13},{"Tile":null,"x":8,"y":14},{"Tile":null,"x":9,"y":0},{"Tile":null,"x":9,"y":1},{"Tile":null,"x":9,"y":2},{"Tile":null,"x":9,"y":3},{"Tile":null,"x":9,"y":4},{"Tile":null,"x":9,"y":5},{"Tile":null,"x":9,"y":6},{"Tile":null,"x":9,"y":7},{"Tile":null,"x":9,"y":8},{"Tile":null,"x":9,"y":9},{"Tile":null,"x":9,"y":10},{"Tile":null,"x":9,"y":11},{"Tile":null,"x":9,"y":12},{"Tile":null,"x":9,"y":13},{"Tile":null,"x":9,"y":14},{"Tile":null,"x":10,"y":0},{"Tile":null,"x":10,"y":1},{"Tile":null,"x":10,"y":2},{"Tile":null,"x":10,"y":3},{"Tile":null,"x":10,"y":4},{"Tile":null,"x":10,"y":5},{"Tile":null,"x":10,"y":6},{"Tile":null,"x":10,"y":7},{"Tile":null,"x":10,"y":8},{"Tile":null,"x":10,"y":9},{"Tile":null,"x":10,"y":10},{"Tile":null,"x":10,"y":11},{"Tile":null,"x":10,"y":12},{"Tile":null,"x":10,"y":13},{"Tile":null,"x":10,"y":14},{"Tile":null,"x":11,"y":0},{"Tile":null,"x":11,"y":1},{"Tile":null,"x":11,"y":2},{"Tile":null,"x":11,"y":3},{"Tile":null,"x":11,"y":4},{"Tile":null,"x":11,"y":5},{"Tile":null,"x":11,"y":6},{"Tile":null,"x":11,"y":7},{"Tile":null,"x":11,"y":8},{"Tile":null,"x":11,"y":9},{"Tile":null,"x":11,"y":10},{"Tile":null,"x":11,"y":11},{"Tile":null,"x":11,"y":12},{"Tile":null,"x":11,"y":13},{"Tile":null,"x":11,"y":14}]},"cellUsed":[],"players":[],"scoreBoard":[]} \ No newline at end of file diff --git a/Qwirkle/TestBase/TestBoard.cs b/Qwirkle/TestBase/TestBoard.cs index 3566669..98088e5 100644 --- a/Qwirkle/TestBase/TestBoard.cs +++ b/Qwirkle/TestBase/TestBoard.cs @@ -6,26 +6,28 @@ namespace TestBase; public class TestBoard { - public static IEnumerable Data_Board() + public static TheoryData DataBoard() { - yield return new object[] + var data = new TheoryData { - true, - 1, - 2, - new Tile(Shape.Round, Color.Red) - }; - yield return new object[] - { - false, - -5, - 9999, - new Tile(Shape.Round, Color.Red) + { + true, + 1, + 2, + new Tile(Shape.Round, Color.Red) + }, + { + false, + -5, + 9999, + new Tile(Shape.Round, Color.Red) + } }; + return data; } [Theory] - [MemberData(nameof(Data_Board))] + [MemberData(nameof(DataBoard))] public void Test_BoardAddSolo(bool except, int x, int y, Tile t) { @@ -40,14 +42,18 @@ public class TestBoard Assert.True(b.AddTileInCell(x, y, t)); } - public static IEnumerable Data_BoardDouble() + public static TheoryData Data_BoardDouble() { - yield return new object[] + var data = new TheoryData { - 1, - 2, - new Tile(Shape.Round, Color.Red) + { + 1, + 2, + new Tile(Shape.Round, Color.Red) + } }; + + return data; } [Theory] diff --git a/Qwirkle/TestBase/TestGame.cs b/Qwirkle/TestBase/TestGame.cs index 308beb1..daf47a5 100644 --- a/Qwirkle/TestBase/TestGame.cs +++ b/Qwirkle/TestBase/TestGame.cs @@ -45,7 +45,7 @@ public class TestGame if (!result) { - players.Add(p); + players.Add(p!); Assert.False(game.AddPlayerInGame(players)); } diff --git a/Qwirkle/TestBase/TestScore.cs b/Qwirkle/TestBase/TestScore.cs index f9d1dce..b83f044 100644 --- a/Qwirkle/TestBase/TestScore.cs +++ b/Qwirkle/TestBase/TestScore.cs @@ -11,7 +11,7 @@ public class TestScore DateTime now = DateTime.Today; Score score = new Score(p.NameTag, now, 0, 0); - Assert.True(score.PlayerName == "test"); + Assert.Equal("test", score.PlayerName); } [Fact] diff --git a/Qwirkle/TestBase/TestTile.cs b/Qwirkle/TestBase/TestTile.cs index 9943cac..9589649 100644 --- a/Qwirkle/TestBase/TestTile.cs +++ b/Qwirkle/TestBase/TestTile.cs @@ -8,26 +8,29 @@ using System.Threading.Tasks; namespace TestBase { public class TestTile + { + [Fact] + public void TestCreateCorrect() + { + Tile t = new Tile(Shape.Star, Color.Blue); + Assert.NotNull(t); + Assert.Equal(Shape.Star, t.GetShape); + Assert.Equal(Color.Blue, t.GetColor); + } + + public static TheoryData Data_Tile() + { + var data = new TheoryData { - [Fact] - public void TestCreateCorrect() - { - Tile t = new Tile(Shape.Star, Color.Blue); - Assert.NotNull(t); - Assert.Equal(Shape.Star, t.GetShape); - Assert.Equal(Color.Blue, t.GetColor); - } - public static IEnumerable Data_Tile() { - yield return new object[] - { new Tile(Shape.Round, Color.Green) - }; - yield return new object[] - { + }, + { new Tile(Shape.Shuriken, Color.Red) - }; } + }; + return data; + } [Theory] [MemberData(nameof(Data_Tile))]