Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e91476d

Browse files
EmyrkEmyrk
committed
Fix unit tests
1 parent fe13549 commit e91476d

File tree

5 files changed

+11
-41
lines changed

5 files changed

+11
-41
lines changed

‎coderd/database/dbfake/databasefake.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3196,6 +3196,7 @@ func (q *fakeQuerier) InsertWorkspaceBuild(_ context.Context, arg database.Inser
31963196
JobID: arg.JobID,
31973197
ProvisionerState: arg.ProvisionerState,
31983198
Deadline: arg.Deadline,
3199+
MaxDeadline: arg.MaxDeadline,
31993200
Reason: arg.Reason,
32003201
}
32013202
q.workspaceBuilds = append(q.workspaceBuilds, workspaceBuild)

‎coderd/database/dbgen/generator.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ func WorkspaceBuild[B AnyWorkspaceBuild](t testing.TB, db database.Store, orig B
160160
var thin database.WorkspaceBuildThin
161161
switch v := any(orig).(type) {
162162
case database.WorkspaceBuild:
163-
thin = v.ToThin()
163+
thin = v.WorkspaceBuildThin
164164
case database.WorkspaceBuildThin:
165165
thin = v
166166
default:
@@ -178,6 +178,7 @@ func WorkspaceBuild[B AnyWorkspaceBuild](t testing.TB, db database.Store, orig B
178178
JobID: takeFirst(thin.JobID, uuid.New()),
179179
ProvisionerState: takeFirstSlice(thin.ProvisionerState, []byte{}),
180180
Deadline: takeFirst(thin.Deadline, database.Now().Add(time.Hour)),
181+
MaxDeadline: takeFirst(thin.MaxDeadline, database.Now().Add(time.Hour*24*7)),
181182
Reason: takeFirst(thin.Reason, database.BuildReasonInitiator),
182183
})
183184
require.NoError(t, err, "insert workspace build")

‎coderd/database/dbgen/generator_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ func TestGenerator(t *testing.T) {
167167
t.Parallel()
168168
db := dbfake.New()
169169
exp := dbgen.WorkspaceBuild(t, db, database.WorkspaceBuild{})
170-
require.Equal(t, exp, must(db.GetWorkspaceBuildByID(context.Background(), exp.ID)).ToThin())
170+
require.Equal(t, exp, must(db.GetWorkspaceBuildByID(context.Background(), exp.ID)).WorkspaceBuildThin)
171171
})
172172

173173
t.Run("User", func(t *testing.T) {

‎coderd/database/modelmethods.go

Lines changed: 3 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -191,47 +191,15 @@ func (l License) RBACObject() rbac.Object {
191191
return rbac.ResourceLicense.WithIDString(strconv.FormatInt(int64(l.ID), 10))
192192
}
193193

194-
func (b WorkspaceBuild) ToThin() WorkspaceBuildThin {
195-
return WorkspaceBuildThin{
196-
ID: b.ID,
197-
CreatedAt: b.CreatedAt,
198-
UpdatedAt: b.UpdatedAt,
199-
WorkspaceID: b.WorkspaceID,
200-
TemplateVersionID: b.TemplateVersionID,
201-
BuildNumber: b.BuildNumber,
202-
Transition: b.Transition,
203-
InitiatorID: b.InitiatorID,
204-
ProvisionerState: b.ProvisionerState,
205-
JobID: b.JobID,
206-
Deadline: b.Deadline,
207-
Reason: b.Reason,
208-
DailyCost: b.DailyCost,
209-
}
210-
}
211-
212194
func (b WorkspaceBuildThin) WithWorkspace(workspace Workspace) WorkspaceBuild {
213195
return b.Expand(workspace.OrganizationID, workspace.OwnerID)
214196
}
215197

216198
func (b WorkspaceBuildThin) Expand(orgID, ownerID uuid.UUID) WorkspaceBuild {
217199
return WorkspaceBuild{
218-
WorkspaceBuildThin: WorkspaceBuildThin{
219-
ID: b.ID,
220-
CreatedAt: b.CreatedAt,
221-
UpdatedAt: b.UpdatedAt,
222-
WorkspaceID: b.WorkspaceID,
223-
TemplateVersionID: b.TemplateVersionID,
224-
BuildNumber: b.BuildNumber,
225-
Transition: b.Transition,
226-
InitiatorID: b.InitiatorID,
227-
ProvisionerState: b.ProvisionerState,
228-
JobID: b.JobID,
229-
Deadline: b.Deadline,
230-
Reason: b.Reason,
231-
DailyCost: b.DailyCost,
232-
},
233-
OrganizationID: orgID,
234-
WorkspaceOwnerID: ownerID,
200+
WorkspaceBuildThin: b,
201+
OrganizationID: orgID,
202+
WorkspaceOwnerID: ownerID,
235203
}
236204
}
237205

‎coderd/database/modelqueries_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ func TestGetWorkspaceBuild(t *testing.T) {
120120
}
121121
expected := builds[1]
122122
require.Len(t, found, 1, "should only be one build")
123-
require.Equal(t, expected.ID, found[0].ID, "builds should be equal")
123+
require.Equal(t, expected, found[0], "builds should be equal")
124124
})
125125

126126
t.Run("GetWorkspaceBuildByWorkspaceIDAndBuildNumber", func(t *testing.T) {
@@ -157,7 +157,7 @@ func TestGetWorkspaceBuild(t *testing.T) {
157157
t.Fatal(err)
158158
}
159159
require.Len(t, found, 1, "should be only one build")
160-
require.Equal(t, builds[1].ID, found[0].ID, "builds should be equal")
160+
require.Equal(t, builds[1], found[0], "builds should be equal")
161161
})
162162

163163
t.Run("GetLatestWorkspaceBuilds", func(t *testing.T) {
@@ -167,7 +167,7 @@ func TestGetWorkspaceBuild(t *testing.T) {
167167
t.Fatal(err)
168168
}
169169
require.Len(t, found, 1, "should be only 1 build")
170-
require.Equal(t, builds[1].ID, found[0].ID, "builds should be equal")
170+
require.Equal(t, builds[1], found[0].WorkspaceBuildThin, "builds should be equal")
171171
})
172172

173173
t.Run("GetLatestWorkspaceBuildByWorkspaceID", func(t *testing.T) {
@@ -176,7 +176,7 @@ func TestGetWorkspaceBuild(t *testing.T) {
176176
if err != nil {
177177
t.Fatal(err)
178178
}
179-
require.Equal(t, builds[1].ID, found.ID, "builds should be equal")
179+
require.Equal(t, builds[1], found, "builds should be equal")
180180
})
181181
}
182182

0 commit comments

Comments
 (0)