fix tests

Author: Philip-Carneiro

src/commands/clientCommand.ts

@@ -25,7 +25,7 @@ import {
 import { LanguageClient } from "vscode-languageclient/node";
 
 import { ext } from "../extensionVariables";
-import { executeActiveEditorQuery } from "./executionCommands";
+import { executeActiveEditorQuery } from "./executionCommand";
 import { getTargetForUri } from "./workspaceCommand";
 import { ExecutionTypes } from "../models/execution";
 import { getBasename } from "../utils/core";

src/commands/dataSourceCommand.ts

@@ -18,7 +18,7 @@ import { ext } from "../extensionVariables";
 import {
   executeDataSourceQuery,
   handleExecuteDataQueryResults,
-} from "./executionCommands";
+} from "./executionCommand";
 import { LocalConnection } from "../classes/localConnection";
 import { GetDataError } from "../models/data";
 import {

src/commands/executionCommands.ts src/commands/executionCommand.tssrc/commands/executionCommands.ts renamed to src/commands/executionCommand.ts

@@ -27,7 +27,7 @@ import {
   executeActiveEditorQuery,
   executeReRunQuery,
   executeSelectViewQuery,
-} from "./commands/executionCommands";
+} from "./commands/executionCommand";
 import {
   installTools,
   startLocalProcess,

src/extension.ts

@@ -31,7 +31,7 @@ import {
 import { ConnectionManagementService } from "./connectionManagerService";
 import { InsightsConnection } from "../classes/insightsConnection";
 import { runDataSource } from "../commands/dataSourceCommand";
-import { prepareToPopulateScratchpad } from "../commands/executionCommands";
+import { prepareToPopulateScratchpad } from "../commands/executionCommand";
 import {
   getConnectionForServer,
   getInsightsServers,

src/services/dataSourceEditorProvider.ts

@@ -17,7 +17,7 @@ import { getCellKind } from "./notebookProviders";
 import { InsightsConnection } from "../classes/insightsConnection";
 import { LocalConnection } from "../classes/localConnection";
 import { ReplConnection } from "../classes/replConnection";
-import { executeNotebookQuery } from "../commands/executionCommands";
+import { executeNotebookQuery } from "../commands/executionCommand";
 import { findConnection, getServerForUri } from "../commands/workspaceCommand";
 import { ext } from "../extensionVariables";
 import { CellKind } from "../models/notebook";

src/services/notebookController.ts

@@ -18,7 +18,7 @@ import { LanguageClient } from "vscode-languageclient/node";
 
 import * as clientCommand from "../../../src/commands/clientCommand";
 import * as dataSourceCommand from "../../../src/commands/dataSourceCommand";
-import * as workspaceCommand from "../../../src/commands/workspaceCommand";
+import * as executionCommand from "../../../src/commands/executionCommand";
 import { ext } from "../../../src/extensionVariables";
 
 describe("clientCommands", () => {
@@ -50,7 +50,7 @@ describe("clientCommands", () => {
       sinon
         .stub(client, "sendRequest")
         .value(async () => new vscode.Range(0, 0, 1, 1));
-      sinon.stub(workspaceCommand, "runActiveEditor").value(() => {});
+      sinon.stub(executionCommand, "executeActiveEditorQuery").value(() => {});
       await executeBlock(client);
       assert.deepEqual(
         ext.activeTextEditor.selection,