wip: refactor controller

2026-01-14 22:17:24 +02:00
parent 1bfc9242af
commit fe8a8d4150
43 changed files with 4710 additions and 2188 deletions
@@ -1,69 +1,69 @@
 package game_test

-import (
-	"slices"
-	"testing"
+// import (
+// 	"slices"
+// 	"testing"

-	e "github.com/iliadenisov/galaxy/internal/error"
+// 	e "github.com/iliadenisov/galaxy/internal/error"

-	"github.com/iliadenisov/galaxy/internal/model/game"
-	"github.com/stretchr/testify/assert"
-)
+// 	"github.com/iliadenisov/galaxy/internal/model/game"
+// 	"github.com/stretchr/testify/assert"
+// )

-func TestSendGroup(t *testing.T) {
-	g := newGame()
-	// group #1 - in_orbit, free to upgrade
-	assert.NoError(t, g.CreateShips(Race_0_idx, ShipType_Cruiser, R0_Planet_0_num, 10))
-	// group #2 - in_space
-	assert.NoError(t, g.CreateShips(Race_0_idx, ShipType_Cruiser, R0_Planet_0_num, 1))
-	g.ShipGroups[1].StateInSpace = &game.InSpace{Origin: 2, Range: 1.23}
-	// group #3 - in_orbit, unmovable
-	g.CreateShipType(Race_0.Name, "Fortress", 0, 30, 100, 0, 50)
-	assert.NoError(t, g.CreateShips(Race_0_idx, "Fortress", R0_Planet_0_num, 1))
+// func TestSendGroup(t *testing.T) {
+// 	g := newGame()
+// 	// group #1 - in_orbit, free to upgrade
+// 	assert.NoError(t, g.CreateShips(Race_0_idx, ShipType_Cruiser, R0_Planet_0_num, 10))
+// 	// group #2 - in_space
+// 	assert.NoError(t, g.CreateShips(Race_0_idx, ShipType_Cruiser, R0_Planet_0_num, 1))
+// 	g.ShipGroups[1].StateInSpace = &game.InSpace{Origin: 2, Range: 1.23}
+// 	// group #3 - in_orbit, unmovable
+// 	g.CreateShipType(Race_0.Name, "Fortress", 0, 50, 30, 100, 0)
+// 	assert.NoError(t, g.CreateShips(Race_0_idx, "Fortress", R0_Planet_0_num, 1))

-	assert.ErrorContains(t,
-		g.SendGroup("UnknownRace", 1, 2, 0),
-		e.GenericErrorText(e.ErrInputUnknownRace))
-	assert.ErrorContains(t,
-		g.SendGroup(Race_0.Name, 555, 2, 0),
-		e.GenericErrorText(e.ErrInputEntityNotExists))
-	assert.ErrorContains(t,
-		g.SendGroup(Race_0.Name, 1, 222, 0),
-		e.GenericErrorText(e.ErrInputEntityNotExists))
-	assert.ErrorContains(t,
-		g.SendGroup(Race_0.Name, 2, 1, 0),
-		e.GenericErrorText(e.ErrShipsBusy))
-	assert.ErrorContains(t,
-		g.SendGroup(Race_0.Name, 3, 2, 0),
-		e.GenericErrorText(e.ErrSendShipHasNoDrives))
-	assert.ErrorContains(t,
-		g.SendGroup(Race_0.Name, 1, 2, 100),
-		e.GenericErrorText(e.ErrBeakGroupNumberNotEnough))
-	assert.ErrorContains(t,
-		g.SendGroup(Race_0.Name, 1, 3, 0),
-		e.GenericErrorText(e.ErrSendUnreachableDestination))
+// 	assert.ErrorContains(t,
+// 		g.SendGroup("UnknownRace", 1, 2, 0),
+// 		e.GenericErrorText(e.ErrInputUnknownRace))
+// 	assert.ErrorContains(t,
+// 		g.SendGroup(Race_0.Name, 555, 2, 0),
+// 		e.GenericErrorText(e.ErrInputEntityNotExists))
+// 	assert.ErrorContains(t,
+// 		g.SendGroup(Race_0.Name, 1, 222, 0),
+// 		e.GenericErrorText(e.ErrInputEntityNotExists))
+// 	assert.ErrorContains(t,
+// 		g.SendGroup(Race_0.Name, 2, 1, 0),
+// 		e.GenericErrorText(e.ErrShipsBusy))
+// 	assert.ErrorContains(t,
+// 		g.SendGroup(Race_0.Name, 3, 2, 0),
+// 		e.GenericErrorText(e.ErrSendShipHasNoDrives))
+// 	assert.ErrorContains(t,
+// 		g.SendGroup(Race_0.Name, 1, 2, 100),
+// 		e.GenericErrorText(e.ErrBeakGroupNumberNotEnough))
+// 	assert.ErrorContains(t,
+// 		g.SendGroup(Race_0.Name, 1, 3, 0),
+// 		e.GenericErrorText(e.ErrSendUnreachableDestination))

-	assert.NoError(t, g.SendGroup(Race_0.Name, 1, 2, 3)) // send 3 of 10
-	assert.Len(t, slices.Collect(g.ListShipGroups(Race_0_idx)), 4)
-	assert.Equal(t, uint(7), g.ShipGroups[0].Number)
-	assert.Equal(t, game.StateInOrbit, g.ShipGroups[0].State())
-	assert.Equal(t, uint(3), g.ShipGroups[3].Number)
-	assert.Equal(t, game.StateLaunched, g.ShipGroups[3].State())
+// 	assert.NoError(t, g.SendGroup(Race_0.Name, 1, 2, 3)) // send 3 of 10
+// 	assert.Len(t, slices.Collect(g.ListShipGroups(Race_0_idx)), 4)
+// 	assert.Equal(t, uint(7), g.ShipGroups[0].Number)
+// 	assert.Equal(t, game.StateInOrbit, g.ShipGroups[0].State())
+// 	assert.Equal(t, uint(3), g.ShipGroups[3].Number)
+// 	assert.Equal(t, game.StateLaunched, g.ShipGroups[3].State())

-	assert.NoError(t, g.SendGroup(Race_0.Name, 4, 0, 2)) // un-send 2 of 3
-	assert.Len(t, slices.Collect(g.ListShipGroups(Race_0_idx)), 4)
-	assert.Equal(t, uint(9), game.MustShipGroup(g, Race_0_idx, 5).Number)
-	assert.Equal(t, game.StateInOrbit, game.MustShipGroup(g, Race_0_idx, 5).State())
-	assert.Equal(t, uint(1), game.MustShipGroup(g, Race_0_idx, 4).Number)
-	assert.Equal(t, game.StateLaunched, game.MustShipGroup(g, Race_0_idx, 4).State())
+// 	assert.NoError(t, g.SendGroup(Race_0.Name, 4, 0, 2)) // un-send 2 of 3
+// 	assert.Len(t, slices.Collect(g.ListShipGroups(Race_0_idx)), 4)
+// 	assert.Equal(t, uint(9), game.MustShipGroup(g, Race_0_idx, 5).Number)
+// 	assert.Equal(t, game.StateInOrbit, game.MustShipGroup(g, Race_0_idx, 5).State())
+// 	assert.Equal(t, uint(1), game.MustShipGroup(g, Race_0_idx, 4).Number)
+// 	assert.Equal(t, game.StateLaunched, game.MustShipGroup(g, Race_0_idx, 4).State())

-	assert.NoError(t, g.SendGroup(Race_0.Name, 4, 0, 0)) // un-send the rest 1
-	assert.Len(t, slices.Collect(g.ListShipGroups(Race_0_idx)), 3)
-	assert.Equal(t, uint(10), game.MustShipGroup(g, Race_0_idx, 5).Number)
-	assert.Equal(t, game.StateInOrbit, game.MustShipGroup(g, Race_0_idx, 5).State())
+// 	assert.NoError(t, g.SendGroup(Race_0.Name, 4, 0, 0)) // un-send the rest 1
+// 	assert.Len(t, slices.Collect(g.ListShipGroups(Race_0_idx)), 3)
+// 	assert.Equal(t, uint(10), game.MustShipGroup(g, Race_0_idx, 5).Number)
+// 	assert.Equal(t, game.StateInOrbit, game.MustShipGroup(g, Race_0_idx, 5).State())

-	assert.NoError(t, g.SendGroup(Race_0.Name, 5, 2, 0))
-	assert.Len(t, slices.Collect(g.ListShipGroups(Race_0_idx)), 3)
-	assert.Equal(t, uint(10), game.MustShipGroup(g, Race_0_idx, 5).Number)
-	assert.Equal(t, game.StateLaunched, game.MustShipGroup(g, Race_0_idx, 5).State())
-}
+// 	assert.NoError(t, g.SendGroup(Race_0.Name, 5, 2, 0))
+// 	assert.Len(t, slices.Collect(g.ListShipGroups(Race_0_idx)), 3)
+// 	assert.Equal(t, uint(10), game.MustShipGroup(g, Race_0_idx, 5).Number)
+// 	assert.Equal(t, game.StateLaunched, game.MustShipGroup(g, Race_0_idx, 5).State())
+// }