Skip to content

chore: Reuse a single playerbuilder across test cases #273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Amund211 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: Reuse a single playerbuilder across test cases #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 47 additions & 42 deletions internal/adapters/playerrepository/repository_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,11 +401,12 @@ func TestPostgresPlayerRepository(t *testing.T) {
t.Parallel()

playerUUID := domaintest.NewUUID(t)
fours := domaintest.NewPlayerBuilder(playerUUID).Fours()

p1 := domaintest.NewPlayerBuilder(playerUUID).Fours().WithGamesPlayed(1).BuildPtr(now.Add(-2 * time.Hour))
p2 := domaintest.NewPlayerBuilder(playerUUID).Fours().WithGamesPlayed(2).BuildPtr(now)
p3 := domaintest.NewPlayerBuilder(playerUUID).Fours().WithGamesPlayed(3).BuildPtr(now.Add(2 * time.Minute))
p4 := domaintest.NewPlayerBuilder(playerUUID).Fours().WithGamesPlayed(4).BuildPtr(now.Add(2 * time.Hour))
p1 := fours.WithGamesPlayed(1).BuildPtr(now.Add(-2 * time.Hour))
p2 := fours.WithGamesPlayed(2).BuildPtr(now)
p3 := fours.WithGamesPlayed(3).BuildPtr(now.Add(2 * time.Minute))
p4 := fours.WithGamesPlayed(4).BuildPtr(now.Add(2 * time.Hour))

storePlayers(t, p, p1, p2, p3, p4)

Expand Down Expand Up @@ -657,33 +658,35 @@ func TestPostgresPlayerRepository(t *testing.T) {
playerUUID := domaintest.NewUUID(t)
start := time.Date(2021, time.January, 1, 0, 0, 0, 0, time.FixedZone("UTC", -3600*8))

fours := domaintest.NewPlayerBuilder(playerUUID).Fours()

players := make([]*domain.PlayerPIT, 13)
// Before start
players[0] = domaintest.NewPlayerBuilder(playerUUID).Fours().WithGamesPlayed(0).BuildPtr(start.Add(0 * time.Hour).Add(-1 * time.Minute))
players[0] = fours.WithGamesPlayed(0).BuildPtr(start.Add(0 * time.Hour).Add(-1 * time.Minute))

// First 30 min interval
players[1] = domaintest.NewPlayerBuilder(playerUUID).Fours().WithGamesPlayed(1).BuildPtr(start.Add(0 * time.Hour).Add(7 * time.Minute))
players[2] = domaintest.NewPlayerBuilder(playerUUID).Fours().WithGamesPlayed(2).BuildPtr(start.Add(0 * time.Hour).Add(17 * time.Minute))
players[1] = fours.WithGamesPlayed(1).BuildPtr(start.Add(0 * time.Hour).Add(7 * time.Minute))
players[2] = fours.WithGamesPlayed(2).BuildPtr(start.Add(0 * time.Hour).Add(17 * time.Minute))

// Second 30 min interval
players[3] = domaintest.NewPlayerBuilder(playerUUID).Fours().WithGamesPlayed(3).BuildPtr(start.Add(0 * time.Hour).Add(37 * time.Minute))
players[3] = fours.WithGamesPlayed(3).BuildPtr(start.Add(0 * time.Hour).Add(37 * time.Minute))

// Sixth 30 min interval
players[4] = domaintest.NewPlayerBuilder(playerUUID).Fours().WithGamesPlayed(4).BuildPtr(start.Add(2 * time.Hour).Add(40 * time.Minute))
players[5] = domaintest.NewPlayerBuilder(playerUUID).Fours().WithGamesPlayed(5).BuildPtr(start.Add(2 * time.Hour).Add(45 * time.Minute))
players[6] = domaintest.NewPlayerBuilder(playerUUID).Fours().WithGamesPlayed(6).BuildPtr(start.Add(2 * time.Hour).Add(50 * time.Minute))
players[7] = domaintest.NewPlayerBuilder(playerUUID).Fours().WithGamesPlayed(7).BuildPtr(start.Add(2 * time.Hour).Add(55 * time.Minute))
players[4] = fours.WithGamesPlayed(4).BuildPtr(start.Add(2 * time.Hour).Add(40 * time.Minute))
players[5] = fours.WithGamesPlayed(5).BuildPtr(start.Add(2 * time.Hour).Add(45 * time.Minute))
players[6] = fours.WithGamesPlayed(6).BuildPtr(start.Add(2 * time.Hour).Add(50 * time.Minute))
players[7] = fours.WithGamesPlayed(7).BuildPtr(start.Add(2 * time.Hour).Add(55 * time.Minute))

// Seventh 30 min interval
players[8] = domaintest.NewPlayerBuilder(playerUUID).Fours().WithGamesPlayed(8).BuildPtr(start.Add(3 * time.Hour).Add(1 * time.Minute))
players[8] = fours.WithGamesPlayed(8).BuildPtr(start.Add(3 * time.Hour).Add(1 * time.Minute))

// Eighth 30 min interval
players[9] = domaintest.NewPlayerBuilder(playerUUID).Fours().WithGamesPlayed(9).BuildPtr(start.Add(3 * time.Hour).Add(47 * time.Minute))
players[10] = domaintest.NewPlayerBuilder(playerUUID).Fours().WithGamesPlayed(0).BuildPtr(start.Add(3 * time.Hour).Add(59 * time.Minute))
players[9] = fours.WithGamesPlayed(9).BuildPtr(start.Add(3 * time.Hour).Add(47 * time.Minute))
players[10] = fours.WithGamesPlayed(0).BuildPtr(start.Add(3 * time.Hour).Add(59 * time.Minute))

// After end
players[11] = domaintest.NewPlayerBuilder(playerUUID).Fours().WithGamesPlayed(1).BuildPtr(start.Add(4 * time.Hour).Add(1 * time.Minute))
players[12] = domaintest.NewPlayerBuilder(playerUUID).Fours().WithGamesPlayed(2).BuildPtr(start.Add(4000 * time.Hour).Add(1 * time.Minute))
players[11] = fours.WithGamesPlayed(1).BuildPtr(start.Add(4 * time.Hour).Add(1 * time.Minute))
players[12] = fours.WithGamesPlayed(2).BuildPtr(start.Add(4000 * time.Hour).Add(1 * time.Minute))

setStoredStats(t, p, players...)

Expand Down Expand Up @@ -868,6 +871,8 @@ func TestPostgresPlayerRepository(t *testing.T) {
t.Run("GamemodeOverall and StatExperience", func(t *testing.T) {
t.Parallel()

builder := domaintest.NewPlayerBuilder(playerUUID)

tests := []struct {
name string
players []*domain.PlayerPIT
Expand All @@ -877,16 +882,16 @@ func TestPostgresPlayerRepository(t *testing.T) {
{
name: "Single milestone reached",
players: []*domain.PlayerPIT{
domaintest.NewPlayerBuilder(playerUUID).WithExperience(500).BuildPtr(time.Date(2021, time.January, 1, 12, 0, 0, 0, time.UTC)),
domaintest.NewPlayerBuilder(playerUUID).WithExperience(1000).BuildPtr(time.Date(2021, time.January, 2, 12, 0, 0, 0, time.UTC)),
domaintest.NewPlayerBuilder(playerUUID).WithExperience(1500).BuildPtr(time.Date(2021, time.January, 3, 12, 0, 0, 0, time.UTC)),
builder.WithExperience(500).BuildPtr(time.Date(2021, time.January, 1, 12, 0, 0, 0, time.UTC)),
builder.WithExperience(1000).BuildPtr(time.Date(2021, time.January, 2, 12, 0, 0, 0, time.UTC)),
builder.WithExperience(1500).BuildPtr(time.Date(2021, time.January, 3, 12, 0, 0, 0, time.UTC)),
},
milestones: []int64{1200},
expected: []domain.MilestoneAchievement{
{
Milestone: 1200,
After: &domain.MilestoneAchievementStats{
Player: domaintest.NewPlayerBuilder(playerUUID).WithExperience(1500).Build(time.Date(2021, time.January, 3, 12, 0, 0, 0, time.UTC)),
Player: builder.WithExperience(1500).Build(time.Date(2021, time.January, 3, 12, 0, 0, 0, time.UTC)),
Value: 1500,
},
},
Expand All @@ -895,31 +900,31 @@ func TestPostgresPlayerRepository(t *testing.T) {
{
name: "Multiple milestones reached",
players: []*domain.PlayerPIT{
domaintest.NewPlayerBuilder(playerUUID).WithExperience(500).BuildPtr(time.Date(2021, time.January, 1, 12, 0, 0, 0, time.UTC)),
domaintest.NewPlayerBuilder(playerUUID).WithExperience(1000).BuildPtr(time.Date(2021, time.January, 2, 12, 0, 0, 0, time.UTC)),
domaintest.NewPlayerBuilder(playerUUID).WithExperience(2000).BuildPtr(time.Date(2021, time.January, 3, 12, 0, 0, 0, time.UTC)),
domaintest.NewPlayerBuilder(playerUUID).WithExperience(3000).BuildPtr(time.Date(2021, time.January, 4, 12, 0, 0, 0, time.UTC)),
builder.WithExperience(500).BuildPtr(time.Date(2021, time.January, 1, 12, 0, 0, 0, time.UTC)),
builder.WithExperience(1000).BuildPtr(time.Date(2021, time.January, 2, 12, 0, 0, 0, time.UTC)),
builder.WithExperience(2000).BuildPtr(time.Date(2021, time.January, 3, 12, 0, 0, 0, time.UTC)),
builder.WithExperience(3000).BuildPtr(time.Date(2021, time.January, 4, 12, 0, 0, 0, time.UTC)),
},
milestones: []int64{800, 1500, 2500},
expected: []domain.MilestoneAchievement{
{
Milestone: 800,
After: &domain.MilestoneAchievementStats{
Player: domaintest.NewPlayerBuilder(playerUUID).WithExperience(1000).Build(time.Date(2021, time.January, 2, 12, 0, 0, 0, time.UTC)),
Player: builder.WithExperience(1000).Build(time.Date(2021, time.January, 2, 12, 0, 0, 0, time.UTC)),
Value: 1000,
},
},
{
Milestone: 1500,
After: &domain.MilestoneAchievementStats{
Player: domaintest.NewPlayerBuilder(playerUUID).WithExperience(2000).Build(time.Date(2021, time.January, 3, 12, 0, 0, 0, time.UTC)),
Player: builder.WithExperience(2000).Build(time.Date(2021, time.January, 3, 12, 0, 0, 0, time.UTC)),
Value: 2000,
},
},
{
Milestone: 2500,
After: &domain.MilestoneAchievementStats{
Player: domaintest.NewPlayerBuilder(playerUUID).WithExperience(3000).Build(time.Date(2021, time.January, 4, 12, 0, 0, 0, time.UTC)),
Player: builder.WithExperience(3000).Build(time.Date(2021, time.January, 4, 12, 0, 0, 0, time.UTC)),
Value: 3000,
},
},
Expand All @@ -928,25 +933,25 @@ func TestPostgresPlayerRepository(t *testing.T) {
{
name: "No milestones reached",
players: []*domain.PlayerPIT{
domaintest.NewPlayerBuilder(playerUUID).WithExperience(500).BuildPtr(time.Date(2021, time.January, 1, 12, 0, 0, 0, time.UTC)),
domaintest.NewPlayerBuilder(playerUUID).WithExperience(600).BuildPtr(time.Date(2021, time.January, 2, 12, 0, 0, 0, time.UTC)),
builder.WithExperience(500).BuildPtr(time.Date(2021, time.January, 1, 12, 0, 0, 0, time.UTC)),
builder.WithExperience(600).BuildPtr(time.Date(2021, time.January, 2, 12, 0, 0, 0, time.UTC)),
},
milestones: []int64{1000, 2000},
expected: []domain.MilestoneAchievement{},
},
{
name: "Milestones skipped",
players: []*domain.PlayerPIT{
domaintest.NewPlayerBuilder(playerUUID).WithExperience(500).BuildPtr(time.Date(2021, time.January, 1, 12, 0, 0, 0, time.UTC)),
domaintest.NewPlayerBuilder(playerUUID).WithExperience(10_000).BuildPtr(time.Date(2021, time.January, 2, 12, 0, 0, 0, time.UTC)),
domaintest.NewPlayerBuilder(playerUUID).WithExperience(11_000).BuildPtr(time.Date(2021, time.January, 3, 12, 0, 0, 0, time.UTC)),
builder.WithExperience(500).BuildPtr(time.Date(2021, time.January, 1, 12, 0, 0, 0, time.UTC)),
builder.WithExperience(10_000).BuildPtr(time.Date(2021, time.January, 2, 12, 0, 0, 0, time.UTC)),
builder.WithExperience(11_000).BuildPtr(time.Date(2021, time.January, 3, 12, 0, 0, 0, time.UTC)),
},
milestones: []int64{1_000, 5_000, 8_000, 12_000},
expected: []domain.MilestoneAchievement{
{
Milestone: 8_000,
After: &domain.MilestoneAchievementStats{
Player: domaintest.NewPlayerBuilder(playerUUID).WithExperience(10_000).Build(time.Date(2021, time.January, 2, 12, 0, 0, 0, time.UTC)),
Player: builder.WithExperience(10_000).Build(time.Date(2021, time.January, 2, 12, 0, 0, 0, time.UTC)),
Value: 10_000,
},
},
Expand All @@ -955,16 +960,16 @@ func TestPostgresPlayerRepository(t *testing.T) {
{
name: "Milestones skipped - final reached",
players: []*domain.PlayerPIT{
domaintest.NewPlayerBuilder(playerUUID).WithExperience(500).BuildPtr(time.Date(2021, time.January, 1, 12, 0, 0, 0, time.UTC)),
domaintest.NewPlayerBuilder(playerUUID).WithExperience(100_000).BuildPtr(time.Date(2021, time.January, 2, 12, 0, 0, 0, time.UTC)),
domaintest.NewPlayerBuilder(playerUUID).WithExperience(200_000).BuildPtr(time.Date(2021, time.January, 3, 12, 0, 0, 0, time.UTC)),
builder.WithExperience(500).BuildPtr(time.Date(2021, time.January, 1, 12, 0, 0, 0, time.UTC)),
builder.WithExperience(100_000).BuildPtr(time.Date(2021, time.January, 2, 12, 0, 0, 0, time.UTC)),
builder.WithExperience(200_000).BuildPtr(time.Date(2021, time.January, 3, 12, 0, 0, 0, time.UTC)),
},
milestones: []int64{1_000, 5_000, 8_000, 12_000},
expected: []domain.MilestoneAchievement{
{
Milestone: 12_000,
After: &domain.MilestoneAchievementStats{
Player: domaintest.NewPlayerBuilder(playerUUID).WithExperience(100_000).Build(time.Date(2021, time.January, 2, 12, 0, 0, 0, time.UTC)),
Player: builder.WithExperience(100_000).Build(time.Date(2021, time.January, 2, 12, 0, 0, 0, time.UTC)),
Value: 100_000,
},
},
Expand All @@ -973,22 +978,22 @@ func TestPostgresPlayerRepository(t *testing.T) {
{
name: "Multiple sets of milestones skipped",
players: []*domain.PlayerPIT{
domaintest.NewPlayerBuilder(playerUUID).WithExperience(1_000).BuildPtr(time.Date(2025, time.March, 1, 19, 0, 0, 0, time.UTC)),
domaintest.NewPlayerBuilder(playerUUID).WithExperience(6_001).BuildPtr(time.Date(2025, time.March, 2, 19, 0, 0, 0, time.UTC)),
builder.WithExperience(1_000).BuildPtr(time.Date(2025, time.March, 1, 19, 0, 0, 0, time.UTC)),
builder.WithExperience(6_001).BuildPtr(time.Date(2025, time.March, 2, 19, 0, 0, 0, time.UTC)),
},
milestones: []int64{500, 600, 700, 800, 900, 1_000, 2_000, 3_000, 4_000, 5_000, 6_000, 7_000, 8_000, 9_000, 10_000},
expected: []domain.MilestoneAchievement{
{
Milestone: 1_000,
After: &domain.MilestoneAchievementStats{
Player: domaintest.NewPlayerBuilder(playerUUID).WithExperience(1_000).Build(time.Date(2025, time.March, 1, 19, 0, 0, 0, time.UTC)),
Player: builder.WithExperience(1_000).Build(time.Date(2025, time.March, 1, 19, 0, 0, 0, time.UTC)),
Value: 1_000,
},
},
{
Milestone: 6_000,
After: &domain.MilestoneAchievementStats{
Player: domaintest.NewPlayerBuilder(playerUUID).WithExperience(6_001).Build(time.Date(2025, time.March, 2, 19, 0, 0, 0, time.UTC)),
Player: builder.WithExperience(6_001).Build(time.Date(2025, time.March, 2, 19, 0, 0, 0, time.UTC)),
Value: 6_001,
},
},
Expand Down
10 changes: 6 additions & 4 deletions internal/app/history_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ func TestBuildGetHistory(t *testing.T) {
t.Parallel()

uuid := domaintest.NewUUID(t)
builder := domaintest.NewPlayerBuilder(uuid)

timeCases := []struct {
name string
Expand Down Expand Up @@ -105,8 +106,8 @@ func TestBuildGetHistory(t *testing.T) {
{
name: "non-empty history",
history: []domain.PlayerPIT{
domaintest.NewPlayerBuilder(uuid).WithExperience(500).Build(now),
domaintest.NewPlayerBuilder(uuid).WithExperience(501).Build(now),
builder.WithExperience(500).Build(now),
builder.WithExperience(501).Build(now),
},
},
}
Expand Down Expand Up @@ -148,13 +149,14 @@ func TestBuildGetHistory(t *testing.T) {
t.Parallel()

uuid := "12345678-1234-1234-1234-123456789012"
builder := domaintest.NewPlayerBuilder(uuid)

start := time.Date(2024, time.March, 1, 0, 0, 0, 0, time.UTC)
end := time.Date(2024, time.March, 31, 23, 59, 59, 999_999_999, time.UTC)

expectedHistory := []domain.PlayerPIT{
domaintest.NewPlayerBuilder(uuid).WithExperience(500).Build(now),
domaintest.NewPlayerBuilder(uuid).WithExperience(501).Build(now),
builder.WithExperience(500).Build(now),
builder.WithExperience(501).Build(now),
}

updatePlayerInIntervalCalled := false
Expand Down
12 changes: 7 additions & 5 deletions internal/app/milestone_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,10 @@ func TestFindMilestoneAchievements(t *testing.T) {
t.Run("stars converted to experience", func(t *testing.T) {
t.Parallel()

p1 := domaintest.NewPlayerBuilder(playerUUID).WithExperience(550).Build(time.Date(2024, time.January, 1, 12, 0, 0, 0, time.UTC))
p2 := domaintest.NewPlayerBuilder(playerUUID).WithExperience(3600).Build(time.Date(2024, time.January, 5, 15, 30, 0, 0, time.UTC))
p3 := domaintest.NewPlayerBuilder(playerUUID).WithExperience(487_550).Build(time.Date(2024, time.March, 5, 15, 30, 0, 0, time.UTC))
builder := domaintest.NewPlayerBuilder(playerUUID)
p1 := builder.WithExperience(550).Build(time.Date(2024, time.January, 1, 12, 0, 0, 0, time.UTC))
p2 := builder.WithExperience(3600).Build(time.Date(2024, time.January, 5, 15, 30, 0, 0, time.UTC))
p3 := builder.WithExperience(487_550).Build(time.Date(2024, time.March, 5, 15, 30, 0, 0, time.UTC))

starMilestones := []int64{1, 3, 100}
expMilestones := []int64{domain.StarsToExperience(1), domain.StarsToExperience(3), domain.StarsToExperience(100)}
Expand Down Expand Up @@ -98,8 +99,9 @@ func TestFindMilestoneAchievements(t *testing.T) {

milestones := []int64{1000, 2000, 3000}

p1 := domaintest.NewPlayerBuilder(playerUUID).WithExperience(1050).Build(time.Date(2024, time.March, 01, 10, 0, 0, 0, time.UTC))
p2 := domaintest.NewPlayerBuilder(playerUUID).WithExperience(3200).Build(time.Date(2024, time.March, 10, 16, 45, 0, 0, time.UTC))
builder := domaintest.NewPlayerBuilder(playerUUID)
p1 := builder.WithExperience(1050).Build(time.Date(2024, time.March, 01, 10, 0, 0, 0, time.UTC))
p2 := builder.WithExperience(3200).Build(time.Date(2024, time.March, 10, 16, 45, 0, 0, time.UTC))

mockRepo := &mockMilestoneRepository{
t: t,
Expand Down
12 changes: 7 additions & 5 deletions internal/app/playerpits_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ func TestBuildGetPlayerPITs(t *testing.T) {
t.Parallel()

uuid := domaintest.NewUUID(t)
builder := domaintest.NewPlayerBuilder(uuid).FromDB()

timeCases := []struct {
name string
Expand Down Expand Up @@ -103,9 +104,9 @@ func TestBuildGetPlayerPITs(t *testing.T) {
{
name: "data",
playerPITs: []domain.PlayerPIT{
domaintest.NewPlayerBuilder(uuid).FromDB().WithExperience(500).Build(now),
domaintest.NewPlayerBuilder(uuid).FromDB().WithExperience(501).Build(now.Add(1 * time.Minute)),
domaintest.NewPlayerBuilder(uuid).FromDB().WithExperience(502).Build(now.Add(2 * time.Minute)),
builder.WithExperience(500).Build(now),
builder.WithExperience(501).Build(now.Add(1 * time.Minute)),
builder.WithExperience(502).Build(now.Add(2 * time.Minute)),
},
},
}
Expand Down Expand Up @@ -147,13 +148,14 @@ func TestBuildGetPlayerPITs(t *testing.T) {
t.Parallel()

uuid := domaintest.NewUUID(t)
builder := domaintest.NewPlayerBuilder(uuid).FromDB()

start := time.Date(2024, time.March, 1, 0, 0, 0, 0, time.UTC)
end := time.Date(2024, time.March, 31, 23, 59, 59, 999_999_999, time.UTC)

expectedPlayerPITs := []domain.PlayerPIT{
domaintest.NewPlayerBuilder(uuid).FromDB().WithExperience(500).Build(now),
domaintest.NewPlayerBuilder(uuid).FromDB().WithExperience(501).Build(now),
builder.WithExperience(500).Build(now),
builder.WithExperience(501).Build(now),
}

updatePlayerInIntervalCalled := false
Expand Down
Loading