Skip to content

Commit c2dcfe9

Browse files
authored
Update db panel rendering tests to not rely on order of root nodes (#1987)
1 parent 1bd749d commit c2dcfe9

1 file changed

Lines changed: 48 additions & 45 deletions

File tree

extensions/ql-vscode/test/vscode-tests/minimal-workspace/databases/db-panel-rendering.test.ts

Lines changed: 48 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -107,25 +107,24 @@ describe("db panel rendering nodes", () => {
107107
await saveDbConfig(dbConfig);
108108

109109
const dbTreeItems = await dbTreeDataProvider.getChildren();
110-
111110
expect(dbTreeItems).toBeTruthy();
112-
const items = dbTreeItems!;
113-
expect(items.length).toBe(2);
114111

115-
const remoteRootNode = items[0];
116-
expect(remoteRootNode.dbItem).toBeTruthy();
117-
expect(remoteRootNode.collapsibleState).toBe(
112+
const remoteRootNode = dbTreeItems?.find(
113+
(i) => i.dbItem?.kind === DbItemKind.RootRemote,
114+
);
115+
expect(remoteRootNode).toBeTruthy();
116+
expect(remoteRootNode!.collapsibleState).toBe(
118117
TreeItemCollapsibleState.Collapsed,
119118
);
120-
expect(remoteRootNode.children).toBeTruthy();
121-
expect(remoteRootNode.children.length).toBe(5);
119+
expect(remoteRootNode!.children).toBeTruthy();
120+
expect(remoteRootNode!.children.length).toBe(5);
122121

123-
const systemDefinedListItems = remoteRootNode.children.filter(
122+
const systemDefinedListItems = remoteRootNode!.children.filter(
124123
(item) => item.dbItem?.kind === DbItemKind.RemoteSystemDefinedList,
125124
);
126125
expect(systemDefinedListItems.length).toBe(3);
127126

128-
const userDefinedListItems = remoteRootNode.children.filter(
127+
const userDefinedListItems = remoteRootNode!.children.filter(
129128
(item) => item.dbItem?.kind === DbItemKind.VariantAnalysisUserDefinedList,
130129
);
131130
expect(userDefinedListItems.length).toBe(2);
@@ -148,20 +147,21 @@ describe("db panel rendering nodes", () => {
148147
await saveDbConfig(dbConfig);
149148

150149
const dbTreeItems = await dbTreeDataProvider.getChildren();
151-
152150
expect(dbTreeItems).toBeTruthy();
153-
const items = dbTreeItems!;
154-
expect(items.length).toBe(2);
155151

156-
const remoteRootNode = items[0];
157-
expect(remoteRootNode.dbItem).toBeTruthy();
158-
expect(remoteRootNode.collapsibleState).toBe(
152+
const remoteRootNode = dbTreeItems?.find(
153+
(i) => i.dbItem?.kind === DbItemKind.RootRemote,
154+
);
155+
expect(remoteRootNode).toBeTruthy();
156+
157+
expect(remoteRootNode!.dbItem).toBeTruthy();
158+
expect(remoteRootNode!.collapsibleState).toBe(
159159
TreeItemCollapsibleState.Collapsed,
160160
);
161-
expect(remoteRootNode.children).toBeTruthy();
162-
expect(remoteRootNode.children.length).toBe(5);
161+
expect(remoteRootNode!.children).toBeTruthy();
162+
expect(remoteRootNode!.children.length).toBe(5);
163163

164-
const ownerListItems = remoteRootNode.children.filter(
164+
const ownerListItems = remoteRootNode!.children.filter(
165165
(item) => item.dbItem?.kind === DbItemKind.RemoteOwner,
166166
);
167167
expect(ownerListItems.length).toBe(2);
@@ -177,20 +177,21 @@ describe("db panel rendering nodes", () => {
177177
await saveDbConfig(dbConfig);
178178

179179
const dbTreeItems = await dbTreeDataProvider.getChildren();
180-
181180
expect(dbTreeItems).toBeTruthy();
182-
const items = dbTreeItems!;
183-
expect(items.length).toBe(2);
184181

185-
const remoteRootNode = items[0];
186-
expect(remoteRootNode.dbItem).toBeTruthy();
187-
expect(remoteRootNode.collapsibleState).toBe(
182+
const remoteRootNode = dbTreeItems?.find(
183+
(i) => i.dbItem?.kind === DbItemKind.RootRemote,
184+
);
185+
expect(remoteRootNode).toBeTruthy();
186+
187+
expect(remoteRootNode!.dbItem).toBeTruthy();
188+
expect(remoteRootNode!.collapsibleState).toBe(
188189
TreeItemCollapsibleState.Collapsed,
189190
);
190-
expect(remoteRootNode.children).toBeTruthy();
191-
expect(remoteRootNode.children.length).toBe(5);
191+
expect(remoteRootNode!.children).toBeTruthy();
192+
expect(remoteRootNode!.children.length).toBe(5);
192193

193-
const repoItems = remoteRootNode.children.filter(
194+
const repoItems = remoteRootNode!.children.filter(
194195
(item) => item.dbItem?.kind === DbItemKind.RemoteRepo,
195196
);
196197
expect(repoItems.length).toBe(2);
@@ -235,20 +236,21 @@ describe("db panel rendering nodes", () => {
235236
await saveDbConfig(dbConfig);
236237

237238
const dbTreeItems = await dbTreeDataProvider.getChildren();
238-
239239
expect(dbTreeItems).toBeTruthy();
240-
const items = dbTreeItems!;
241-
expect(items.length).toBe(2);
242240

243-
const localRootNode = items[1];
244-
expect(localRootNode.dbItem).toBeTruthy();
245-
expect(localRootNode.collapsibleState).toBe(
241+
const localRootNode = dbTreeItems?.find(
242+
(i) => i.dbItem?.kind === DbItemKind.RootLocal,
243+
);
244+
expect(localRootNode).toBeTruthy();
245+
246+
expect(localRootNode!.dbItem).toBeTruthy();
247+
expect(localRootNode!.collapsibleState).toBe(
246248
TreeItemCollapsibleState.Collapsed,
247249
);
248-
expect(localRootNode.children).toBeTruthy();
249-
expect(localRootNode.children.length).toBe(2);
250+
expect(localRootNode!.children).toBeTruthy();
251+
expect(localRootNode!.children.length).toBe(2);
250252

251-
const localListItems = localRootNode.children.filter(
253+
const localListItems = localRootNode!.children.filter(
252254
(item) => item.dbItem?.kind === DbItemKind.LocalList,
253255
);
254256
expect(localListItems.length).toBe(2);
@@ -305,18 +307,19 @@ describe("db panel rendering nodes", () => {
305307
const dbTreeItems = await dbTreeDataProvider.getChildren();
306308

307309
expect(dbTreeItems).toBeTruthy();
308-
const items = dbTreeItems!;
309-
expect(items.length).toBe(2);
310+
const localRootNode = dbTreeItems?.find(
311+
(i) => i.dbItem?.kind === DbItemKind.RootLocal,
312+
);
313+
expect(localRootNode).toBeTruthy();
310314

311-
const localRootNode = items[1];
312-
expect(localRootNode.dbItem).toBeTruthy();
313-
expect(localRootNode.collapsibleState).toBe(
315+
expect(localRootNode!.dbItem).toBeTruthy();
316+
expect(localRootNode!.collapsibleState).toBe(
314317
TreeItemCollapsibleState.Collapsed,
315318
);
316-
expect(localRootNode.children).toBeTruthy();
317-
expect(localRootNode.children.length).toBe(2);
319+
expect(localRootNode!.children).toBeTruthy();
320+
expect(localRootNode!.children.length).toBe(2);
318321

319-
const localDatabaseItems = localRootNode.children.filter(
322+
const localDatabaseItems = localRootNode!.children.filter(
320323
(item) => item.dbItem?.kind === DbItemKind.LocalDatabase,
321324
);
322325
expect(localDatabaseItems.length).toBe(2);

0 commit comments

Comments
 (0)