mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Allow testing for multiple types of history items

Browse Source 
At the moment our query history tests are set up to only check
local queries.

Let's prepare the ground to introduce remote query history items
and variant analysis history items.

This will allow us to expand test coverage for these other types
of items.
This commit is contained in:
Elena Tanasoiu
2022-10-31 14:59:49 +00:00
parent bf1e3c10db
commit 718a6d6948
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
extensions/ql-vscode/src/vscode-tests/no-workspace/query-history.test.ts
View File

@@ -22,6 +22,7 @@ import { EvalLogViewer } from '../../eval-log-viewer';
import { QueryRunner } from '../../queryRunner';
import { QueryResultType } from '../../pure/legacy-messages';
import { VariantAnalysisManager } from '../../remote-queries/variant-analysis-manager';
import { QueryHistoryInfo } from '../../query-history-info';
describe('query-history', () => {
const mockExtensionLocation = path.join(tmpDir.name, 'mock-extension-location');
@@ -122,15 +123,17 @@ describe('query-history', () => {
});
});
let allHistory: LocalQueryInfo[];
let allHistory: QueryHistoryInfo[];
let localQueryHistory: LocalQueryInfo[];
beforeEach(() => {
allHistory = [
localQueryHistory = [
createMockFullQueryInfo('a', createMockQueryWithResults(true)),
createMockFullQueryInfo('b', createMockQueryWithResults(true)),
createMockFullQueryInfo('a', createMockQueryWithResults(false)),
createMockFullQueryInfo('a', createMockQueryWithResults(true)),
];
allHistory = [...localQueryHistory];
});
describe('findOtherQueryToCompare', () => {
@@ -255,7 +258,9 @@ describe('query-history', () => {
// remove an item
await queryHistoryManager.handleRemoveHistoryItem(toDelete, [toDelete]);
expect(toDelete.completedQuery!.dispose).to.have.been.calledOnce;
if (toDelete.t == 'local') {
expect(toDelete.completedQuery!.dispose).to.have.been.calledOnce;
}
expect(queryHistoryManager.treeDataProvider.getCurrent()).to.deep.eq(selected);
expect(queryHistoryManager.treeDataProvider.allHistory).not.to.contain(toDelete);
@@ -275,7 +280,9 @@ describe('query-history', () => {
await queryHistoryManager.treeView.reveal(toDelete, { select: true });
await queryHistoryManager.handleRemoveHistoryItem(toDelete, [toDelete]);
expect(toDelete.completedQuery!.dispose).to.have.been.calledOnce;
if (toDelete.t == 'local') {
expect(toDelete.completedQuery!.dispose).to.have.been.calledOnce;
}
expect(queryHistoryManager.treeDataProvider.getCurrent()).to.eq(newSelected);
expect(queryHistoryManager.treeDataProvider.allHistory).not.to.contain(toDelete);
@@ -306,30 +313,30 @@ describe('query-history', () => {
it('should delete compareWithItem when there are 0 items', async () => {
queryHistoryManager = await createMockQueryHistory([]);
queryHistoryManager.compareWithItem = allHistory[0];
queryHistoryManager.compareWithItem = localQueryHistory[0];
(queryHistoryManager as any).updateCompareWith([]);
expect(queryHistoryManager.compareWithItem).to.be.undefined;
});
it('should delete compareWithItem when there are more than 2 items', async () => {
queryHistoryManager = await createMockQueryHistory(allHistory);
queryHistoryManager.compareWithItem = allHistory[0];
(queryHistoryManager as any).updateCompareWith([allHistory[0], allHistory[1], allHistory[2]]);
queryHistoryManager.compareWithItem = localQueryHistory[0];
(queryHistoryManager as any).updateCompareWith([localQueryHistory[0], localQueryHistory[1], localQueryHistory[2]]);
expect(queryHistoryManager.compareWithItem).to.be.undefined;
});
it('should delete compareWithItem when there are 2 items and disjoint from compareWithItem', async () => {
queryHistoryManager = await createMockQueryHistory([]);
queryHistoryManager.compareWithItem = allHistory[0];
(queryHistoryManager as any).updateCompareWith([allHistory[1], allHistory[2]]);
queryHistoryManager.compareWithItem = localQueryHistory[0];
(queryHistoryManager as any).updateCompareWith([localQueryHistory[1], localQueryHistory[2]]);
expect(queryHistoryManager.compareWithItem).to.be.undefined;
});
it('should do nothing when compareWithItem exists and exactly 2 items', async () => {
queryHistoryManager = await createMockQueryHistory([]);
queryHistoryManager.compareWithItem = allHistory[0];
(queryHistoryManager as any).updateCompareWith([allHistory[0], allHistory[1]]);
expect(queryHistoryManager.compareWithItem).to.be.eq(allHistory[0]);
queryHistoryManager.compareWithItem = localQueryHistory[0];
(queryHistoryManager as any).updateCompareWith([localQueryHistory[0], localQueryHistory[1]]);
expect(queryHistoryManager.compareWithItem).to.be.eq(localQueryHistory[0]);
});
});
@@ -805,7 +812,7 @@ describe('query-history', () => {
};
}
async function createMockQueryHistory(allHistory: LocalQueryInfo[]) {
async function createMockQueryHistory(allHistory: QueryHistoryInfo[]) {
const qhm = new QueryHistoryManager(
{} as QueryRunner,
{} as DatabaseManager,