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

Change createMockVariantAnalysis calls to use named params

Browse Source
This commit is contained in:
Elena Tanasoiu
2022-11-03 13:46:45 +00:00
parent 304c9fb12d
commit dd55b7e03e
11 changed files with 273 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysis.stories.tsx
View File

@@ -24,7 +24,7 @@ const Template: ComponentStory<typeof VariantAnalysisComponent> = (args) => (
);
const variantAnalysis: VariantAnalysisDomainModel = {
...createMockVariantAnalysis(VariantAnalysisStatus.InProgress),
...createMockVariantAnalysis({ status: VariantAnalysisStatus.InProgress }),
controllerRepo: {
id: 1,
fullName: 'octodemo/variant-analysis-controller',

107
extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisAnalyzedRepos.stories.tsx
View File

@@ -36,64 +36,67 @@ const interpretedResultsForRepo = (nwo: string): AnalysisAlert[] | undefined =>
export const Example = Template.bind({});
Example.args = {
variantAnalysis: createMockVariantAnalysis(VariantAnalysisStatus.InProgress, [
{
repository: {
...createMockRepositoryWithMetadata(),
id: 63537249,
fullName: 'facebook/create-react-app',
private: false,
variantAnalysis: createMockVariantAnalysis({
status: VariantAnalysisStatus.InProgress,
scannedRepos: [
{
repository: {
...createMockRepositoryWithMetadata(),
id: 63537249,
fullName: 'facebook/create-react-app',
private: false,
},
analysisStatus: VariantAnalysisRepoStatus.Succeeded, resultCount: 198,
},
analysisStatus: VariantAnalysisRepoStatus.Succeeded, resultCount: 198,
},
{
repository: {
...createMockRepositoryWithMetadata(),
id: 167174,
fullName: 'jquery/jquery',
private: false,
{
repository: {
...createMockRepositoryWithMetadata(),
id: 167174,
fullName: 'jquery/jquery',
private: false,
},
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
resultCount: 67,
},
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
resultCount: 67,
},
{
repository: {
...createMockRepositoryWithMetadata(),
id: 237159,
fullName: 'expressjs/express',
private: false,
{
repository: {
...createMockRepositoryWithMetadata(),
id: 237159,
fullName: 'expressjs/express',
private: false,
},
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
resultCount: 26,
},
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
resultCount: 26,
},
{
repository: {
...createMockRepositoryWithMetadata(),
id: 15062869,
fullName: 'facebook/jest',
private: false,
{
repository: {
...createMockRepositoryWithMetadata(),
id: 15062869,
fullName: 'facebook/jest',
private: false,
},
analysisStatus: VariantAnalysisRepoStatus.Failed,
},
analysisStatus: VariantAnalysisRepoStatus.Failed,
},
{
repository: {
...createMockRepositoryWithMetadata(),
id: 24195339,
fullName: 'angular/angular',
private: false,
{
repository: {
...createMockRepositoryWithMetadata(),
id: 24195339,
fullName: 'angular/angular',
private: false,
},
analysisStatus: VariantAnalysisRepoStatus.InProgress,
},
analysisStatus: VariantAnalysisRepoStatus.InProgress,
},
{
repository: {
...createMockRepositoryWithMetadata(),
id: 24560307,
fullName: 'babel/babel',
private: false,
{
repository: {
...createMockRepositoryWithMetadata(),
id: 24560307,
fullName: 'babel/babel',
private: false,
},
analysisStatus: VariantAnalysisRepoStatus.Pending,
},
analysisStatus: VariantAnalysisRepoStatus.Pending,
},
]),
]
}),
repositoryResults: [
{
variantAnalysisId: 1,

68
extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisHeader.stories.tsx
View File

@@ -64,40 +64,46 @@ const Template: ComponentStory<typeof VariantAnalysisHeader> = (args) => (
export const InProgress = Template.bind({});
InProgress.args = {
variantAnalysis: createMockVariantAnalysis(VariantAnalysisStatus.InProgress, [
{
...createMockScannedRepo(),
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
resultCount: 99_999,
},
{
...createMockScannedRepo(),
analysisStatus: VariantAnalysisRepoStatus.Failed,
},
{
...createMockScannedRepo(),
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
resultCount: 0,
},
createMockScannedRepo(),
createMockScannedRepo(),
createMockScannedRepo(),
createMockScannedRepo(),
createMockScannedRepo(),
createMockScannedRepo(),
createMockScannedRepo(),
]),
variantAnalysis: createMockVariantAnalysis({
status: VariantAnalysisStatus.InProgress,
scannedRepos: [
{
...createMockScannedRepo(),
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
resultCount: 99_999,
},
{
...createMockScannedRepo(),
analysisStatus: VariantAnalysisRepoStatus.Failed,
},
{
...createMockScannedRepo(),
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
resultCount: 0,
},
createMockScannedRepo(),
createMockScannedRepo(),
createMockScannedRepo(),
createMockScannedRepo(),
createMockScannedRepo(),
createMockScannedRepo(),
createMockScannedRepo(),
]
}),
};
export const Succeeded = Template.bind({});
Succeeded.args = {
...InProgress.args,
variantAnalysis: {
...createMockVariantAnalysis(VariantAnalysisStatus.Succeeded, Array.from({ length: 1000 }, (_) => ({
...createMockScannedRepo(),
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
resultCount: 100,
}))),
...createMockVariantAnalysis({
status: VariantAnalysisStatus.Succeeded,
scannedRepos: Array.from({ length: 1000 }, (_) => ({
...createMockScannedRepo(),
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
resultCount: 100,
}))
}),
createdAt: new Date(1661262726000).toISOString(),
completedAt: new Date(1661263446000).toISOString(),
},
@@ -107,7 +113,11 @@ export const Failed = Template.bind({});
Failed.args = {
...InProgress.args,
variantAnalysis: {
...createMockVariantAnalysis(VariantAnalysisStatus.Failed, [], {}),
...createMockVariantAnalysis({
status: VariantAnalysisStatus.Failed,
scannedRepos: [],
skippedRepos: {}
}),
createdAt: new Date(1661263436000).toISOString(),
completedAt: new Date(1661263446000).toISOString(),
},

219
extensions/ql-vscode/src/stories/variant-analysis/VariantAnalysisOutcomePanels.stories.tsx
View File

@@ -27,111 +27,118 @@ const Template: ComponentStory<typeof VariantAnalysisOutcomePanels> = (args) =>
export const WithoutSkippedRepos = Template.bind({});
WithoutSkippedRepos.args = {
variantAnalysis: createMockVariantAnalysis(VariantAnalysisStatus.InProgress, [
{
...createMockScannedRepo('hello-world-1'),
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
resultCount: 99_999,
},
{
...createMockScannedRepo('hello-world-2'),
analysisStatus: VariantAnalysisRepoStatus.Failed,
},
{
...createMockScannedRepo('hello-world-3'),
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
resultCount: 0,
},
{
...createMockScannedRepo('hello-world-4'),
resultCount: undefined,
},
{
...createMockScannedRepo('hello-world-5'),
resultCount: undefined,
},
{
...createMockScannedRepo('hello-world-6'),
resultCount: undefined,
},
{
...createMockScannedRepo('hello-world-7'),
resultCount: undefined,
},
{
...createMockScannedRepo('hello-world-8'),
resultCount: undefined,
},
{
...createMockScannedRepo('hello-world-9'),
resultCount: undefined,
},
{
...createMockScannedRepo('hello-world-10'),
resultCount: undefined,
},
]),
variantAnalysis: createMockVariantAnalysis({
status: VariantAnalysisStatus.InProgress,
scannedRepos: [
{
...createMockScannedRepo('hello-world-1'),
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
resultCount: 99_999,
},
{
...createMockScannedRepo('hello-world-2'),
analysisStatus: VariantAnalysisRepoStatus.Failed,
},
{
...createMockScannedRepo('hello-world-3'),
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
resultCount: 0,
},
{
...createMockScannedRepo('hello-world-4'),
resultCount: undefined,
},
{
...createMockScannedRepo('hello-world-5'),
resultCount: undefined,
},
{
...createMockScannedRepo('hello-world-6'),
resultCount: undefined,
},
{
...createMockScannedRepo('hello-world-7'),
resultCount: undefined,
},
{
...createMockScannedRepo('hello-world-8'),
resultCount: undefined,
},
{
...createMockScannedRepo('hello-world-9'),
resultCount: undefined,
},
{
...createMockScannedRepo('hello-world-10'),
resultCount: undefined,
},
]
}),
};
export const WithSkippedRepos = Template.bind({});
WithSkippedRepos.args = {
...WithoutSkippedRepos.args,
variantAnalysis: createMockVariantAnalysis(VariantAnalysisStatus.InProgress, WithoutSkippedRepos.args.variantAnalysis?.scannedRepos, {
notFoundRepos: {
repositoryCount: 2,
repositories: [
{
fullName: 'octodemo/hello-globe'
},
{
fullName: 'octodemo/hello-planet'
}
]
},
noCodeqlDbRepos: {
repositoryCount: 4,
repositories: [
{
...createMockRepositoryWithMetadata(),
id: 100,
fullName: 'octodemo/no-db-1'
},
{
...createMockRepositoryWithMetadata(),
id: 101,
fullName: 'octodemo/no-db-2'
},
{
...createMockRepositoryWithMetadata(),
id: 102,
fullName: 'octodemo/no-db-3'
},
{
...createMockRepositoryWithMetadata(),
id: 103,
fullName: 'octodemo/no-db-4'
}
]
},
overLimitRepos: {
repositoryCount: 1,
repositories: [
{
...createMockRepositoryWithMetadata(),
id: 201,
fullName: 'octodemo/over-limit-1'
}
]
},
accessMismatchRepos: {
repositoryCount: 1,
repositories: [
{
...createMockRepositoryWithMetadata(),
id: 205,
fullName: 'octodemo/private'
}
]
variantAnalysis: createMockVariantAnalysis({
status: VariantAnalysisStatus.InProgress,
scannedRepos: WithoutSkippedRepos.args.variantAnalysis?.scannedRepos,
skippedRepos: {
notFoundRepos: {
repositoryCount: 2,
repositories: [
{
fullName: 'octodemo/hello-globe'
},
{
fullName: 'octodemo/hello-planet'
}
]
},
noCodeqlDbRepos: {
repositoryCount: 4,
repositories: [
{
...createMockRepositoryWithMetadata(),
id: 100,
fullName: 'octodemo/no-db-1'
},
{
...createMockRepositoryWithMetadata(),
id: 101,
fullName: 'octodemo/no-db-2'
},
{
...createMockRepositoryWithMetadata(),
id: 102,
fullName: 'octodemo/no-db-3'
},
{
...createMockRepositoryWithMetadata(),
id: 103,
fullName: 'octodemo/no-db-4'
}
]
},
overLimitRepos: {
repositoryCount: 1,
repositories: [
{
...createMockRepositoryWithMetadata(),
id: 201,
fullName: 'octodemo/over-limit-1'
}
]
},
accessMismatchRepos: {
repositoryCount: 1,
repositories: [
{
...createMockRepositoryWithMetadata(),
id: 205,
fullName: 'octodemo/private'
}
]
}
}
}),
};
@@ -139,9 +146,13 @@ WithSkippedRepos.args = {
export const WithOnlyWarningsSkippedRepos = Template.bind({});
WithOnlyWarningsSkippedRepos.args = {
...WithoutSkippedRepos.args,
variantAnalysis: createMockVariantAnalysis(VariantAnalysisStatus.InProgress, WithoutSkippedRepos.args.variantAnalysis?.scannedRepos, {
...WithSkippedRepos.args.variantAnalysis?.skippedRepos,
notFoundRepos: undefined,
noCodeqlDbRepos: undefined,
variantAnalysis: createMockVariantAnalysis({
status: VariantAnalysisStatus.InProgress,
scannedRepos: WithoutSkippedRepos.args.variantAnalysis?.scannedRepos,
skippedRepos: {
...WithSkippedRepos.args.variantAnalysis?.skippedRepos,
notFoundRepos: undefined,
noCodeqlDbRepos: undefined,
}
}),
};

79
extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisAnalyzedRepos.spec.tsx
View File

@@ -11,48 +11,51 @@ import { createMockRepositoryWithMetadata } from '../../../vscode-tests/factorie
import { createMockScannedRepo } from '../../../vscode-tests/factories/remote-queries/shared/scanned-repositories';
describe(VariantAnalysisAnalyzedRepos.name, () => {
const defaultVariantAnalysis = createMockVariantAnalysis(VariantAnalysisStatus.InProgress, [
{
...createMockScannedRepo(),
repository: {
...createMockRepositoryWithMetadata(),
id: 1,
fullName: 'octodemo/hello-world-1',
private: false,
const defaultVariantAnalysis = createMockVariantAnalysis({
status: VariantAnalysisStatus.InProgress,
scannedRepos: [
{
...createMockScannedRepo(),
repository: {
...createMockRepositoryWithMetadata(),
id: 1,
fullName: 'octodemo/hello-world-1',
private: false,
},
analysisStatus: VariantAnalysisRepoStatus.Pending,
},
analysisStatus: VariantAnalysisRepoStatus.Pending,
},
{
...createMockScannedRepo(),
repository: {
...createMockRepositoryWithMetadata(),
id: 2,
fullName: 'octodemo/hello-world-2',
private: false,
{
...createMockScannedRepo(),
repository: {
...createMockRepositoryWithMetadata(),
id: 2,
fullName: 'octodemo/hello-world-2',
private: false,
},
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
},
analysisStatus: VariantAnalysisRepoStatus.Succeeded,
},
{
...createMockScannedRepo(),
repository: {
...createMockRepositoryWithMetadata(),
id: 3,
fullName: 'octodemo/hello-world-3',
private: true,
{
...createMockScannedRepo(),
repository: {
...createMockRepositoryWithMetadata(),
id: 3,
fullName: 'octodemo/hello-world-3',
private: true,
},
analysisStatus: VariantAnalysisRepoStatus.Failed,
},
analysisStatus: VariantAnalysisRepoStatus.Failed,
},
{
...createMockScannedRepo(),
repository: {
...createMockRepositoryWithMetadata(),
id: 4,
fullName: 'octodemo/hello-world-4',
private: false,
{
...createMockScannedRepo(),
repository: {
...createMockRepositoryWithMetadata(),
id: 4,
fullName: 'octodemo/hello-world-4',
private: false,
},
analysisStatus: VariantAnalysisRepoStatus.InProgress,
},
analysisStatus: VariantAnalysisRepoStatus.InProgress,
},
]);
]
});
const render = (props: Partial<VariantAnalysisAnalyzedReposProps> = {}) => {
return reactRender(

2
extensions/ql-vscode/src/view/variant-analysis/__tests__/VariantAnalysisOutcomePanels.spec.tsx
View File

@@ -12,7 +12,7 @@ import { createMockScannedRepo } from '../../../vscode-tests/factories/remote-qu
describe(VariantAnalysisOutcomePanels.name, () => {
const defaultVariantAnalysis = {
...createMockVariantAnalysis(VariantAnalysisStatus.InProgress),
...createMockVariantAnalysis({ status: VariantAnalysisStatus.InProgress }),
controllerRepo: {
id: 1,
fullName: 'octodemo/variant-analysis-controller',

4
extensions/ql-vscode/src/vscode-tests/cli-integration/remote-queries/variant-analysis-manager.test.ts
View File

@@ -178,7 +178,7 @@ describe('Variant Analysis Manager', async function() {
let dummyVariantAnalysis: VariantAnalysis;
beforeEach(async () => {
dummyVariantAnalysis = createMockVariantAnalysis();
dummyVariantAnalysis = createMockVariantAnalysis({});
removeAnalysisResultsStub = sandbox.stub(variantAnalysisResultsManager, 'removeAnalysisResults');
removeStorageStub = sandbox.stub(fs, 'remove');
});
@@ -203,7 +203,7 @@ describe('Variant Analysis Manager', async function() {
let monitorVariantAnalysisCommandSpy: sinon.SinonSpy;
beforeEach(() => {
variantAnalysis = createMockVariantAnalysis();
variantAnalysis = createMockVariantAnalysis({});
variantAnalysisRemovedSpy = sinon.spy();
variantAnalysisManager.onVariantAnalysisRemoved(variantAnalysisRemovedSpy);

2
extensions/ql-vscode/src/vscode-tests/cli-integration/remote-queries/variant-analysis-monitor.test.ts
View File

@@ -37,7 +37,7 @@ describe('Variant Analysis Monitor', async function() {
cancellationTokenSource = new CancellationTokenSource();
variantAnalysis = createMockVariantAnalysis();
variantAnalysis = createMockVariantAnalysis({});
try {
extension = await extensions.getExtension<CodeQLExtensionInterface | Record<string, never>>('GitHub.vscode-codeql')!.activate();

5
extensions/ql-vscode/src/vscode-tests/factories/remote-queries/variant-analysis-history-item.ts
View File

@@ -16,7 +16,10 @@ export function createMockVariantAnalysisHistoryItem(
resultCount,
status: historyItemStatus,
completed: false,
variantAnalysis: createMockVariantAnalysis(variantAnalysisStatus),
variantAnalysis: createMockVariantAnalysis({
status: variantAnalysisStatus,
executionStartTime: executionStartTime
}),
userSpecifiedLabel,
});
}

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

@@ -24,15 +24,15 @@ describe('Query history info', () => {
t: 'variant-analysis',
status: QueryStatus.InProgress,
completed: false,
variantAnalysis: createMockVariantAnalysis(
VariantAnalysisStatus.InProgress,
createMockScannedRepos([
variantAnalysis: createMockVariantAnalysis({
status: VariantAnalysisStatus.InProgress,
scannedRepos: createMockScannedRepos([
VariantAnalysisRepoStatus.Succeeded,
VariantAnalysisRepoStatus.Pending,
VariantAnalysisRepoStatus.InProgress,
VariantAnalysisRepoStatus.Canceled,
])
),
}),
};
describe('getRawQueryName', () => {
@@ -117,10 +117,10 @@ describe('Query history info', () => {
t: 'variant-analysis',
status: QueryStatus.InProgress,
completed: false,
variantAnalysis: createMockVariantAnalysis(
VariantAnalysisStatus.InProgress,
createMockScannedRepos([])
),
variantAnalysis: createMockVariantAnalysis({
status: VariantAnalysisStatus.InProgress,
scannedRepos: createMockScannedRepos([])
}),
};
const repoLabel0 = buildRepoLabel(variantAnalysisHistoryItem0);
@@ -131,12 +131,10 @@ describe('Query history info', () => {
t: 'variant-analysis',
status: QueryStatus.InProgress,
completed: false,
variantAnalysis: createMockVariantAnalysis(
VariantAnalysisStatus.InProgress,
createMockScannedRepos([
VariantAnalysisRepoStatus.Pending,
])
),
variantAnalysis: createMockVariantAnalysis({
status: VariantAnalysisStatus.InProgress,
scannedRepos: createMockScannedRepos([VariantAnalysisRepoStatus.Pending])
}),
};
const repoLabel1 = buildRepoLabel(variantAnalysisHistoryItem1);

4
extensions/ql-vscode/test/pure-tests/variant-analysis.test.ts
View File

@@ -18,7 +18,7 @@ describe('isVariantAnalysisComplete', async () => {
const uncallableArtifactDownloadChecker = () => { throw new Error('Should not be called'); };
beforeEach(() => {
variantAnalysis = createMockVariantAnalysis();
variantAnalysis = createMockVariantAnalysis({});
});
describe('when variant analysis status is InProgress', async () => {
@@ -104,7 +104,7 @@ describe('isVariantAnalysisComplete', async () => {
describe('getActionsWorkflowRunUrl', () => {
it('should get the run url', () => {
const variantAnalysis = createMockVariantAnalysis();
const variantAnalysis = createMockVariantAnalysis({});
const actionsWorkflowRunUrl = getActionsWorkflowRunUrl(variantAnalysis);