Increase test coverage, test Commands

build.sbt

@@ -6,8 +6,8 @@ lazy val root = project
 
     scalaVersion := "3.3.1",
 
-    libraryDependencies += "org.scalactic" %% "scalactic" % "3.2.16",
     libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.15" % "test",
+    libraryDependencies += "org.scalatestplus" %% "mockito-5-8" % "3.2.17.0" % "test",
     libraryDependencies += "org.scala-lang.modules" %% "scala-swing" % "3.0.0",
     libraryDependencies += "net.codingwell" %% "scala-guice" % "7.0.0",
     libraryDependencies += "org.scala-lang.modules" %% "scala-xml" % "2.2.0",

src/main/scala/de/htwg/se/set/controller/controller/base/Command.scala

@@ -2,14 +2,14 @@ package de.htwg.se.set.controller.controller.base
 
 import de.htwg.se.set.controller.{ICommand, IController}
 import de.htwg.se.set.model.GameMode.{GAME_END, IN_GAME, SETTINGS}
-import de.htwg.se.set.model.game.base.{Deck, Player, Triplet}
+import de.htwg.se.set.model.game.{Deck, Player, Triplet}
 import de.htwg.se.set.model.{ICard, ITriplet}
 import de.htwg.se.set.util.PrintUtil
 import play.api.libs.json.{JsValue, Json}
 
 import scala.xml.{Node, Utility}
 
-private class Command(controller: IController) extends ICommand(controller):
+class Command(controller: IController) extends ICommand(controller):
 
   private var snapshot: Option[Snapshot] = None
 

src/main/scala/de/htwg/se/set/controller/controller/base/Snapshot.scala

@@ -1,8 +1,8 @@
 package de.htwg.se.set.controller.controller.base
 
 import de.htwg.se.set.controller.{IController, ISnapshot, IState}
-import de.htwg.se.set.model.game.base.Game
-import de.htwg.se.set.model.settings.base.Settings
+import de.htwg.se.set.model.game.Game
+import de.htwg.se.set.model.settings.Settings
 import de.htwg.se.set.model.{IGame, ISettings}
 import play.api.libs.json.{JsValue, Json}
 

src/main/scala/de/htwg/se/set/model/game/base/Card.scala → src/main/scala/de/htwg/se/set/model/game/Card.scala

@@ -1,8 +1,8 @@
-package de.htwg.se.set.model.game.base
+package de.htwg.se.set.model.game
 
 import de.htwg.se.set.model.{Color, ICard, Shading, Symbol}
 import de.htwg.se.set.util.PrintUtil
-import play.api.libs.json.{JsError, JsSuccess, JsValue, Json, Reads, Writes}
+import play.api.libs.json.*
 
 import scala.xml.{Elem, Node}
 

src/main/scala/de/htwg/se/set/model/game/base/Deck.scala → src/main/scala/de/htwg/se/set/model/game/Deck.scala

@@ -1,9 +1,9 @@
-package de.htwg.se.set.model.game.base
+package de.htwg.se.set.model.game
 
 import com.google.inject.Inject
 import com.google.inject.name.Named
 import de.htwg.se.set.model.{Color, ICard, IDeck, ITriplet, Shading, Symbol}
-import play.api.libs.json.{JsError, JsObject, JsResult, JsSuccess, JsValue, Json, OWrites, Reads, Writes}
+import play.api.libs.json.*
 
 import scala.util.Random
 import scala.xml.{Elem, Node}

src/main/scala/de/htwg/se/set/model/game/base/Game.scala → src/main/scala/de/htwg/se/set/model/game/Game.scala

@@ -1,4 +1,4 @@
-package de.htwg.se.set.model.game.base
+package de.htwg.se.set.model.game
 
 import com.google.inject.Inject
 import com.google.inject.name.Named

src/main/scala/de/htwg/se/set/model/game/base/Grid.scala → src/main/scala/de/htwg/se/set/model/game/Grid.scala

@@ -1,4 +1,4 @@
-package de.htwg.se.set.model.game.base
+package de.htwg.se.set.model.game
 
 import de.htwg.se.set.model.{ICard, IGrid}
 

src/main/scala/de/htwg/se/set/model/game/base/Player.scala → src/main/scala/de/htwg/se/set/model/game/Player.scala

@@ -1,4 +1,4 @@
-package de.htwg.se.set.model.game.base
+package de.htwg.se.set.model.game
 
 import de.htwg.se.set.model.{IPlayer, ITriplet}
 import de.htwg.se.set.util.PrintUtil

src/main/scala/de/htwg/se/set/model/game/base/Triplet.scala → src/main/scala/de/htwg/se/set/model/game/Triplet.scala

@@ -1,4 +1,4 @@
-package de.htwg.se.set.model.game.base
+package de.htwg.se.set.model.game
 
 import de.htwg.se.set.model.{ICard, ITriplet}
 import play.api.libs.json.{JsValue, Json, Reads, Writes}

src/main/scala/de/htwg/se/set/model/settings/base/Settings.scala → src/main/scala/de/htwg/se/set/model/settings/Settings.scala

@@ -1,4 +1,4 @@
-package de.htwg.se.set.model.settings.base
+package de.htwg.se.set.model.settings
 
 import com.google.inject.Inject
 import com.google.inject.name.Named

src/main/scala/de/htwg/se/set/module/SetModule.scala

@@ -4,8 +4,8 @@ import com.google.inject.AbstractModule
 import com.google.inject.name.Names
 import de.htwg.se.set.controller.IController
 import de.htwg.se.set.controller.controller.base.Controller
-import de.htwg.se.set.model.game.base.{Deck, Game}
-import de.htwg.se.set.model.settings.base.Settings
+import de.htwg.se.set.model.game.{Deck, Game}
+import de.htwg.se.set.model.settings.Settings
 import de.htwg.se.set.model.{GameMode, ICard, IDeck, IGame, IPlayer, ISettings}
 import net.codingwell.scalaguice.ScalaModule
 

src/main/scala/de/htwg/se/set/view/panel/PlayersPanel.scala

@@ -2,7 +2,7 @@ package de.htwg.se.set.view.panel
 
 import de.htwg.se.set.controller.IController
 import de.htwg.se.set.controller.controller.base.SelectPlayerAction
-import de.htwg.se.set.model.game.base.Player
+import de.htwg.se.set.model.game.Player
 import de.htwg.se.set.util.PanelUtil.CompatButton
 import de.htwg.se.set.util.ResUtil
 

src/test/resources/invalid_progress.json

@@ -0,0 +1,22 @@
+{
+  "hash" : "91bea172a951eb0652bae3f59ac4e83ff7a7dc45928daa37469beb3890200447",
+  "snapshot" : {
+    "settings" : {
+      "playerCount" : 2,
+      "easy" : false,
+      "mode" : "SETTINGS"
+    },
+    "game" : {
+      "columns" : 4,
+      "deck" : {
+        "easy" : false
+      },
+      "tableCards" : [ ],
+      "playersCards" : [ ],
+      "players" : [ ],
+      "selectedPlayer" : null,
+      "message" : ""
+    },
+    "state" : "SettingsState"
+  }
+}

src/test/resources/invalid_progress.xml

@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<progress>
+  <hash>8bd0d93049a8bb327db6fcdc580ede81361d89447df96afb655297fe1a18b0d7</hash>
+  <snapshot>
+    <settings>
+      <playerCount>2</playerCount>
+      <easy>false</easy>
+      <mode>SETTINGS</mode>
+    </settings>
+    <game>
+      <columns>4</columns>
+      <deck>
+        <easy>false</easy>
+      </deck>
+      <tableCards/>
+      <playersCards/>
+      <players/>
+      <selectedPlayer/>
+      <message/>
+    </game>
+    <state>SettingsState</state>
+  </snapshot>
+</progress>

src/test/resources/valid_progress.json

@@ -0,0 +1,22 @@
+{
+  "hash" : "91bea172a951eb0652bae3f59ac4e83ff7a7dc45928daa37469beb3890200447",
+  "snapshot" : {
+    "settings" : {
+      "playerCount" : 1,
+      "easy" : false,
+      "mode" : "SETTINGS"
+    },
+    "game" : {
+      "columns" : 4,
+      "deck" : {
+        "easy" : false
+      },
+      "tableCards" : [ ],
+      "playersCards" : [ ],
+      "players" : [ ],
+      "selectedPlayer" : null,
+      "message" : ""
+    },
+    "state" : "SettingsState"
+  }
+}

src/test/resources/valid_progress.xml

@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<progress>
+  <hash>8bd0d93049a8bb327db6fcdc580ede81361d89447df96afb655297fe1a18b0d7</hash>
+  <snapshot>
+    <settings>
+      <playerCount>1</playerCount>
+      <easy>false</easy>
+      <mode>SETTINGS</mode>
+    </settings>
+    <game>
+      <columns>4</columns>
+      <deck>
+        <easy>false</easy>
+      </deck>
+      <tableCards/>
+      <playersCards/>
+      <players/>
+      <selectedPlayer/>
+      <message/>
+    </game>
+    <state>SettingsState</state>
+  </snapshot>
+</progress>