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
+113 -113
View File
@@ -1,136 +1,136 @@
package game_test
import (
"slices"
"testing"
// import (
// "slices"
// "testing"
e "github.com/iliadenisov/galaxy/internal/error"
"github.com/iliadenisov/galaxy/internal/model/game"
"github.com/stretchr/testify/assert"
)
// e "github.com/iliadenisov/galaxy/internal/error"
// "github.com/iliadenisov/galaxy/internal/model/game"
// "github.com/stretchr/testify/assert"
// )
func TestJoinShipGroupToFleet(t *testing.T) {
g := newGame()
var groupIndex uint = 1
// func TestJoinShipGroupToFleet(t *testing.T) {
// g := newGame()
// var groupIndex uint = 1
assert.ErrorContains(t,
g.JoinShipGroupToFleet(Race_0.Name, " ", groupIndex, 0),
e.GenericErrorText(e.ErrInputEntityTypeNameInvalid))
// assert.ErrorContains(t,
// g.JoinShipGroupToFleet(Race_0.Name, " ", groupIndex, 0),
// e.GenericErrorText(e.ErrInputEntityTypeNameInvalid))
assert.ErrorContains(t,
g.JoinShipGroupToFleet(Race_0.Name, "Unnamed", groupIndex, 0),
e.GenericErrorText(e.ErrInputEntityNotExists))
// assert.ErrorContains(t,
// g.JoinShipGroupToFleet(Race_0.Name, "Unnamed", groupIndex, 0),
// e.GenericErrorText(e.ErrInputEntityNotExists))
// creating ShipGroup
assert.NoError(t, g.CreateShips(Race_0_idx, Race_0_Freighter, R0_Planet_0_num, 5))
// // creating ShipGroup
// assert.NoError(t, g.CreateShips(Race_0_idx, Race_0_Freighter, R0_Planet_0_num, 5))
assert.ErrorContains(t,
g.JoinShipGroupToFleet(Race_0.Name, "Unnamed", groupIndex, 6),
e.GenericErrorText(e.ErrJoinFleetGroupNumberNotEnough))
// assert.ErrorContains(t,
// g.JoinShipGroupToFleet(Race_0.Name, "Unnamed", groupIndex, 6),
// e.GenericErrorText(e.ErrJoinFleetGroupNumberNotEnough))
// ensure race has no Fleets
assert.Len(t, slices.Collect(g.ListFleets(Race_0_idx)), 0)
// // ensure race has no Fleets
// assert.Len(t, slices.Collect(g.ListFleets(Race_0_idx)), 0)
fleetOne := "R0_Fleet_one"
fleetTwo := "R0_Fleet_two"
// fleetOne := "R0_Fleet_one"
// fleetTwo := "R0_Fleet_two"
assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetOne, groupIndex, 0))
fleets := slices.Collect(g.ListFleets(Race_0_idx))
groups := slices.Collect(g.ListShipGroups(Race_0_idx))
assert.Len(t, groups, 1)
gi := 0
assert.Len(t, fleets, 1)
assert.Equal(t, fleets[0].Name, fleetOne)
state, _, _ := game.FleetState(g, fleets[0].ID)
assert.Equal(t, game.StateInOrbit, state)
// assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetOne, groupIndex, 0))
// fleets := slices.Collect(g.ListFleets(Race_0_idx))
// groups := slices.Collect(g.ListShipGroups(Race_0_idx))
// assert.Len(t, groups, 1)
// gi := 0
// assert.Len(t, fleets, 1)
// assert.Equal(t, fleets[0].Name, fleetOne)
// state, _, _ := game.FleetState(g, fleets[0].ID)
// assert.Equal(t, game.StateInOrbit, state)
assert.NotNil(t, groups[gi].FleetID)
assert.Equal(t, fleets[0].ID, *groups[gi].FleetID)
// assert.NotNil(t, groups[gi].FleetID)
// assert.Equal(t, fleets[0].ID, *groups[gi].FleetID)
// create another ShipGroup
assert.NoError(t, g.CreateShips(Race_0_idx, Race_0_Gunship, R0_Planet_0_num, 3))
groupIndex = 2
assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetTwo, groupIndex, 2))
fleets = slices.Collect(g.ListFleets(Race_0_idx))
groups = slices.Collect(g.ListShipGroups(Race_0_idx))
assert.Len(t, groups, 3)
gi = 1
assert.Len(t, fleets, 2)
assert.Equal(t, fleets[1].Name, fleetTwo)
state, _, _ = game.FleetState(g, fleets[1].ID)
assert.Equal(t, game.StateInOrbit, state)
// // create another ShipGroup
// assert.NoError(t, g.CreateShips(Race_0_idx, Race_0_Gunship, R0_Planet_0_num, 3))
// groupIndex = 2
// assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetTwo, groupIndex, 2))
// fleets = slices.Collect(g.ListFleets(Race_0_idx))
// groups = slices.Collect(g.ListShipGroups(Race_0_idx))
// assert.Len(t, groups, 3)
// gi = 1
// assert.Len(t, fleets, 2)
// assert.Equal(t, fleets[1].Name, fleetTwo)
// state, _, _ = game.FleetState(g, fleets[1].ID)
// assert.Equal(t, game.StateInOrbit, state)
assert.NotNil(t, groups[gi].FleetID)
assert.Equal(t, fleets[1].ID, *groups[gi].FleetID)
assert.Equal(t, uint(2), groups[gi].Number)
assert.Equal(t, uint(2), groups[gi].Index)
// assert.NotNil(t, groups[gi].FleetID)
// assert.Equal(t, fleets[1].ID, *groups[gi].FleetID)
// assert.Equal(t, uint(2), groups[gi].Number)
// assert.Equal(t, uint(2), groups[gi].Index)
gi = 2
assert.Nil(t, groups[gi].FleetID)
assert.Equal(t, uint(1), groups[gi].Number)
assert.Equal(t, uint(3), groups[gi].Index)
// gi = 2
// assert.Nil(t, groups[gi].FleetID)
// assert.Equal(t, uint(1), groups[gi].Number)
// assert.Equal(t, uint(3), groups[gi].Index)
groupIndex = groups[gi].Index
assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetOne, groupIndex, 0))
fleets = slices.Collect(g.ListFleets(Race_0_idx))
assert.Len(t, fleets, 2)
groups = slices.Collect(g.ListShipGroups(Race_0_idx))
assert.NotNil(t, groups[gi].FleetID)
assert.Equal(t, fleets[0].ID, *groups[gi].FleetID)
state, _, _ = game.FleetState(g, fleets[0].ID)
assert.Equal(t, game.StateInOrbit, state)
// groupIndex = groups[gi].Index
// assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetOne, groupIndex, 0))
// fleets = slices.Collect(g.ListFleets(Race_0_idx))
// assert.Len(t, fleets, 2)
// groups = slices.Collect(g.ListShipGroups(Race_0_idx))
// assert.NotNil(t, groups[gi].FleetID)
// assert.Equal(t, fleets[0].ID, *groups[gi].FleetID)
// state, _, _ = game.FleetState(g, fleets[0].ID)
// assert.Equal(t, game.StateInOrbit, state)
// group not In_Orbit
assert.NoError(t, g.CreateShips(Race_0_idx, Race_0_Gunship, R0_Planet_0_num, 7))
gi = 3
g.ShipGroups[gi].StateInSpace = &game.InSpace{
Origin: 2,
Range: 1,
}
assert.ErrorContains(t,
g.JoinShipGroupToFleet(Race_0.Name, fleetOne, g.ShipGroups[gi].Index, 0),
e.GenericErrorText(e.ErrShipsBusy))
g.ShipGroups[gi].StateInSpace = nil
// // group not In_Orbit
// assert.NoError(t, g.CreateShips(Race_0_idx, Race_0_Gunship, R0_Planet_0_num, 7))
// gi = 3
// g.ShipGroups[gi].StateInSpace = &game.InSpace{
// Origin: 2,
// Range: 1,
// }
// assert.ErrorContains(t,
// g.JoinShipGroupToFleet(Race_0.Name, fleetOne, g.ShipGroups[gi].Index, 0),
// e.GenericErrorText(e.ErrShipsBusy))
// g.ShipGroups[gi].StateInSpace = nil
// existing fleet not on the same planet or in_orbit
g.ShipGroups[0].StateInSpace = &game.InSpace{
Origin: 2,
Range: 1,
}
g.ShipGroups[2].StateInSpace = g.ShipGroups[0].StateInSpace
assert.ErrorContains(t,
g.JoinShipGroupToFleet(Race_0.Name, fleetOne, g.ShipGroups[gi].Index, 0),
e.GenericErrorText(e.ErrShipsNotOnSamePlanet))
}
// // existing fleet not on the same planet or in_orbit
// g.ShipGroups[0].StateInSpace = &game.InSpace{
// Origin: 2,
// Range: 1,
// }
// g.ShipGroups[2].StateInSpace = g.ShipGroups[0].StateInSpace
// assert.ErrorContains(t,
// g.JoinShipGroupToFleet(Race_0.Name, fleetOne, g.ShipGroups[gi].Index, 0),
// e.GenericErrorText(e.ErrShipsNotOnSamePlanet))
// }
func TestJoinFleets(t *testing.T) {
g := newGame()
// creating ShipGroup #1 at Planet_0
assert.NoError(t, g.CreateShips(Race_0_idx, Race_0_Freighter, R0_Planet_0_num, 1)) // group #1
// creating ShipGroup #2 at Planet_2
assert.NoError(t, g.CreateShips(Race_0_idx, Race_0_Gunship, R0_Planet_2_num, 2)) // group #2
// creating ShipGroup #3 at Planet_0
assert.NoError(t, g.CreateShips(Race_0_idx, Race_0_Gunship, R0_Planet_0_num, 3)) // group #3
// func TestJoinFleets(t *testing.T) {
// g := newGame()
// // creating ShipGroup #1 at Planet_0
// assert.NoError(t, g.CreateShips(Race_0_idx, Race_0_Freighter, R0_Planet_0_num, 1)) // group #1
// // creating ShipGroup #2 at Planet_2
// assert.NoError(t, g.CreateShips(Race_0_idx, Race_0_Gunship, R0_Planet_2_num, 2)) // group #2
// // creating ShipGroup #3 at Planet_0
// assert.NoError(t, g.CreateShips(Race_0_idx, Race_0_Gunship, R0_Planet_0_num, 3)) // group #3
// ensure race has no Fleets
assert.Len(t, slices.Collect(g.ListFleets(Race_0_idx)), 0)
// // ensure race has no Fleets
// assert.Len(t, slices.Collect(g.ListFleets(Race_0_idx)), 0)
fleetPlanet2 := "R0_Fleet_On_Planet_2"
fleetSource := "R0_Fleet_one"
fleetTarget := "R0_Fleet_two"
// fleetPlanet2 := "R0_Fleet_On_Planet_2"
// fleetSource := "R0_Fleet_one"
// fleetTarget := "R0_Fleet_two"
assert.ErrorContains(t,
g.JoinFleets(Race_0.Name, fleetSource, fleetTarget),
e.GenericErrorText(e.ErrInputEntityNotExists))
assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetSource, 1, 0))
assert.ErrorContains(t,
g.JoinFleets(Race_0.Name, fleetSource, fleetTarget),
e.GenericErrorText(e.ErrInputEntityNotExists))
assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetTarget, 3, 0))
assert.NoError(t, g.JoinFleets(Race_0.Name, fleetSource, fleetTarget))
// assert.ErrorContains(t,
// g.JoinFleets(Race_0.Name, fleetSource, fleetTarget),
// e.GenericErrorText(e.ErrInputEntityNotExists))
// assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetSource, 1, 0))
// assert.ErrorContains(t,
// g.JoinFleets(Race_0.Name, fleetSource, fleetTarget),
// e.GenericErrorText(e.ErrInputEntityNotExists))
// assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetTarget, 3, 0))
// assert.NoError(t, g.JoinFleets(Race_0.Name, fleetSource, fleetTarget))
assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetPlanet2, 2, 0))
assert.ErrorContains(t,
g.JoinFleets(Race_0.Name, fleetPlanet2, fleetTarget),
e.GenericErrorText(e.ErrShipsNotOnSamePlanet))
}
// assert.NoError(t, g.JoinShipGroupToFleet(Race_0.Name, fleetPlanet2, 2, 0))
// assert.ErrorContains(t,
// g.JoinFleets(Race_0.Name, fleetPlanet2, fleetTarget),
// e.GenericErrorText(e.ErrShipsNotOnSamePlanet))
// }