fix tests again

Author: Hweinstock

packages/core/src/test/amazonqFeatureDev/utils.ts

@@ -5,7 +5,6 @@
 
 import * as vscode from 'vscode'
 import * as sinon from 'sinon'
-import * as model from '../../codewhisperer/models/model'
 import { MessagePublisher } from '../../amazonq/messages/messagePublisher'
 import { Messenger } from '../../amazonqFeatureDev/controllers/chat/messenger/messenger'
 import { AppToWebViewMessageDispatcher } from '../../amazonqFeatureDev/views/connector/connector'
@@ -19,9 +18,6 @@ import { FeatureDevClient } from '../../amazonqFeatureDev/client/featureDev'
 import { VirtualMemoryFile } from '../../shared/virtualMemoryFile'
 import path from 'path'
 import { featureDevScheme } from '../../amazonqFeatureDev/constants'
-import { HttpResponse } from 'aws-sdk'
-import { DefaultCodeWhispererClient } from '../../codewhisperer'
-import { stub } from '../utilities/stubber'
 
 export function createMessenger(): Messenger {
     return new Messenger(
@@ -120,106 +116,3 @@ export async function createController(): Promise<ControllerSetup> {
         sessionStorage,
     }
 }
-
-export const mockGetCodeScanResponse = {
-    $response: {
-        data: {
-            status: 'Completed',
-        },
-        requestId: 'requestId',
-        hasNextPage: () => false,
-        error: undefined,
-        nextPage: () => undefined,
-        redirectCount: 0,
-        retryCount: 0,
-        httpResponse: new HttpResponse(),
-    },
-    status: 'Completed',
-}
-
-export function createMockClient() {
-    const mockClient = stub(DefaultCodeWhispererClient)
-
-    const mockCreateCodeScanResponse = {
-        $response: {
-            data: {
-                jobId: 'jobId',
-                status: 'Pending',
-            },
-            requestId: 'requestId',
-            hasNextPage: () => false,
-            error: undefined,
-            nextPage: () => undefined,
-            redirectCount: 0,
-            retryCount: 0,
-            httpResponse: new HttpResponse(),
-        },
-        jobId: 'jobId',
-        status: 'Pending',
-    }
-    const mockCreateUploadUrlResponse = {
-        $response: {
-            data: {
-                uploadId: 'uploadId',
-                uploadUrl: 'uploadUrl',
-            },
-            requestId: 'requestId',
-            hasNextPage: () => false,
-            error: undefined,
-            nextPage: () => undefined,
-            redirectCount: 0,
-            retryCount: 0,
-            httpResponse: new HttpResponse(),
-        },
-        uploadId: 'uploadId',
-        uploadUrl: 'https://test.com',
-    }
-
-    const mockCodeScanFindings = JSON.stringify([
-        {
-            filePath: 'workspaceFolder/python3.7-plain-sam-app/hello_world/app.py',
-            startLine: 1,
-            endLine: 1,
-            title: 'title',
-            description: {
-                text: 'text',
-                markdown: 'markdown',
-            },
-            detectorId: 'detectorId',
-            detectorName: 'detectorName',
-            findingId: 'findingId',
-            relatedVulnerabilities: [],
-            severity: 'High',
-            remediation: {
-                recommendation: {
-                    text: 'text',
-                    url: 'url',
-                },
-                suggestedFixes: [],
-            },
-            codeSnippet: [],
-        } satisfies model.RawCodeScanIssue,
-    ])
-
-    const mockListCodeScanFindingsResponse = {
-        $response: {
-            data: {
-                codeScanFindings: mockCodeScanFindings,
-            },
-            requestId: 'requestId',
-            hasNextPage: () => false,
-            error: undefined,
-            nextPage: () => undefined,
-            redirectCount: 0,
-            retryCount: 0,
-            httpResponse: new HttpResponse(),
-        },
-        codeScanFindings: mockCodeScanFindings,
-    }
-
-    mockClient.createCodeScan.resolves(mockCreateCodeScanResponse)
-    mockClient.createUploadUrl.resolves(mockCreateUploadUrlResponse)
-    mockClient.getCodeScan.resolves(mockGetCodeScanResponse)
-    mockClient.listCodeScanFindings.resolves(mockListCodeScanFindingsResponse)
-    return mockClient
-}

packages/core/src/test/codewhisperer/startSecurityScan.test.ts

@@ -28,7 +28,7 @@ import * as model from '../../codewhisperer/models/model'
 import { CodewhispererSecurityScan } from '../../shared/telemetry/telemetry.gen'
 import * as errors from '../../shared/errors'
 import * as timeoutUtils from '../../shared/utilities/timeoutUtils'
-import { createMockClient, mockGetCodeScanResponse } from './utils'
+import { createMockClient, mockGetCodeScanResponse } from './testUtil'
 
 let extensionContext: FakeExtensionContext
 let mockSecurityPanelViewProvider: SecurityPanelViewProvider

packages/core/src/test/codewhisperer/testUtil.ts

@@ -20,11 +20,13 @@ import { session } from '../../codewhisperer/util/codeWhispererSession'
 import fs from 'fs'
 import { DefaultAWSClientBuilder, ServiceOptions } from '../../shared/awsClientBuilder'
 import { FakeAwsContext } from '../utilities/fakeAwsContext'
-import { Service } from 'aws-sdk'
+import { HttpResponse, Service } from 'aws-sdk'
 import userApiConfig = require('./../../codewhisperer/client/user-service-2.json')
 import CodeWhispererUserClient = require('../../codewhisperer/client/codewhispereruserclient')
 import { codeWhispererClient } from '../../codewhisperer/client/codewhisperer'
 import { RecommendationHandler } from '../../codewhisperer/service/recommendationHandler'
+import * as model from '../../codewhisperer/models/model'
+import { stub } from '../utilities/stubber'
 
 export async function resetCodeWhispererGlobalVariables() {
     vsCodeState.isIntelliSenseActive = false
@@ -207,3 +209,106 @@ export function createMockDirentFile(fileName: string): fs.Dirent {
     dirent.name = fileName
     return dirent
 }
+
+export const mockGetCodeScanResponse = {
+    $response: {
+        data: {
+            status: 'Completed',
+        },
+        requestId: 'requestId',
+        hasNextPage: () => false,
+        error: undefined,
+        nextPage: () => undefined,
+        redirectCount: 0,
+        retryCount: 0,
+        httpResponse: new HttpResponse(),
+    },
+    status: 'Completed',
+}
+
+export function createMockClient() {
+    const mockClient = stub(codewhispererClient.DefaultCodeWhispererClient)
+
+    const mockCreateCodeScanResponse = {
+        $response: {
+            data: {
+                jobId: 'jobId',
+                status: 'Pending',
+            },
+            requestId: 'requestId',
+            hasNextPage: () => false,
+            error: undefined,
+            nextPage: () => undefined,
+            redirectCount: 0,
+            retryCount: 0,
+            httpResponse: new HttpResponse(),
+        },
+        jobId: 'jobId',
+        status: 'Pending',
+    }
+    const mockCreateUploadUrlResponse = {
+        $response: {
+            data: {
+                uploadId: 'uploadId',
+                uploadUrl: 'uploadUrl',
+            },
+            requestId: 'requestId',
+            hasNextPage: () => false,
+            error: undefined,
+            nextPage: () => undefined,
+            redirectCount: 0,
+            retryCount: 0,
+            httpResponse: new HttpResponse(),
+        },
+        uploadId: 'uploadId',
+        uploadUrl: 'https://test.com',
+    }
+
+    const mockCodeScanFindings = JSON.stringify([
+        {
+            filePath: 'workspaceFolder/python3.7-plain-sam-app/hello_world/app.py',
+            startLine: 1,
+            endLine: 1,
+            title: 'title',
+            description: {
+                text: 'text',
+                markdown: 'markdown',
+            },
+            detectorId: 'detectorId',
+            detectorName: 'detectorName',
+            findingId: 'findingId',
+            relatedVulnerabilities: [],
+            severity: 'High',
+            remediation: {
+                recommendation: {
+                    text: 'text',
+                    url: 'url',
+                },
+                suggestedFixes: [],
+            },
+            codeSnippet: [],
+        } satisfies model.RawCodeScanIssue,
+    ])
+
+    const mockListCodeScanFindingsResponse = {
+        $response: {
+            data: {
+                codeScanFindings: mockCodeScanFindings,
+            },
+            requestId: 'requestId',
+            hasNextPage: () => false,
+            error: undefined,
+            nextPage: () => undefined,
+            redirectCount: 0,
+            retryCount: 0,
+            httpResponse: new HttpResponse(),
+        },
+        codeScanFindings: mockCodeScanFindings,
+    }
+
+    mockClient.createCodeScan.resolves(mockCreateCodeScanResponse)
+    mockClient.createUploadUrl.resolves(mockCreateUploadUrlResponse)
+    mockClient.getCodeScan.resolves(mockGetCodeScanResponse)
+    mockClient.listCodeScanFindings.resolves(mockListCodeScanFindingsResponse)
+    return mockClient
+}