diff --git a/internal/adapter/adapter_test.go b/internal/adapter/adapter_test.go index 9518a4b..26c1cb7 100644 --- a/internal/adapter/adapter_test.go +++ b/internal/adapter/adapter_test.go @@ -32,7 +32,7 @@ func testMainWrapper(m *testing.M) int { postgres, err = buntest.NewPostgres(pool) if err != nil { - log.Println("couldn't construct adaptertest.Postgres:", err) + log.Println("couldn't construct buntest.Postgres:", err) return 1 } defer func() { diff --git a/internal/adapter/repository_ennoblement_test.go b/internal/adapter/repository_ennoblement_test.go index 6416c27..954021e 100644 --- a/internal/adapter/repository_ennoblement_test.go +++ b/internal/adapter/repository_ennoblement_test.go @@ -149,10 +149,6 @@ func testEnnoblementRepository(t *testing.T, newRepos func(t *testing.T) reposit assert.False(t, res.Self().IsZero()) assert.True(t, res.Next().IsZero()) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: sort=[serverKey DESC, createdAt DESC, id ASC]", @@ -178,10 +174,6 @@ func testEnnoblementRepository(t *testing.T, newRepos func(t *testing.T) reposit ) })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: sort=[id ASC]", @@ -201,10 +193,6 @@ func testEnnoblementRepository(t *testing.T, newRepos func(t *testing.T) reposit return cmp.Compare(a.ID(), b.ID()) })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: sort=[id DESC]", @@ -224,10 +212,6 @@ func testEnnoblementRepository(t *testing.T, newRepos func(t *testing.T) reposit return cmp.Compare(a.ID(), b.ID()) * -1 })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: serverKeys", @@ -256,10 +240,6 @@ func testEnnoblementRepository(t *testing.T, newRepos func(t *testing.T) reposit assert.True(t, slices.Contains(serverKeys, e.ServerKey())) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: villageIDs serverKeys", @@ -291,10 +271,6 @@ func testEnnoblementRepository(t *testing.T, newRepos func(t *testing.T) reposit assert.True(t, slices.Contains(villageIDs, e.VillageID())) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: playerIDs (new owner) serverKeys", @@ -326,10 +302,6 @@ func testEnnoblementRepository(t *testing.T, newRepos func(t *testing.T) reposit assert.True(t, slices.Contains(playerIDs, e.NewOwnerID()) || slices.Contains(playerIDs, e.OldOwnerID())) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: playerIDs (old owner) serverKeys", @@ -368,10 +340,6 @@ func testEnnoblementRepository(t *testing.T, newRepos func(t *testing.T) reposit assert.True(t, slices.Contains(playerIDs, e.NewOwnerID()) || slices.Contains(playerIDs, e.OldOwnerID())) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: tribeIDs (new tribe) serverKeys", @@ -410,10 +378,6 @@ func testEnnoblementRepository(t *testing.T, newRepos func(t *testing.T) reposit assert.True(t, slices.Contains(tribeIDs, e.NewTribeID()) || slices.Contains(tribeIDs, e.OldTribeID())) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: tribeIDs (old tribe) serverKeys", @@ -452,10 +416,6 @@ func testEnnoblementRepository(t *testing.T, newRepos func(t *testing.T) reposit assert.True(t, slices.Contains(tribeIDs, e.NewTribeID()) || slices.Contains(tribeIDs, e.OldTribeID())) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: since before", @@ -497,10 +457,6 @@ func testEnnoblementRepository(t *testing.T, newRepos func(t *testing.T) reposit assert.True(t, e.CreatedAt().Before(before)) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: cursor serverKeys sort=[id ASC]", @@ -536,10 +492,6 @@ func testEnnoblementRepository(t *testing.T, newRepos func(t *testing.T) reposit return cmp.Compare(a.ID(), b.ID()) })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: cursor sort=[serverKey ASC, id ASC]", @@ -577,10 +529,6 @@ func testEnnoblementRepository(t *testing.T, newRepos func(t *testing.T) reposit assert.GreaterOrEqual(t, e.ServerKey(), params.Cursor().ServerKey()) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: cursor sort=[serverKey DESC, id DESC]", @@ -618,10 +566,6 @@ func testEnnoblementRepository(t *testing.T, newRepos func(t *testing.T) reposit assert.LessOrEqual(t, e.ServerKey(), params.Cursor().ServerKey()) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: limit=2", @@ -637,10 +581,6 @@ func testEnnoblementRepository(t *testing.T, newRepos func(t *testing.T) reposit assert.False(t, res.Self().IsZero()) assert.False(t, res.Next().IsZero()) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, } @@ -648,14 +588,22 @@ func testEnnoblementRepository(t *testing.T, newRepos func(t *testing.T) reposit t.Run(tt.name, func(t *testing.T) { t.Parallel() + assertError := tt.assertError + if assertError == nil { + assertError = func(t *testing.T, err error) { + t.Helper() + require.NoError(t, err) + } + } + params := tt.params(t) res, err := repos.ennoblement.List(ctx, params) - tt.assertError(t, err) + assertError(t, err) tt.assertResult(t, params, res) resWithRelations, err := repos.ennoblement.ListWithRelations(ctx, params) - tt.assertError(t, err) + assertError(t, err) require.Len(t, resWithRelations.Ennoblements(), len(res.Ennoblements())) for i, e := range resWithRelations.Ennoblements() { assert.Equal(t, res.Ennoblements()[i], e.Ennoblement()) diff --git a/internal/adapter/repository_player_snapshot_test.go b/internal/adapter/repository_player_snapshot_test.go index a9d2e31..b03f5fe 100644 --- a/internal/adapter/repository_player_snapshot_test.go +++ b/internal/adapter/repository_player_snapshot_test.go @@ -133,7 +133,6 @@ func testPlayerSnapshotRepository(t *testing.T, newRepos func(t *testing.T) repo playerSnapshots domain.PlayerSnapshots, ) assertError func(t *testing.T, err error) - assertTotal func(t *testing.T, params domain.ListPlayerSnapshotsParams, total int) }{ { name: "OK: default params", @@ -156,14 +155,6 @@ func testPlayerSnapshotRepository(t *testing.T, newRepos func(t *testing.T) repo ) })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, - assertTotal: func(t *testing.T, _ domain.ListPlayerSnapshotsParams, total int) { - t.Helper() - assert.NotEmpty(t, total) - }, }, { name: "OK: sort=[serverKey DESC, date DESC]", @@ -190,14 +181,6 @@ func testPlayerSnapshotRepository(t *testing.T, newRepos func(t *testing.T) repo ) * -1 })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, - assertTotal: func(t *testing.T, _ domain.ListPlayerSnapshotsParams, total int) { - t.Helper() - assert.NotEmpty(t, total) - }, }, { name: "OK: sort=[id ASC]", @@ -220,14 +203,6 @@ func testPlayerSnapshotRepository(t *testing.T, newRepos func(t *testing.T) repo return cmp.Compare(a.ID(), b.ID()) })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, - assertTotal: func(t *testing.T, _ domain.ListPlayerSnapshotsParams, total int) { - t.Helper() - assert.NotEmpty(t, total) - }, }, { name: "OK: sort=[id DESC]", @@ -250,14 +225,6 @@ func testPlayerSnapshotRepository(t *testing.T, newRepos func(t *testing.T) repo return cmp.Compare(a.ID(), b.ID()) * -1 })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, - assertTotal: func(t *testing.T, _ domain.ListPlayerSnapshotsParams, total int) { - t.Helper() - assert.NotEmpty(t, total) - }, }, { name: fmt.Sprintf("OK: serverKeys=[%s]", randPlayerSnapshot.ServerKey()), @@ -280,14 +247,6 @@ func testPlayerSnapshotRepository(t *testing.T, newRepos func(t *testing.T) repo assert.True(t, slices.Contains(serverKeys, ps.ServerKey())) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, - assertTotal: func(t *testing.T, _ domain.ListPlayerSnapshotsParams, total int) { - t.Helper() - assert.NotEmpty(t, total) - }, }, { name: "OK: offset=1 limit=2", @@ -306,14 +265,6 @@ func testPlayerSnapshotRepository(t *testing.T, newRepos func(t *testing.T) repo t.Helper() assert.Len(t, playerSnapshots, params.Limit()) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, - assertTotal: func(t *testing.T, _ domain.ListPlayerSnapshotsParams, total int) { - t.Helper() - assert.NotEmpty(t, total) - }, }, } @@ -321,10 +272,18 @@ func testPlayerSnapshotRepository(t *testing.T, newRepos func(t *testing.T) repo t.Run(tt.name, func(t *testing.T) { t.Parallel() + assertError := tt.assertError + if assertError == nil { + assertError = func(t *testing.T, err error) { + t.Helper() + require.NoError(t, err) + } + } + params := tt.params(t) res, err := repos.playerSnapshot.List(ctx, params) - tt.assertError(t, err) + assertError(t, err) tt.assertPlayerSnapshots(t, params, res) }) } diff --git a/internal/adapter/repository_player_test.go b/internal/adapter/repository_player_test.go index 0db403f..bea8a52 100644 --- a/internal/adapter/repository_player_test.go +++ b/internal/adapter/repository_player_test.go @@ -130,10 +130,6 @@ func testPlayerRepository(t *testing.T, newRepos func(t *testing.T) repositories assert.False(t, res.Self().IsZero()) assert.True(t, res.Next().IsZero()) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: sort=[serverKey DESC, id DESC]", @@ -154,10 +150,6 @@ func testPlayerRepository(t *testing.T, newRepos func(t *testing.T) repositories ) * -1 })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: sort=[scoreAtt DESC, serverKey ASC, id ASC]", @@ -183,10 +175,6 @@ func testPlayerRepository(t *testing.T, newRepos func(t *testing.T) repositories ) })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: sort=[scoreDef DESC, serverKey ASC, id ASC]", @@ -212,10 +200,6 @@ func testPlayerRepository(t *testing.T, newRepos func(t *testing.T) repositories ) })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: sort=[scoreSup DESC, serverKey ASC, id ASC]", @@ -241,10 +225,6 @@ func testPlayerRepository(t *testing.T, newRepos func(t *testing.T) repositories ) })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: sort=[scoreTotal DESC, serverKey ASC, id ASC]", @@ -270,10 +250,6 @@ func testPlayerRepository(t *testing.T, newRepos func(t *testing.T) repositories ) })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: sort=[points DESC, serverKey ASC, id ASC]", @@ -299,10 +275,6 @@ func testPlayerRepository(t *testing.T, newRepos func(t *testing.T) repositories ) })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: sort=[deletedAt ASC, serverKey ASC, id ASC]", @@ -328,10 +300,6 @@ func testPlayerRepository(t *testing.T, newRepos func(t *testing.T) repositories ) })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: sort=[deletedAt DESC, serverKey ASC, id ASC]", @@ -357,10 +325,6 @@ func testPlayerRepository(t *testing.T, newRepos func(t *testing.T) repositories ) })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: ids serverKeys", @@ -392,10 +356,6 @@ func testPlayerRepository(t *testing.T, newRepos func(t *testing.T) repositories assert.True(t, slices.Contains(serverKeys, p.ServerKey())) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: names serverKeys", @@ -427,10 +387,6 @@ func testPlayerRepository(t *testing.T, newRepos func(t *testing.T) repositories assert.True(t, slices.Contains(serverKeys, p.ServerKey())) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: tribeIDs serverKeys", @@ -465,10 +421,6 @@ func testPlayerRepository(t *testing.T, newRepos func(t *testing.T) repositories assert.True(t, slices.Contains(serverKeys, p.ServerKey())) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: deleted=true", @@ -489,10 +441,6 @@ func testPlayerRepository(t *testing.T, newRepos func(t *testing.T) repositories assert.True(t, s.IsDeleted()) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: deleted=false", @@ -513,10 +461,6 @@ func testPlayerRepository(t *testing.T, newRepos func(t *testing.T) repositories assert.False(t, s.IsDeleted()) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: cursor serverKeys sort=[id ASC]", @@ -552,10 +496,6 @@ func testPlayerRepository(t *testing.T, newRepos func(t *testing.T) repositories return cmp.Compare(a.ID(), b.ID()) })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: cursor sort=[serverKey ASC, id ASC]", @@ -593,10 +533,6 @@ func testPlayerRepository(t *testing.T, newRepos func(t *testing.T) repositories assert.GreaterOrEqual(t, p.ServerKey(), params.Cursor().ServerKey()) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: cursor sort=[serverKey DESC, id DESC]", @@ -634,10 +570,6 @@ func testPlayerRepository(t *testing.T, newRepos func(t *testing.T) repositories assert.LessOrEqual(t, p.ServerKey(), params.Cursor().ServerKey()) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: limit=2", @@ -653,10 +585,6 @@ func testPlayerRepository(t *testing.T, newRepos func(t *testing.T) repositories assert.False(t, res.Self().IsZero()) assert.False(t, res.Next().IsZero()) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, } @@ -664,14 +592,22 @@ func testPlayerRepository(t *testing.T, newRepos func(t *testing.T) repositories t.Run(tt.name, func(t *testing.T) { t.Parallel() + assertError := tt.assertError + if assertError == nil { + assertError = func(t *testing.T, err error) { + t.Helper() + require.NoError(t, err) + } + } + params := tt.params(t) res, err := repos.player.List(ctx, params) - tt.assertError(t, err) + assertError(t, err) tt.assertResult(t, params, res) resWithRelations, err := repos.player.ListWithRelations(ctx, params) - tt.assertError(t, err) + assertError(t, err) require.Len(t, resWithRelations.Players(), len(res.Players())) for i, p := range resWithRelations.Players() { assert.Equal(t, res.Players()[i], p.Player()) diff --git a/internal/adapter/repository_server_test.go b/internal/adapter/repository_server_test.go index 1262649..fd87b77 100644 --- a/internal/adapter/repository_server_test.go +++ b/internal/adapter/repository_server_test.go @@ -132,10 +132,6 @@ func testServerRepository(t *testing.T, newRepos func(t *testing.T) repositories assert.False(t, res.Self().IsZero()) assert.True(t, res.Next().IsZero()) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: sort=[open ASC, key ASC]", @@ -161,10 +157,6 @@ func testServerRepository(t *testing.T, newRepos func(t *testing.T) repositories return cmp.Compare(a.Key(), b.Key()) })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: sort=[open DESC, key DESC]", @@ -190,10 +182,6 @@ func testServerRepository(t *testing.T, newRepos func(t *testing.T) repositories return cmp.Compare(a.Key(), b.Key()) * -1 })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: keys", @@ -223,10 +211,6 @@ func testServerRepository(t *testing.T, newRepos func(t *testing.T) repositories }), k) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: versionCodes", @@ -256,10 +240,6 @@ func testServerRepository(t *testing.T, newRepos func(t *testing.T) repositories }), c) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: special=true", @@ -280,10 +260,6 @@ func testServerRepository(t *testing.T, newRepos func(t *testing.T) repositories assert.True(t, s.Special(), s.Key()) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: open=false", @@ -304,10 +280,6 @@ func testServerRepository(t *testing.T, newRepos func(t *testing.T) repositories assert.False(t, s.Open(), s.Key()) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: playerSnapshotsCreatedAtLt=" + snapshotsCreatedAtLT.Format(time.RFC3339), @@ -328,10 +300,6 @@ func testServerRepository(t *testing.T, newRepos func(t *testing.T) repositories assert.True(t, s.PlayerSnapshotsCreatedAt().Before(snapshotsCreatedAtLT)) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: tribeSnapshotsCreatedAtLt=" + snapshotsCreatedAtLT.Format(time.RFC3339), @@ -352,10 +320,6 @@ func testServerRepository(t *testing.T, newRepos func(t *testing.T) repositories assert.True(t, s.TribeSnapshotsCreatedAt().Before(snapshotsCreatedAtLT)) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: cursor sort=[key ASC]", @@ -386,10 +350,6 @@ func testServerRepository(t *testing.T, newRepos func(t *testing.T) repositories assert.GreaterOrEqual(t, s.Key(), params.Cursor().Key(), s.Key()) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: cursor sort=[open ASC, key ASC]", @@ -428,10 +388,6 @@ func testServerRepository(t *testing.T, newRepos func(t *testing.T) repositories assert.GreaterOrEqual(t, s.Key(), params.Cursor().Key(), s.Key()) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: cursor sort=[open DESC, key DESC]", @@ -470,10 +426,6 @@ func testServerRepository(t *testing.T, newRepos func(t *testing.T) repositories assert.LessOrEqual(t, s.Key(), params.Cursor().Key(), s.Key()) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: limit=2", @@ -489,10 +441,6 @@ func testServerRepository(t *testing.T, newRepos func(t *testing.T) repositories assert.False(t, res.Self().IsZero()) assert.False(t, res.Next().IsZero()) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, } @@ -500,10 +448,18 @@ func testServerRepository(t *testing.T, newRepos func(t *testing.T) repositories t.Run(tt.name, func(t *testing.T) { t.Parallel() + assertError := tt.assertError + if assertError == nil { + assertError = func(t *testing.T, err error) { + t.Helper() + require.NoError(t, err) + } + } + params := tt.params(t) res, err := repos.server.List(ctx, params) - tt.assertError(t, err) + assertError(t, err) tt.assertResult(t, params, res) }) } diff --git a/internal/adapter/repository_tribe_change_test.go b/internal/adapter/repository_tribe_change_test.go index 2d60166..43db727 100644 --- a/internal/adapter/repository_tribe_change_test.go +++ b/internal/adapter/repository_tribe_change_test.go @@ -167,10 +167,6 @@ func testTribeChangeRepository(t *testing.T, newRepos func(t *testing.T) reposit assert.False(t, res.Self().IsZero()) assert.True(t, res.Next().IsZero()) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: sort=[serverKey DESC, createdAt DESC]", @@ -194,10 +190,6 @@ func testTribeChangeRepository(t *testing.T, newRepos func(t *testing.T) reposit ) * -1 })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: sort=[id ASC]", @@ -217,10 +209,6 @@ func testTribeChangeRepository(t *testing.T, newRepos func(t *testing.T) reposit return cmp.Compare(a.ID(), b.ID()) })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: sort=[id DESC]", @@ -240,10 +228,6 @@ func testTribeChangeRepository(t *testing.T, newRepos func(t *testing.T) reposit return cmp.Compare(a.ID(), b.ID()) * -1 })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: serverKeys", @@ -272,10 +256,6 @@ func testTribeChangeRepository(t *testing.T, newRepos func(t *testing.T) reposit assert.True(t, slices.Contains(serverKeys, tc.ServerKey())) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: playerIDs serverKeys", @@ -307,10 +287,6 @@ func testTribeChangeRepository(t *testing.T, newRepos func(t *testing.T) reposit assert.True(t, slices.Contains(playerIDs, tc.PlayerID())) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: tribeIDs (new tribe) serverKeys", @@ -349,10 +325,6 @@ func testTribeChangeRepository(t *testing.T, newRepos func(t *testing.T) reposit assert.True(t, slices.Contains(tribeIDs, tc.NewTribeID()) || slices.Contains(tribeIDs, tc.OldTribeID())) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: tribeIDs (old tribe) serverKeys", @@ -391,10 +363,6 @@ func testTribeChangeRepository(t *testing.T, newRepos func(t *testing.T) reposit assert.True(t, slices.Contains(tribeIDs, tc.NewTribeID()) || slices.Contains(tribeIDs, tc.OldTribeID())) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: since before", @@ -436,10 +404,6 @@ func testTribeChangeRepository(t *testing.T, newRepos func(t *testing.T) reposit assert.True(t, tc.CreatedAt().Before(before)) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: cursor serverKeys sort=[id ASC]", @@ -475,10 +439,6 @@ func testTribeChangeRepository(t *testing.T, newRepos func(t *testing.T) reposit return cmp.Compare(a.ID(), b.ID()) })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: cursor sort=[serverKey ASC, id ASC]", @@ -516,10 +476,6 @@ func testTribeChangeRepository(t *testing.T, newRepos func(t *testing.T) reposit assert.GreaterOrEqual(t, tc.ServerKey(), params.Cursor().ServerKey()) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: cursor sort=[serverKey DESC, id DESC]", @@ -557,10 +513,6 @@ func testTribeChangeRepository(t *testing.T, newRepos func(t *testing.T) reposit assert.LessOrEqual(t, tc.ServerKey(), params.Cursor().ServerKey()) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: limit=2", @@ -576,10 +528,6 @@ func testTribeChangeRepository(t *testing.T, newRepos func(t *testing.T) reposit assert.False(t, res.Self().IsZero()) assert.False(t, res.Next().IsZero()) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, } @@ -587,14 +535,22 @@ func testTribeChangeRepository(t *testing.T, newRepos func(t *testing.T) reposit t.Run(tt.name, func(t *testing.T) { t.Parallel() + assertError := tt.assertError + if assertError == nil { + assertError = func(t *testing.T, err error) { + t.Helper() + require.NoError(t, err) + } + } + params := tt.params(t) res, err := repos.tribeChange.List(ctx, params) - tt.assertError(t, err) + assertError(t, err) tt.assertResult(t, params, res) resWithRelations, err := repos.tribeChange.ListWithRelations(ctx, params) - tt.assertError(t, err) + assertError(t, err) require.Len(t, resWithRelations.TribeChanges(), len(res.TribeChanges())) for i, e := range resWithRelations.TribeChanges() { assert.Equal(t, res.TribeChanges()[i], e.TribeChange()) diff --git a/internal/adapter/repository_tribe_snapshot_test.go b/internal/adapter/repository_tribe_snapshot_test.go index 898bcae..bd35017 100644 --- a/internal/adapter/repository_tribe_snapshot_test.go +++ b/internal/adapter/repository_tribe_snapshot_test.go @@ -130,7 +130,6 @@ func testTribeSnapshotRepository(t *testing.T, newRepos func(t *testing.T) repos params func(t *testing.T) domain.ListTribeSnapshotsParams assertTribeSnapshots func(t *testing.T, params domain.ListTribeSnapshotsParams, tribeSnapshots domain.TribeSnapshots) assertError func(t *testing.T, err error) - assertTotal func(t *testing.T, params domain.ListTribeSnapshotsParams, total int) }{ { name: "OK: default params", @@ -153,14 +152,6 @@ func testTribeSnapshotRepository(t *testing.T, newRepos func(t *testing.T) repos ) })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, - assertTotal: func(t *testing.T, _ domain.ListTribeSnapshotsParams, total int) { - t.Helper() - assert.NotEmpty(t, total) - }, }, { name: "OK: sort=[serverKey DESC, date DESC]", @@ -187,14 +178,6 @@ func testTribeSnapshotRepository(t *testing.T, newRepos func(t *testing.T) repos ) * -1 })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, - assertTotal: func(t *testing.T, _ domain.ListTribeSnapshotsParams, total int) { - t.Helper() - assert.NotEmpty(t, total) - }, }, { name: "OK: sort=[id ASC]", @@ -217,14 +200,6 @@ func testTribeSnapshotRepository(t *testing.T, newRepos func(t *testing.T) repos return cmp.Compare(a.ID(), b.ID()) })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, - assertTotal: func(t *testing.T, _ domain.ListTribeSnapshotsParams, total int) { - t.Helper() - assert.NotEmpty(t, total) - }, }, { name: "OK: sort=[id DESC]", @@ -247,14 +222,6 @@ func testTribeSnapshotRepository(t *testing.T, newRepos func(t *testing.T) repos return cmp.Compare(a.ID(), b.ID()) * -1 })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, - assertTotal: func(t *testing.T, _ domain.ListTribeSnapshotsParams, total int) { - t.Helper() - assert.NotEmpty(t, total) - }, }, { name: fmt.Sprintf("OK: serverKeys=[%s]", randTribeSnapshot.ServerKey()), @@ -277,14 +244,6 @@ func testTribeSnapshotRepository(t *testing.T, newRepos func(t *testing.T) repos assert.True(t, slices.Contains(serverKeys, ts.ServerKey())) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, - assertTotal: func(t *testing.T, _ domain.ListTribeSnapshotsParams, total int) { - t.Helper() - assert.NotEmpty(t, total) - }, }, { name: "OK: offset=1 limit=2", @@ -303,14 +262,6 @@ func testTribeSnapshotRepository(t *testing.T, newRepos func(t *testing.T) repos t.Helper() assert.Len(t, tribeSnapshots, params.Limit()) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, - assertTotal: func(t *testing.T, _ domain.ListTribeSnapshotsParams, total int) { - t.Helper() - assert.NotEmpty(t, total) - }, }, } @@ -318,10 +269,18 @@ func testTribeSnapshotRepository(t *testing.T, newRepos func(t *testing.T) repos t.Run(tt.name, func(t *testing.T) { t.Parallel() + assertError := tt.assertError + if assertError == nil { + assertError = func(t *testing.T, err error) { + t.Helper() + require.NoError(t, err) + } + } + params := tt.params(t) res, err := repos.tribeSnapshot.List(ctx, params) - tt.assertError(t, err) + assertError(t, err) tt.assertTribeSnapshots(t, params, res) }) } diff --git a/internal/adapter/repository_tribe_test.go b/internal/adapter/repository_tribe_test.go index 637679e..016e8a7 100644 --- a/internal/adapter/repository_tribe_test.go +++ b/internal/adapter/repository_tribe_test.go @@ -193,10 +193,6 @@ func testTribeRepository(t *testing.T, newRepos func(t *testing.T) repositories) assert.False(t, res.Self().IsZero()) assert.True(t, res.Next().IsZero()) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: sort=[serverKey DESC, id DESC]", @@ -217,10 +213,6 @@ func testTribeRepository(t *testing.T, newRepos func(t *testing.T) repositories) ) * -1 })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: sort=[scoreAtt DESC, serverKey ASC, id ASC]", @@ -246,10 +238,6 @@ func testTribeRepository(t *testing.T, newRepos func(t *testing.T) repositories) ) })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: sort=[scoreDef DESC, serverKey ASC, id ASC]", @@ -275,10 +263,6 @@ func testTribeRepository(t *testing.T, newRepos func(t *testing.T) repositories) ) })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: sort=[scoreTotal DESC, serverKey ASC, id ASC]", @@ -304,10 +288,6 @@ func testTribeRepository(t *testing.T, newRepos func(t *testing.T) repositories) ) })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: sort=[points DESC, serverKey ASC, id ASC]", @@ -333,10 +313,6 @@ func testTribeRepository(t *testing.T, newRepos func(t *testing.T) repositories) ) })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: sort=[dominance ASC, serverKey ASC, id ASC]", @@ -362,10 +338,6 @@ func testTribeRepository(t *testing.T, newRepos func(t *testing.T) repositories) ) })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: sort=[deletedAt ASC, serverKey ASC, id ASC]", @@ -391,10 +363,6 @@ func testTribeRepository(t *testing.T, newRepos func(t *testing.T) repositories) ) })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: sort=[deletedAt DESC, serverKey ASC, id ASC]", @@ -420,10 +388,6 @@ func testTribeRepository(t *testing.T, newRepos func(t *testing.T) repositories) ) })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: ids serverKeys", @@ -455,10 +419,6 @@ func testTribeRepository(t *testing.T, newRepos func(t *testing.T) repositories) assert.True(t, slices.Contains(serverKeys, tr.ServerKey())) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: tags serverKeys", @@ -490,10 +450,6 @@ func testTribeRepository(t *testing.T, newRepos func(t *testing.T) repositories) assert.True(t, slices.Contains(serverKeys, tr.ServerKey())) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: deleted=true", @@ -514,10 +470,6 @@ func testTribeRepository(t *testing.T, newRepos func(t *testing.T) repositories) assert.True(t, s.IsDeleted()) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: deleted=false", @@ -538,10 +490,6 @@ func testTribeRepository(t *testing.T, newRepos func(t *testing.T) repositories) assert.False(t, s.IsDeleted()) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: cursor serverKeys sort=[id ASC]", @@ -577,10 +525,6 @@ func testTribeRepository(t *testing.T, newRepos func(t *testing.T) repositories) return cmp.Compare(a.ID(), b.ID()) })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: cursor sort=[serverKey ASC, id ASC]", @@ -618,10 +562,6 @@ func testTribeRepository(t *testing.T, newRepos func(t *testing.T) repositories) assert.GreaterOrEqual(t, tr.ServerKey(), params.Cursor().ServerKey()) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: cursor sort=[serverKey DESC, id DESC]", @@ -659,10 +599,6 @@ func testTribeRepository(t *testing.T, newRepos func(t *testing.T) repositories) assert.LessOrEqual(t, tr.ServerKey(), params.Cursor().ServerKey()) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: cursor sort=[points DESC, serverKey ASC, id ASC]", @@ -703,10 +639,6 @@ func testTribeRepository(t *testing.T, newRepos func(t *testing.T) repositories) assert.LessOrEqual(t, tr.Points(), params.Cursor().Points()) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: cursor sort=[deletedAt ASC, serverKey ASC, id ASC]", @@ -747,10 +679,6 @@ func testTribeRepository(t *testing.T, newRepos func(t *testing.T) repositories) assert.GreaterOrEqual(t, tr.DeletedAt(), params.Cursor().DeletedAt()) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: limit=2", @@ -766,10 +694,6 @@ func testTribeRepository(t *testing.T, newRepos func(t *testing.T) repositories) assert.False(t, res.Self().IsZero()) assert.False(t, res.Next().IsZero()) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, } @@ -777,10 +701,18 @@ func testTribeRepository(t *testing.T, newRepos func(t *testing.T) repositories) t.Run(tt.name, func(t *testing.T) { t.Parallel() + assertError := tt.assertError + if assertError == nil { + assertError = func(t *testing.T, err error) { + t.Helper() + require.NoError(t, err) + } + } + params := tt.params(t) res, err := repos.tribe.List(ctx, params) - tt.assertError(t, err) + assertError(t, err) tt.assertResult(t, params, res) }) } diff --git a/internal/adapter/repository_version_test.go b/internal/adapter/repository_version_test.go index 41d1233..b81ea78 100644 --- a/internal/adapter/repository_version_test.go +++ b/internal/adapter/repository_version_test.go @@ -42,10 +42,6 @@ func testVersionRepository(t *testing.T, newRepos func(t *testing.T) repositorie assert.False(t, res.Self().IsZero()) assert.True(t, res.Next().IsZero()) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: sort=[code DESC]", @@ -62,10 +58,6 @@ func testVersionRepository(t *testing.T, newRepos func(t *testing.T) repositorie return cmp.Compare(a.Code(), b.Code()) * -1 })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: cursor sort=[code ASC]", @@ -95,10 +87,6 @@ func testVersionRepository(t *testing.T, newRepos func(t *testing.T) repositorie assert.GreaterOrEqual(t, v.Code(), params.Cursor().Code(), v.Code()) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: cursor sort=[code DESC]", @@ -128,10 +116,6 @@ func testVersionRepository(t *testing.T, newRepos func(t *testing.T) repositorie assert.LessOrEqual(t, v.Code(), params.Cursor().Code(), v.Code()) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: codes limit=1", @@ -158,10 +142,6 @@ func testVersionRepository(t *testing.T, newRepos func(t *testing.T) repositorie assert.Contains(t, codes, v.Code()) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: limit=5", @@ -177,10 +157,6 @@ func testVersionRepository(t *testing.T, newRepos func(t *testing.T) repositorie assert.False(t, res.Self().IsZero()) assert.False(t, res.Next().IsZero()) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, } @@ -188,10 +164,18 @@ func testVersionRepository(t *testing.T, newRepos func(t *testing.T) repositorie t.Run(tt.name, func(t *testing.T) { t.Parallel() + assertError := tt.assertError + if assertError == nil { + assertError = func(t *testing.T, err error) { + t.Helper() + require.NoError(t, err) + } + } + params := tt.params(t) res, err := repos.version.List(ctx, params) - tt.assertError(t, err) + assertError(t, err) tt.assertResult(t, params, res) }) } diff --git a/internal/adapter/repository_village_test.go b/internal/adapter/repository_village_test.go index 29d7a50..ab2407a 100644 --- a/internal/adapter/repository_village_test.go +++ b/internal/adapter/repository_village_test.go @@ -128,10 +128,6 @@ func testVillageRepository(t *testing.T, newRepos func(t *testing.T) repositorie assert.False(t, res.Self().IsZero()) assert.True(t, res.Next().IsZero()) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: sort=[serverKey DESC, id DESC]", @@ -152,10 +148,6 @@ func testVillageRepository(t *testing.T, newRepos func(t *testing.T) repositorie ) * -1 })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: ids serverKeys", @@ -187,10 +179,6 @@ func testVillageRepository(t *testing.T, newRepos func(t *testing.T) repositorie assert.True(t, slices.Contains(serverKeys, v.ServerKey())) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: coords serverKeys", @@ -222,10 +210,6 @@ func testVillageRepository(t *testing.T, newRepos func(t *testing.T) repositorie assert.True(t, slices.Contains(serverKeys, v.ServerKey())) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: playerIDs serverKeys", @@ -264,10 +248,6 @@ func testVillageRepository(t *testing.T, newRepos func(t *testing.T) repositorie assert.True(t, slices.Contains(serverKeys, v.ServerKey())) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: tribeIDs serverKeys", @@ -313,10 +293,6 @@ func testVillageRepository(t *testing.T, newRepos func(t *testing.T) repositorie assert.True(t, slices.Contains(serverKeys, v.Village().ServerKey())) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: cursor serverKeys sort=[id ASC]", @@ -352,10 +328,6 @@ func testVillageRepository(t *testing.T, newRepos func(t *testing.T) repositorie return cmp.Compare(a.ID(), b.ID()) })) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: cursor sort=[serverKey ASC, id ASC]", @@ -393,10 +365,6 @@ func testVillageRepository(t *testing.T, newRepos func(t *testing.T) repositorie assert.GreaterOrEqual(t, v.ServerKey(), params.Cursor().ServerKey()) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: cursor sort=[serverKey DESC, id DESC]", @@ -434,10 +402,6 @@ func testVillageRepository(t *testing.T, newRepos func(t *testing.T) repositorie assert.LessOrEqual(t, v.ServerKey(), params.Cursor().ServerKey()) } }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, { name: "OK: limit=2", @@ -453,10 +417,6 @@ func testVillageRepository(t *testing.T, newRepos func(t *testing.T) repositorie assert.False(t, res.Self().IsZero()) assert.False(t, res.Next().IsZero()) }, - assertError: func(t *testing.T, err error) { - t.Helper() - require.NoError(t, err) - }, }, } @@ -464,14 +424,22 @@ func testVillageRepository(t *testing.T, newRepos func(t *testing.T) repositorie t.Run(tt.name, func(t *testing.T) { t.Parallel() + assertError := tt.assertError + if assertError == nil { + assertError = func(t *testing.T, err error) { + t.Helper() + require.NoError(t, err) + } + } + params := tt.params(t) res, err := repos.village.List(ctx, params) - tt.assertError(t, err) + assertError(t, err) tt.assertResult(t, params, res) resWithRelations, err := repos.village.ListWithRelations(ctx, params) - tt.assertError(t, err) + assertError(t, err) require.Len(t, resWithRelations.Villages(), len(res.Villages())) for i, v := range resWithRelations.Villages() { assert.Equal(t, res.Villages()[i], v.Village()) diff --git a/internal/port/port_test.go b/internal/port/port_test.go index 98aa947..9db10bf 100644 --- a/internal/port/port_test.go +++ b/internal/port/port_test.go @@ -36,7 +36,7 @@ func testMainWrapper(m *testing.M) int { postgres, err = buntest.NewPostgres(pool, buntest.WithPostgresTTL(180)) if err != nil { - log.Println("couldn't construct adaptertest.Postgres:", err) + log.Println("couldn't construct buntest.Postgres:", err) return 1 } defer func() {