wip: refactor controller

This commit is contained in:
Ilia Denisov
2026-01-14 22:17:24 +02:00
parent 1bfc9242af
commit fe8a8d4150
43 changed files with 4710 additions and 2188 deletions
+16 -16
View File
@@ -12,33 +12,33 @@ import (
)
func TestDeclarePeaceAndWarSingle(t *testing.T) {
g(t, func(f func(*controller.Param), g func() *mg.Game) {
c(t, func(f func(*controller.Param), ctrl func() *controller.Controller) {
hostRace := "race_05"
opponentRace := "race_01"
r, err := g().Relation(hostRace, opponentRace)
r, err := ctrl().Relation(hostRace, opponentRace)
assert.NoError(t, err)
assert.Equal(t, mg.RelationWar, r.Relation)
assert.Equal(t, mg.RelationWar, r)
r, err = g().Relation(unknownRaceName, opponentRace) // TODO: test on dead race
r, err = ctrl().Relation(unknownRaceName, opponentRace) // TODO: test on dead race
assert.ErrorContains(t, err, e.GenericErrorText(e.ErrInputUnknownRace))
r, err = g().Relation(hostRace, unknownRaceName) // TODO: test on dead race
r, err = ctrl().Relation(hostRace, unknownRaceName) // TODO: test on dead race
assert.ErrorContains(t, err, e.GenericErrorText(e.ErrInputUnknownRace))
assert.NoError(t, game.DeclarePeace(f, hostRace, opponentRace))
r, err = g().Relation(hostRace, opponentRace)
r, err = ctrl().Relation(hostRace, opponentRace)
assert.NoError(t, err)
assert.Equal(t, mg.RelationPeace, r.Relation)
assert.Equal(t, mg.RelationPeace, r)
assert.NoError(t, game.DeclareWar(f, hostRace, opponentRace))
r, err = g().Relation(hostRace, opponentRace)
r, err = ctrl().Relation(hostRace, opponentRace)
assert.NoError(t, err)
assert.Equal(t, mg.RelationWar, r.Relation)
assert.Equal(t, mg.RelationWar, r)
})
}
func TestDeclarePeaceAndWarAll(t *testing.T) {
g(t, func(f func(*controller.Param), g func() *mg.Game) {
c(t, func(f func(*controller.Param), ctrl func() *controller.Controller) {
hostRace := "race_07"
for i := range testRaceCount {
@@ -46,9 +46,9 @@ func TestDeclarePeaceAndWarAll(t *testing.T) {
if opponentRace == hostRace {
continue
}
r, err := g().Relation(hostRace, opponentRace)
r, err := ctrl().Relation(hostRace, opponentRace)
assert.NoError(t, err)
assert.Equal(t, mg.RelationWar, r.Relation)
assert.Equal(t, mg.RelationWar, r)
}
assert.NoError(t, game.DeclarePeace(f, hostRace, hostRace))
@@ -58,9 +58,9 @@ func TestDeclarePeaceAndWarAll(t *testing.T) {
if opponentRace == hostRace {
continue
}
r, err := g().Relation(hostRace, opponentRace)
r, err := ctrl().Relation(hostRace, opponentRace)
assert.NoError(t, err)
assert.Equal(t, mg.RelationPeace, r.Relation)
assert.Equal(t, mg.RelationPeace, r)
}
assert.NoError(t, game.DeclareWar(f, hostRace, hostRace))
@@ -70,9 +70,9 @@ func TestDeclarePeaceAndWarAll(t *testing.T) {
if opponentRace == hostRace {
continue
}
r, err := g().Relation(hostRace, opponentRace)
r, err := ctrl().Relation(hostRace, opponentRace)
assert.NoError(t, err)
assert.Equal(t, mg.RelationWar, r.Relation)
assert.Equal(t, mg.RelationWar, r)
}
})
}