Skip to content

Commit cc94eca

Browse files
patzlypatzly
committed
Increase test coverage, test Commands
1 parent 73cf28f commit cc94eca

29 files changed

+338
-209
lines changed

‎build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ lazy val root = project
66

77
scalaVersion := "3.3.1",
88

9-
libraryDependencies += "org.scalactic" %% "scalactic" % "3.2.16",
109
libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.15" % "test",
10+
libraryDependencies += "org.scalatestplus" %% "mockito-5-8" % "3.2.17.0" % "test",
1111
libraryDependencies += "org.scala-lang.modules" %% "scala-swing" % "3.0.0",
1212
libraryDependencies += "net.codingwell" %% "scala-guice" % "7.0.0",
1313
libraryDependencies += "org.scala-lang.modules" %% "scala-xml" % "2.2.0",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ package de.htwg.se.set.controller.controller.base
22

33
import de.htwg.se.set.controller.{ICommand, IController}
44
import de.htwg.se.set.model.GameMode.{GAME_END, IN_GAME, SETTINGS}
5-
import de.htwg.se.set.model.game.base.{Deck, Player, Triplet}
5+
import de.htwg.se.set.model.game.{Deck, Player, Triplet}
66
import de.htwg.se.set.model.{ICard, ITriplet}
77
import de.htwg.se.set.util.PrintUtil
88
import play.api.libs.json.{JsValue, Json}
99

1010
import scala.xml.{Node, Utility}
1111

12-
private class Command(controller: IController) extends ICommand(controller):
12+
class Command(controller: IController) extends ICommand(controller):
1313

1414
private var snapshot: Option[Snapshot] = None
1515

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package de.htwg.se.set.controller.controller.base
22

33
import de.htwg.se.set.controller.{IController, ISnapshot, IState}
4-
import de.htwg.se.set.model.game.base.Game
5-
import de.htwg.se.set.model.settings.base.Settings
4+
import de.htwg.se.set.model.game.Game
5+
import de.htwg.se.set.model.settings.Settings
66
import de.htwg.se.set.model.{IGame, ISettings}
77
import play.api.libs.json.{JsValue, Json}
88

‎src/main/scala/de/htwg/se/set/controller/controller/stub/ControllerStub.scala

Lines changed: 0 additions & 112 deletions
This file was deleted.

‎src/main/scala/de/htwg/se/set/model/game/base/Card.scala renamed to ‎src/main/scala/de/htwg/se/set/model/game/Card.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package de.htwg.se.set.model.game.base
1+
package de.htwg.se.set.model.game
22

33
import de.htwg.se.set.model.{Color, ICard, Shading, Symbol}
44
import de.htwg.se.set.util.PrintUtil
5-
import play.api.libs.json.{JsError, JsSuccess, JsValue, Json, Reads, Writes}
5+
import play.api.libs.json.*
66

77
import scala.xml.{Elem, Node}
88

‎src/main/scala/de/htwg/se/set/model/game/base/Deck.scala renamed to ‎src/main/scala/de/htwg/se/set/model/game/Deck.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package de.htwg.se.set.model.game.base
1+
package de.htwg.se.set.model.game
22

33
import com.google.inject.Inject
44
import com.google.inject.name.Named
55
import de.htwg.se.set.model.{Color, ICard, IDeck, ITriplet, Shading, Symbol}
6-
import play.api.libs.json.{JsError, JsObject, JsResult, JsSuccess, JsValue, Json, OWrites, Reads, Writes}
6+
import play.api.libs.json.*
77

88
import scala.util.Random
99
import scala.xml.{Elem, Node}

‎src/main/scala/de/htwg/se/set/model/game/base/Game.scala renamed to ‎src/main/scala/de/htwg/se/set/model/game/Game.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.htwg.se.set.model.game.base
1+
package de.htwg.se.set.model.game
22

33
import com.google.inject.Inject
44
import com.google.inject.name.Named

‎src/main/scala/de/htwg/se/set/model/game/base/Grid.scala renamed to ‎src/main/scala/de/htwg/se/set/model/game/Grid.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.htwg.se.set.model.game.base
1+
package de.htwg.se.set.model.game
22

33
import de.htwg.se.set.model.{ICard, IGrid}
44

‎src/main/scala/de/htwg/se/set/model/game/base/Player.scala renamed to ‎src/main/scala/de/htwg/se/set/model/game/Player.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.htwg.se.set.model.game.base
1+
package de.htwg.se.set.model.game
22

33
import de.htwg.se.set.model.{IPlayer, ITriplet}
44
import de.htwg.se.set.util.PrintUtil

‎src/main/scala/de/htwg/se/set/model/game/base/Triplet.scala renamed to ‎src/main/scala/de/htwg/se/set/model/game/Triplet.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.htwg.se.set.model.game.base
1+
package de.htwg.se.set.model.game
22

33
import de.htwg.se.set.model.{ICard, ITriplet}
44
import play.api.libs.json.{JsValue, Json, Reads, Writes}

‎src/main/scala/de/htwg/se/set/model/game/stub/GameStub.scala

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎src/main/scala/de/htwg/se/set/model/settings/base/Settings.scala renamed to ‎src/main/scala/de/htwg/se/set/model/settings/Settings.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.htwg.se.set.model.settings.base
1+
package de.htwg.se.set.model.settings
22

33
import com.google.inject.Inject
44
import com.google.inject.name.Named

‎src/main/scala/de/htwg/se/set/model/settings/stub/SettingsStub.scala

Lines changed: 0 additions & 27 deletions
This file was deleted.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import com.google.inject.AbstractModule
44
import com.google.inject.name.Names
55
import de.htwg.se.set.controller.IController
66
import de.htwg.se.set.controller.controller.base.Controller
7-
import de.htwg.se.set.model.game.base.{Deck, Game}
8-
import de.htwg.se.set.model.settings.base.Settings
7+
import de.htwg.se.set.model.game.{Deck, Game}
8+
import de.htwg.se.set.model.settings.Settings
99
import de.htwg.se.set.model.{GameMode, ICard, IDeck, IGame, IPlayer, ISettings}
1010
import net.codingwell.scalaguice.ScalaModule
1111

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package de.htwg.se.set.view.panel
22

33
import de.htwg.se.set.controller.IController
44
import de.htwg.se.set.controller.controller.base.SelectPlayerAction
5-
import de.htwg.se.set.model.game.base.Player
5+
import de.htwg.se.set.model.game.Player
66
import de.htwg.se.set.util.PanelUtil.CompatButton
77
import de.htwg.se.set.util.ResUtil
88

‎src/test/resources/invalid_progress.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"hash" : "91bea172a951eb0652bae3f59ac4e83ff7a7dc45928daa37469beb3890200447",
3+
"snapshot" : {
4+
"settings" : {
5+
"playerCount" : 2,
6+
"easy" : false,
7+
"mode" : "SETTINGS"
8+
},
9+
"game" : {
10+
"columns" : 4,
11+
"deck" : {
12+
"easy" : false
13+
},
14+
"tableCards" : [ ],
15+
"playersCards" : [ ],
16+
"players" : [ ],
17+
"selectedPlayer" : null,
18+
"message" : ""
19+
},
20+
"state" : "SettingsState"
21+
}
22+
}

‎src/test/resources/invalid_progress.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version='1.0' encoding='UTF-8'?>
2+
<progress>
3+
<hash>8bd0d93049a8bb327db6fcdc580ede81361d89447df96afb655297fe1a18b0d7</hash>
4+
<snapshot>
5+
<settings>
6+
<playerCount>2</playerCount>
7+
<easy>false</easy>
8+
<mode>SETTINGS</mode>
9+
</settings>
10+
<game>
11+
<columns>4</columns>
12+
<deck>
13+
<easy>false</easy>
14+
</deck>
15+
<tableCards/>
16+
<playersCards/>
17+
<players/>
18+
<selectedPlayer/>
19+
<message/>
20+
</game>
21+
<state>SettingsState</state>
22+
</snapshot>
23+
</progress>

‎src/test/resources/valid_progress.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"hash" : "91bea172a951eb0652bae3f59ac4e83ff7a7dc45928daa37469beb3890200447",
3+
"snapshot" : {
4+
"settings" : {
5+
"playerCount" : 1,
6+
"easy" : false,
7+
"mode" : "SETTINGS"
8+
},
9+
"game" : {
10+
"columns" : 4,
11+
"deck" : {
12+
"easy" : false
13+
},
14+
"tableCards" : [ ],
15+
"playersCards" : [ ],
16+
"players" : [ ],
17+
"selectedPlayer" : null,
18+
"message" : ""
19+
},
20+
"state" : "SettingsState"
21+
}
22+
}

‎src/test/resources/valid_progress.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version='1.0' encoding='UTF-8'?>
2+
<progress>
3+
<hash>8bd0d93049a8bb327db6fcdc580ede81361d89447df96afb655297fe1a18b0d7</hash>
4+
<snapshot>
5+
<settings>
6+
<playerCount>1</playerCount>
7+
<easy>false</easy>
8+
<mode>SETTINGS</mode>
9+
</settings>
10+
<game>
11+
<columns>4</columns>
12+
<deck>
13+
<easy>false</easy>
14+
</deck>
15+
<tableCards/>
16+
<playersCards/>
17+
<players/>
18+
<selectedPlayer/>
19+
<message/>
20+
</game>
21+
<state>SettingsState</state>
22+
</snapshot>
23+
</progress>

0 commit comments

Comments
 (0)