Skip to content

Commit 4f988de

Browse files
committed
Update tests for isNewerDatabaseAvailable
1 parent e66d76a commit 4f988de

File tree

1 file changed

+51
-0
lines changed

1 file changed

+51
-0
lines changed

extensions/ql-vscode/test/vscode-tests/no-workspace/databases/github-database-updates.test.ts

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,32 @@ describe("isNewerDatabaseAvailable", () => {
3232
mockedObject<CodeqlDatabase>({
3333
language: "java",
3434
commit_oid: "58e7476df3e464a0c9742b14cd4ca274b0993ebb",
35+
created_at: "2023-11-22T09:20:59.185Z",
3536
}),
3637
mockedObject<CodeqlDatabase>({
3738
language: "swift",
3839
commit_oid: "b81c25c0b73dd3c242068e8ab38bef25563a7c2d",
40+
created_at: "2023-11-22T09:21:53.257Z",
3941
}),
4042
mockedObject<CodeqlDatabase>({
4143
language: "javascript",
4244
commit_oid: "6e93915ff37ff8bcfc552d48f118895d60d0e7cd",
45+
created_at: "2023-11-20T09:20:52.185Z",
4346
}),
4447
mockedObject<CodeqlDatabase>({
4548
language: "ql",
4649
commit_oid: "9448fbfb88cdefe4298cc2e234a5a3c98958cae8",
50+
created_at: "2023-11-21T09:20:59.185Z",
51+
}),
52+
mockedObject<CodeqlDatabase>({
53+
language: "ruby",
54+
commit_oid: "30220ebe8a36a22c4b6200fd207476d03717be4c",
55+
created_at: "2023-11-23T09:20:59.185Z",
56+
}),
57+
mockedObject<CodeqlDatabase>({
58+
language: "csharp",
59+
commit_oid: "1dad8b67751834ea61344effacf3ac8a88929289",
60+
created_at: "2023-11-20T09:20:59.185Z",
4761
}),
4862
];
4963

@@ -56,6 +70,7 @@ describe("isNewerDatabaseAvailable", () => {
5670
type: "github",
5771
repository: "github/codeql",
5872
commitOid: "4487d1da9665231d1a076c60a78523f6275ad70f",
73+
databaseCreatedAt: "2023-10-22T09:20:59.185Z",
5974
},
6075
}),
6176
mockDatabaseItem({
@@ -65,6 +80,7 @@ describe("isNewerDatabaseAvailable", () => {
6580
type: "github",
6681
repository: "github/codeql",
6782
commitOid: "2b020927d3c6eb407223a1baa3d6ce3597a3f88d",
83+
databaseCreatedAt: "2023-10-22T09:20:59.185Z",
6884
},
6985
}),
7086
mockDatabaseItem({
@@ -74,6 +90,7 @@ describe("isNewerDatabaseAvailable", () => {
7490
type: "github",
7591
repository: "github/codeql",
7692
commitOid: "17663af4e84a3a010fcb3f09cc06049797dfb22a",
93+
databaseCreatedAt: "2023-10-22T09:20:59.185Z",
7794
},
7895
}),
7996
mockDatabaseItem({
@@ -82,6 +99,7 @@ describe("isNewerDatabaseAvailable", () => {
8299
origin: {
83100
type: "github",
84101
repository: "github/codeql",
102+
databaseCreatedAt: "2023-10-22T09:19:59.185Z",
85103
},
86104
}),
87105
mockDatabaseItem({
@@ -90,6 +108,7 @@ describe("isNewerDatabaseAvailable", () => {
90108
origin: {
91109
type: "github",
92110
repository: "github/codeql",
111+
databaseCreatedAt: "2023-10-20T09:20:59.185Z",
93112
},
94113
}),
95114
mockDatabaseItem({
@@ -98,6 +117,27 @@ describe("isNewerDatabaseAvailable", () => {
98117
type: "github",
99118
repository: "github/vscode-codeql",
100119
commitOid: "fb360f9c09ac8c5edb2f18be5de4e80ea4c430d0",
120+
databaseCreatedAt: "2023-10-22T09:20:59.185Z",
121+
},
122+
}),
123+
mockDatabaseItem({
124+
dateAdded: faker.date.past().getTime(),
125+
language: "ruby",
126+
origin: {
127+
type: "github",
128+
repository: "github/codeql",
129+
commitOid: "30220ebe8a36a22c4b6200fd207476d03717be4c",
130+
databaseCreatedAt: "2023-10-22T09:20:59.185Z",
131+
},
132+
}),
133+
mockDatabaseItem({
134+
dateAdded: faker.date.past().getTime(),
135+
language: "csharp",
136+
origin: {
137+
type: "github",
138+
repository: "github/codeql",
139+
commitOid: "1dad8b67751834ea61344effacf3ac8a88929289",
140+
databaseCreatedAt: "2023-11-23T09:20:59.185Z",
101141
},
102142
}),
103143
],
@@ -110,18 +150,26 @@ describe("isNewerDatabaseAvailable", () => {
110150
).toEqual({
111151
type: "updateAvailable",
112152
databaseUpdates: [
153+
// java: different commit_oid, last dateAdded
113154
{
114155
database: databases[0],
115156
databaseItem: databaseManager.databaseItems[2],
116157
},
117158
{
159+
// ql: commit_oid on remote, not on local
118160
database: databases[3],
119161
databaseItem: databaseManager.databaseItems[4],
120162
},
121163
{
164+
// swift: different commit_oid
122165
database: databases[1],
123166
databaseItem: databaseManager.databaseItems[1],
124167
},
168+
{
169+
// ruby: same commit_oid, newer created_at
170+
database: databases[4],
171+
databaseItem: databaseManager.databaseItems[6],
172+
},
125173
],
126174
});
127175
});
@@ -133,6 +181,7 @@ describe("isNewerDatabaseAvailable", () => {
133181
mockedObject<CodeqlDatabase>({
134182
language: "java",
135183
commit_oid: "17663af4e84a3a010fcb3f09cc06049797dfb22a",
184+
created_at: "2023-11-22T09:21:53.257Z",
136185
}),
137186
];
138187

@@ -145,6 +194,7 @@ describe("isNewerDatabaseAvailable", () => {
145194
type: "github",
146195
repository: "github/codeql",
147196
commitOid: "17663af4e84a3a010fcb3f09cc06049797dfb22a",
197+
databaseCreatedAt: "2023-11-22T09:21:53.257Z",
148198
},
149199
}),
150200
mockDatabaseItem({
@@ -154,6 +204,7 @@ describe("isNewerDatabaseAvailable", () => {
154204
type: "github",
155205
repository: "github/codeql",
156206
commitOid: "4487d1da9665231d1a076c60a78523f6275ad70f",
207+
databaseCreatedAt: "2023-10-22T09:20:59.185Z",
157208
},
158209
}),
159210
],

0 commit comments

Comments
 (0)