1- import { extensions } from "vscode" ;
2- import { CodeQLExtensionInterface } from "../../../../src/extension" ;
31import { extLogger } from "../../../../src/common" ;
42import * as fs from "fs-extra" ;
53import { join , resolve } from "path" ;
64import { Readable } from "stream" ;
7- import { Response , RequestInfo , RequestInit } from "node-fetch" ;
85import * as fetchModule from "node-fetch" ;
6+ import { RequestInfo , RequestInit , Response } from "node-fetch" ;
97
108import { VariantAnalysisResultsManager } from "../../../../src/variant-analysis/variant-analysis-results-manager" ;
119import { CodeQLCliServer } from "../../../../src/cli" ;
@@ -16,38 +14,32 @@ import {
1614 VariantAnalysisRepositoryTask ,
1715 VariantAnalysisScannedRepositoryResult ,
1816} from "../../../../src/variant-analysis/shared/variant-analysis" ;
17+ import { mockedObject } from "../../utils/mocking.helpers" ;
1918
2019jest . setTimeout ( 10_000 ) ;
2120
2221describe ( VariantAnalysisResultsManager . name , ( ) => {
23- let cli : CodeQLCliServer ;
2422 let variantAnalysisId : number ;
23+ let variantAnalysisResultsManager : VariantAnalysisResultsManager ;
2524
2625 beforeEach ( async ( ) => {
2726 variantAnalysisId = faker . datatype . number ( ) ;
2827
29- const extension = await extensions
30- . getExtension < CodeQLExtensionInterface | Record < string , never > > (
31- "GitHub.vscode-codeql" ,
32- ) !
33- . activate ( ) ;
34- cli = extension . cliServer ;
28+ const cli = mockedObject < CodeQLCliServer > ( { } ) ;
29+ variantAnalysisResultsManager = new VariantAnalysisResultsManager (
30+ cli ,
31+ extLogger ,
32+ ) ;
3533 } ) ;
3634
3735 describe ( "download" , ( ) => {
3836 let dummyRepoTask : VariantAnalysisRepositoryTask ;
3937 let variantAnalysisStoragePath : string ;
4038 let repoTaskStorageDirectory : string ;
41- let variantAnalysisResultsManager : VariantAnalysisResultsManager ;
4239
4340 beforeEach ( async ( ) => {
4441 jest . spyOn ( extLogger , "log" ) . mockResolvedValue ( undefined ) ;
4542
46- variantAnalysisResultsManager = new VariantAnalysisResultsManager (
47- cli ,
48- extLogger ,
49- ) ;
50-
5143 dummyRepoTask = createMockVariantAnalysisRepositoryTask ( ) ;
5244
5345 variantAnalysisStoragePath = join (
@@ -103,7 +95,7 @@ describe(VariantAnalysisResultsManager.name, () => {
10395 beforeEach ( async ( ) => {
10496 const sourceFilePath = join (
10597 __dirname ,
106- "../data/variant-analysis-results.zip" ,
98+ "../../cli-integration/ data/variant-analysis-results.zip" ,
10799 ) ;
108100 fileContents = fs . readFileSync ( sourceFilePath ) ;
109101
@@ -222,17 +214,12 @@ describe(VariantAnalysisResultsManager.name, () => {
222214 let dummyRepoTask : VariantAnalysisRepositoryTask ;
223215 let variantAnalysisStoragePath : string ;
224216 let repoTaskStorageDirectory : string ;
225- let variantAnalysisResultsManager : VariantAnalysisResultsManager ;
226217 let onResultLoadedSpy : jest . Mock <
227218 void ,
228219 [ VariantAnalysisScannedRepositoryResult ]
229220 > ;
230221
231222 beforeEach ( ( ) => {
232- variantAnalysisResultsManager = new VariantAnalysisResultsManager (
233- cli ,
234- extLogger ,
235- ) ;
236223 onResultLoadedSpy = jest . fn ( ) ;
237224 variantAnalysisResultsManager . onResultLoaded ( onResultLoadedSpy ) ;
238225
0 commit comments