patri9ck / durak / #5

Committed 16 Jan 2025 01:26PM UTC coverage: 39.958% (-4.1%) from 44.107%

Build # #5

Build Type

push

travis-pro

Committed by

LaurinEngelen

Commit Message

Merge branch 'main' into improved-gui

# Conflicts:
#	README.md
#	src/main/scala/view/gui/Gui.scala

Coverage Stats

78 of 83 new or added lines in 14 files covered. (93.98%)

302 existing lines in 7 files now uncovered.

378 of 946 relevant lines covered (39.96%)

0.4 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

89.47

/src/main/scala/controller/base/command/DenyCommand.scala

package controller.base.command

import com.google.inject.Guice
import controller.base.BaseController
import model.Turn
import model.status.StatusBuilder
import module.DurakModule

class DenyCommand(controller: BaseController) extends MementoCommand(controller) {

  private val injector = Guice.createInjector(DurakModule())

  override def execute(): Unit = {
    val attacking = controller.current.get

    var statusBuilder = injector.getInstance(classOf[StatusBuilder])
      .setStatus(controller.status)

    if ((controller.status.denied || controller.byTurn(Turn.SecondlyAttacking).isEmpty) && controller.status.undefended.isEmpty) {
      if (controller.status.undefended.isEmpty) {
        statusBuilder = controller.drawFromStack(statusBuilder)
        statusBuilder = statusBuilder
          .setPlayers(controller.chooseNextAttacking(statusBuilder.getPlayers, statusBuilder.byTurn(Turn.FirstlyAttacking).get))
          .setTurn(Turn.FirstlyAttacking)
          .resetRound
      } else {
        statusBuilder = statusBuilder
          .setTurn(Turn.Defending)
      }
    } else if (controller.status.turn == Turn.FirstlyAttacking) {
      statusBuilder = statusBuilder
        .setTurn(Turn.SecondlyAttacking)
        .setDenied(true)
    } else {
      statusBuilder = statusBuilder
        .setTurn(Turn.Defending)
    }

    controller.status = statusBuilder.status
  }
}

1	package controller.base.command
2
3	import com.google.inject.Guice
4	import controller.base.BaseController
5	import model.Turn
6	import model.status.StatusBuilder
7	import module.DurakModule
8
9	class DenyCommand(controller: BaseController) extends MementoCommand(controller) {
10
11	private val injector = Guice.createInjector(DurakModule())	1✔
12
13	override def execute(): Unit = {	1✔
14	val attacking = controller.current.get	1✔
15
16	var statusBuilder = injector.getInstance(classOf[StatusBuilder])	1✔
17	.setStatus(controller.status)	1✔
18
19	if ((controller.status.denied \|\| controller.byTurn(Turn.SecondlyAttacking).isEmpty) && controller.status.undefended.isEmpty) {	1✔
20	if (controller.status.undefended.isEmpty) {	1✔
21	statusBuilder = controller.drawFromStack(statusBuilder)	1✔
22	statusBuilder = statusBuilder
23	.setPlayers(controller.chooseNextAttacking(statusBuilder.getPlayers, statusBuilder.byTurn(Turn.FirstlyAttacking).get))	1✔
24	.setTurn(Turn.FirstlyAttacking)	1✔
25	.resetRound	1✔
UNCOV 26	} else {	×
27	statusBuilder = statusBuilder
UNCOV 28	.setTurn(Turn.Defending)	×
29	}
30	} else if (controller.status.turn == Turn.FirstlyAttacking) {	1✔
31	statusBuilder = statusBuilder
32	.setTurn(Turn.SecondlyAttacking)	1✔
33	.setDenied(true)	1✔
34	} else {	1✔
35	statusBuilder = statusBuilder
36	.setTurn(Turn.Defending)	1✔
37	}
38
39	controller.status = statusBuilder.status	1✔
40	}
41	}

patri9ck / durak / #5

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous