update usage of '.sfdx' dir in isvdebugging

packages/salesforcedx-utils-vscode/src/helpers/paths.ts

@@ -146,6 +146,11 @@ function relativeStateFolder(): string {
   return Global.STATE_FOLDER;
 }
 
+function relativeToolsFolder(): string {
+  const relativePathToToolsFolder = path.join(projectPaths.relativeStateFolder(), TOOLS);
+  return relativePathToToolsFolder;
+}
+
 export const projectPaths = {
   stateFolder,
   metadataFolder,
@@ -156,5 +161,7 @@ export const projectPaths = {
   sfdxProjectConfig,
   toolsFolder,
   lwcTestResultsFolder,
-  relativeStateFolder
+  relativeStateFolder,
+  relativeToolsFolder,
+  TOOLS
 };

packages/salesforcedx-utils-vscode/test/jest/helpers/paths.test.ts

@@ -70,4 +70,15 @@ describe('test project paths', () => {
       expect(relativeStateFolder).toEqual(FAKE_STATE_FOLDER);
     });
   });
+
+  describe('test relativeToolsFolder', () => {
+    it('should be defined', () => {
+      expect(projectPaths.relativeToolsFolder).toBeDefined();
+    });
+
+    it('should return a path to the relative tools folder', () => {
+      const relativeToolsFolder = projectPaths.relativeToolsFolder();
+      expect(relativeToolsFolder).toEqual(path.join(FAKE_STATE_FOLDER, projectPaths.TOOLS));
+    });
+  });
 });

packages/salesforcedx-vscode-core/jest.config.js

@@ -0,0 +1,4 @@
+//eslint:disable-next-line:no-var-requires
+const baseConfig = require('../../config/jest.base.config');
+
+module.exports = Object.assign({}, baseConfig);

packages/salesforcedx-vscode-core/package.json

@@ -107,7 +107,8 @@
     "clean": "shx rm -rf node_modules && shx rm -rf out && shx rm -rf coverage && shx rm -rf .nyc_output",
     "test": "npm run test:vscode-integration",
     "test:vscode-integration": "cross-env CODE_TESTS_WORKSPACE='../system-tests/assets/sfdx-simple' node ../../scripts/run-vscode-integration-tests",
-    "test:vscode-insiders-integration": "cross-env CODE_VERSION=insiders npm run test:vscode-integration"
+    "test:vscode-insiders-integration": "cross-env CODE_VERSION=insiders npm run test:vscode-integration",
+    "test:unit": "jest --coverage"
   },
   "nyc": {
     "reporter": [

packages/salesforcedx-vscode-core/src/commands/baseDeployRetrieve.ts

@@ -26,7 +26,6 @@ import {
 } from '@salesforce/source-deploy-retrieve/lib/src/client/types';
 import { join } from 'path';
 import * as vscode from 'vscode';
-import { BaseDeployExecutor } from '.';
 import { channelService, OUTPUT_CHANNEL } from '../channels';
 import { PersistentStorageService } from '../conflict/persistentStorageService';
 import { TELEMETRY_METADATA_COUNT } from '../constants';
@@ -36,6 +35,7 @@ import { nls } from '../messages';
 import { DeployQueue } from '../settings';
 import { SfdxPackageDirectories } from '../sfdxProject';
 import { OrgAuthInfo } from '../util';
+import { BaseDeployExecutor } from './baseDeployCommand';
 import { createComponentCount, formatException } from './util';
 
 type DeployRetrieveResult = DeployResult | RetrieveResult;

packages/salesforcedx-vscode-core/src/commands/forceSourceDeployManifest.ts

@@ -4,17 +4,12 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import {
-  Command,
-  SfdxCommandBuilder
-} from '@salesforce/salesforcedx-utils-vscode';
-import { ContinueResponse } from '@salesforce/salesforcedx-utils-vscode';
+import { ContinueResponse, SfdxCommandBuilder } from '@salesforce/salesforcedx-utils-vscode';
 import { ComponentSet } from '@salesforce/source-deploy-retrieve';
 import { join } from 'path';
 import * as vscode from 'vscode';
 import { channelService } from '../channels';
 import {
-  ConflictDetectionMessages,
   TimestampConflictChecker
 } from '../commands/util/postconditionCheckers';
 import { nls } from '../messages';
@@ -23,7 +18,7 @@ import { SfdxPackageDirectories } from '../sfdxProject';
 import { telemetryService } from '../telemetry';
 import { workspaceUtils } from '../util';
 import { DeployExecutor } from './baseDeployRetrieve';
-import { FilePathGatherer, SfdxCommandlet, SfdxWorkspaceChecker } from './util';
+import { ConflictDetectionMessages, FilePathGatherer, SfdxCommandlet, SfdxWorkspaceChecker } from './util';
 
 export class LibrarySourceDeployManifestExecutor extends DeployExecutor<
   string

packages/salesforcedx-vscode-core/src/commands/forceSourceDeploySourcePath.ts

@@ -16,13 +16,13 @@ import { telemetryService } from '../telemetry';
 import { DeployExecutor } from './baseDeployRetrieve';
 import { SourcePathChecker } from './forceSourceRetrieveSourcePath';
 import {
+  ConflictDetectionMessages,
   LibraryPathsGatherer,
   SfdxCommandlet,
   SfdxWorkspaceChecker
 } from './util';
 import {
   CompositePostconditionChecker,
-  ConflictDetectionMessages,
   TimestampConflictChecker
 } from './util/postconditionCheckers';
 

packages/salesforcedx-vscode-core/src/commands/forceSourceRetrieveSourcePath.ts

@@ -19,11 +19,11 @@ import { SfdxPackageDirectories, SfdxProjectConfig } from '../sfdxProject';
 import { telemetryService } from '../telemetry';
 import { RetrieveExecutor } from './baseDeployRetrieve';
 import {
+  ConflictDetectionMessages,
   LibraryPathsGatherer,
   SfdxCommandlet,
   SfdxWorkspaceChecker
 } from './util';
-import { ConflictDetectionMessages } from './util/postconditionCheckers';
 
 export class LibraryRetrieveSourcePathExecutor extends RetrieveExecutor<
   string[]

packages/salesforcedx-vscode-core/src/commands/isvdebugging/bootstrapCmd.ts

@@ -13,6 +13,7 @@ import {
   CommandOutput,
   ContinueResponse,
   ParametersGatherer,
+  projectPaths,
   SfdxCommandBuilder
 } from '@salesforce/salesforcedx-utils-vscode';
 import { SpawnOptions } from 'child_process';
@@ -53,19 +54,21 @@ export interface InstalledPackageInfo {
   versionNumber: string;
 }
 
+export const ISVDEBUGGER = 'isvdebuggermdapitmp';
+export const INSTALLED_PACKAGES = 'installed-packages';
+export const PACKAGE_XML = 'package.xml';
+
 export class IsvDebugBootstrapExecutor extends SfdxCommandletExecutor<{}> {
   public readonly relativeMetdataTempPath = path.join(
-    '.sfdx',
-    'tools',
+    projectPaths.relativeToolsFolder(),
     'isvdebuggermdapitmp'
   );
   public readonly relativeApexPackageXmlPath = path.join(
     this.relativeMetdataTempPath,
     'package.xml'
   );
   public readonly relativeInstalledPackagesPath = path.join(
-    '.sfdx',
-    'tools',
+    projectPaths.relativeToolsFolder(),
     'installed-packages'
   );
 

packages/salesforcedx-vscode-core/src/commands/util/conflictDetectionMessages.ts

@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2022, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+
+export interface ConflictDetectionMessages {
+  warningMessageKey: string;
+  commandHint: (input: string | string[]) => string;
+}

packages/salesforcedx-vscode-core/src/commands/util/emptyPostChecker.ts

@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2022, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+
+import { CancelResponse, ContinueResponse, PostconditionChecker } from '@salesforce/salesforcedx-utils-vscode';
+
+export class EmptyPostChecker implements PostconditionChecker<any> {
+  public async check(
+    inputs: ContinueResponse<any> | CancelResponse
+  ): Promise<ContinueResponse<any> | CancelResponse> {
+    return inputs;
+  }
+}

packages/salesforcedx-vscode-core/src/commands/util/index.ts

@@ -24,9 +24,9 @@ export {
   SelectUsername
 } from './parameterGatherers';
 export {
-  ConflictDetectionMessages,
-  EmptyPostChecker
-} from './postconditionCheckers';
+  ConflictDetectionMessages
+} from './conflictDetectionMessages';
+export {EmptyPostChecker} from './emptyPostChecker';
 export {
   CommandletExecutor,
   CommandParams,

packages/salesforcedx-vscode-core/src/commands/util/postconditionCheckers.ts

@@ -25,6 +25,7 @@ import { notificationService } from '../../notifications';
 import { DeployQueue, sfdxCoreSettings } from '../../settings';
 import { telemetryService } from '../../telemetry';
 import { MetadataDictionary, workspaceUtils } from '../../util';
+import { ConflictDetectionMessages } from './conflictDetectionMessages';
 import { PathStrategyFactory } from './sourcePathStrategies';
 
 type OneOrMany = LocalComponent | LocalComponent[];
@@ -54,14 +55,6 @@ export class CompositePostconditionChecker<T>
   }
 }
 
-export class EmptyPostChecker implements PostconditionChecker<any> {
-  public async check(
-    inputs: ContinueResponse<any> | CancelResponse
-  ): Promise<ContinueResponse<any> | CancelResponse> {
-    return inputs;
-  }
-}
-
 /* tslint:disable-next-line:prefer-for-of */
 export class OverwriteComponentPrompt
   implements PostconditionChecker<OneOrMany> {
@@ -206,11 +199,6 @@ export class OverwriteComponentPrompt
   }
 }
 
-export interface ConflictDetectionMessages {
-  warningMessageKey: string;
-  commandHint: (input: string | string[]) => string;
-}
-
 export class TimestampConflictChecker implements PostconditionChecker<string> {
   private isManifest: boolean;
   private messages: ConflictDetectionMessages;

packages/salesforcedx-vscode-core/src/commands/util/sfdxCommandlet.ts

@@ -7,27 +7,19 @@
 import {
   CliCommandExecutor,
   Command,
-  CommandExecution
-} from '@salesforce/salesforcedx-utils-vscode';
-import {
-  Measurements,
-  Properties,
-  TelemetryData
-} from '@salesforce/salesforcedx-utils-vscode';
-import {
-  ContinueResponse,
-  ParametersGatherer,
+  CommandExecution, ContinueResponse, Measurements, ParametersGatherer,
   PostconditionChecker,
-  PreconditionChecker
+  PreconditionChecker, Properties,
+  TelemetryData
 } from '@salesforce/salesforcedx-utils-vscode';
 import * as vscode from 'vscode';
-import { EmptyPostChecker } from '.';
 import { channelService } from '../../channels';
 import { notificationService, ProgressNotification } from '../../notifications';
 import { sfdxCoreSettings } from '../../settings';
 import { taskViewService } from '../../statuses';
 import { telemetryService } from '../../telemetry';
 import { workspaceUtils } from '../../util';
+import { EmptyPostChecker } from './emptyPostChecker';
 
 export enum CommandVersion {
   Beta = 'beta',

packages/salesforcedx-vscode-core/test/jest/commands/isvdebugging/bootstrapCmd.test.ts

@@ -0,0 +1,25 @@
+import { projectPaths } from '@salesforce/salesforcedx-utils-vscode';
+import * as path from 'path';
+import { IsvDebugBootstrapExecutor, ISVDEBUGGER } from '../../../../src/commands/isvdebugging/bootstrapCmd';
+
+describe('isvdebugging unit test', () => {
+
+  const TOOLS_FOLDER = 'tools';
+  let relativeToolsFolderStub: jest.SpyInstance;
+
+  let isvDebugBootstrapExecutorInst: IsvDebugBootstrapExecutor;
+
+  beforeEach(() => {
+    relativeToolsFolderStub = jest.spyOn(projectPaths, 'relativeToolsFolder').mockReturnValue(TOOLS_FOLDER);
+  });
+
+  it('should be defined', () => {
+    isvDebugBootstrapExecutorInst = new IsvDebugBootstrapExecutor();
+    expect(isvDebugBootstrapExecutorInst).toBeDefined();
+  });
+
+  it('should test readonly relativeMetdataTempPath property', () => {
+    isvDebugBootstrapExecutorInst = new IsvDebugBootstrapExecutor();
+    expect(isvDebugBootstrapExecutorInst.relativeMetdataTempPath).toEqual(path.join(TOOLS_FOLDER, ISVDEBUGGER));
+  });
+});

scripts/setup-jest.ts

@@ -28,13 +28,17 @@ const getMockVSCode = () => {
       };
       public dispose = () => {};
     },
+    TreeItem: jest.fn(),
     commands: jest.fn(),
     Disposable: jest.fn(),
     env: {
       machineId: '12345534'
     },
     EventEmitter: EventEmitter,
     ExtensionMode: { Production: 1, Development: 2, Test: 3 },
+    languages: {
+      createDiagnosticCollection: jest.fn()
+    },
     Uri: {
       parse: jest.fn(),
       file: jest.fn()
@@ -63,7 +67,11 @@ const getMockVSCode = () => {
         };
       },
       onDidChangeConfiguration: jest.fn(),
-      createFileSystemWatcher: jest.fn(),
+      createFileSystemWatcher: jest.fn().mockReturnValue({
+        onDidChange: jest.fn(),
+        onDidCreate: jest.fn(),
+        onDidDelete: jest.fn()
+      }),
       workspaceFolders: []
     }
   };