Merge pull request #155 from sfdctaka/moveTestFolders

Move test folders

.vscodeignore

@@ -15,3 +15,4 @@ coverage/
 .github
 out/
 !out/extension.js
+**/test/**

lsp/client/package.json

@@ -3,7 +3,8 @@
     "description": "Client for the Salesforce Mobile Language Server, enabling language support for mobile development in VSCode.",
     "license": "MIT",
     "version": "0.0.1",
-    "main": "out/extension.js",
+    "types": "out/src/extension.d.ts",
+    "main": "out/src/extension.js",
     "publisher": "salesforce",
     "engines": {
         "vscode": "1.77.0"

lsp/client/tsconfig.json

@@ -4,10 +4,10 @@
         "target": "es2020",
         "lib": ["es2020"],
         "outDir": "out",
-        "rootDir": "src",
+        "rootDir": ".",
         "sourceMap": true,
         "composite": true
     },
-    "include": ["src"],
+    "include": ["src", "test"],
     "exclude": ["node_modules", ".vscode-test"]
 }

lsp/server/package.json

@@ -6,7 +6,8 @@
     "engines": {
         "node": "*"
     },
-    "main": "out/index.js",
+    "types": "out/src/index.d.ts",
+    "main": "out/src/index.js",
     "publisher": "salesforce",
     "dependencies": {
         "@babel/traverse": "^7.25.9",

lsp/server/src/index.ts

@@ -5,5 +5,5 @@
  * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
  */
 
-export { TempProjectDirManager } from './test/TestHelper';
+export { TempProjectDirManager } from '../test/TestHelper';
 export { CORE_EXTENSION_ID, SFDX_PROJECT_FILE } from './utils/constants';

lsp/server/src/validator/htmlValidator.ts

@@ -1,8 +1,7 @@
 import { TextDocument } from 'vscode-languageserver-textdocument';
-import { BaseValidator } from './baseValidator';
-
-import { DiagnosticSection } from './baseValidator';
+import { BaseValidator, DiagnosticSection } from './baseValidator';
 import { HTMLDocument, getLanguageService } from 'vscode-html-languageservice';
+
 export class HTMLValidator extends BaseValidator<HTMLDocument> {
     gatherDiagnosticSections(
         textDocument: TextDocument

lsp/server/src/validator/jsValidator.ts

@@ -1,8 +1,7 @@
 import { TextDocument } from 'vscode-languageserver-textdocument';
-import { BaseValidator } from './baseValidator';
+import { BaseValidator, DiagnosticSection } from './baseValidator';
 import type { Node } from '@babel/types';
 import { parseJs } from '../utils/babelUtil';
-import { DiagnosticSection } from './baseValidator';
 
 export class JSValidator extends BaseValidator<Node> {
     gatherDiagnosticSections(

lsp/server/src/test/TestHelper.ts → lsp/server/test/TestHelper.ts

@@ -11,14 +11,14 @@ import * as os from 'os';
 import * as path from 'path';
 import * as process from 'process';
 import * as sinon from 'sinon';
-import Account from '../../testFixture/objectInfos/Account.json';
+import Account from '../testFixture/objectInfos/Account.json';
 import {
     ConfigAggregator,
     StateAggregator,
     Connection,
     AuthInfo
 } from '@salesforce/core';
-import { WorkspaceUtils } from '../utils/workspaceUtils';
+import { WorkspaceUtils } from '../src/utils/workspaceUtils';
 
 const testOrgConfig = {
     key: 'target-org',

lsp/server/src/test/diagnostic/gql/over-sized-record.test.ts → lsp/server/test/diagnostic/gql/over-sized-record.test.ts

@@ -7,7 +7,7 @@
 
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import { suite, test, beforeEach, afterEach } from 'mocha';
-import Book__c from '../../../../testFixture/objectInfos/Book__c.json';
+import Book__c from '../../../testFixture/objectInfos/Book__c.json';
 import * as assert from 'assert';
 import * as sinon from 'sinon';
 
@@ -16,10 +16,10 @@ import {
     OversizedRecord,
     OVER_SIZED_FIELD_MESSAGE,
     OVER_SIZED_RECORD_MESSAGE
-} from '../../../diagnostic/gql/over-sized-record';
-import { OrgUtils } from '../../../utils/orgUtils';
+} from '../../../src/diagnostic/gql/over-sized-record';
+import { OrgUtils } from '../../../src/utils/orgUtils';
 
-import { ObjectInfoRepresentation } from '../../../types';
+import { ObjectInfoRepresentation } from '../../../src/types';
 
 suite(
     'GraphQL Diagnostics Test Suite - Server - Oversized GraphQL Field',

lsp/server/src/test/diagnostic/js/adapters-local-change-not-aware.test.ts → lsp/server/test/diagnostic/js/adapters-local-change-not-aware.test.ts

@@ -15,8 +15,8 @@ import {
     URL_FOR_GET_RELATED_LIST_RECORDS_EXTERNAL_DOC,
     MESSAGE_FOR_GET_RELATED_LIST_RECORDS,
     MESSAGE_FOR_GET_RELATED_LIST_COUNT
-} from '../../../diagnostic/js/adapters-local-change-not-aware';
-import { parseJs } from '../../../utils/babelUtil';
+} from '../../../src/diagnostic/js/adapters-local-change-not-aware';
+import { parseJs } from '../../../src/utils/babelUtil';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 
 suite(

lsp/server/src/test/utils/babelUtil.test.ts → lsp/server/test/utils/babelUtil.test.ts

@@ -8,7 +8,7 @@
 import * as assert from 'assert';
 import * as sinon from 'sinon';
 import { suite, test, afterEach } from 'mocha';
-import { parseJs } from '../../utils/babelUtil';
+import { parseJs } from '../../src/utils/babelUtil';
 
 suite('BabelUtil Test Suite - Server', () => {
     afterEach(function () {

lsp/server/src/test/utils/gqlUtils.test.ts → lsp/server/test/utils/gqlUtils.test.ts

@@ -7,19 +7,19 @@
 
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import { suite, test, beforeEach, afterEach } from 'mocha';
-import Account from '../../../testFixture/objectInfos/Account.json';
-import User from '../../../testFixture/objectInfos/User.json';
-import Contact from '../../../testFixture/objectInfos/Contact.json';
+import Account from '../../testFixture/objectInfos/Account.json';
+import User from '../../testFixture/objectInfos/User.json';
+import Contact from '../../testFixture/objectInfos/Contact.json';
 
 import * as assert from 'assert';
 import * as sinon from 'sinon';
 
 import { parse } from 'graphql';
-import { OrgUtils } from '../../utils/orgUtils';
-import { generateEntityTree } from '../../utils/gqlUtils';
-import { OperationNode, Relation } from '../../utils/gqlUtils';
+import { OrgUtils } from '../../src/utils/orgUtils';
+import { generateEntityTree } from '../../src/utils/gqlUtils';
+import { OperationNode, Relation } from '../../src/utils/gqlUtils';
 
-import { ObjectInfoRepresentation } from '../../types';
+import { ObjectInfoRepresentation } from '../../src/types';
 suite('GraphQL Utils Test Suite - Server', () => {
     let sandbox: sinon.SinonSandbox;
     beforeEach(function () {

lsp/server/src/test/utils/orgUtils.test.ts → lsp/server/test/utils/orgUtils.test.ts

@@ -7,7 +7,7 @@
 import * as assert from 'assert';
 import * as sinon from 'sinon';
 import { suite, test, beforeEach, afterEach } from 'mocha';
-import { OrgUtils } from '../../utils/orgUtils';
+import { OrgUtils } from '../../src/utils/orgUtils';
 
 import {
     setupTempWorkspaceDirectoryStub,
@@ -17,7 +17,7 @@ import {
     stubGetInstanceState,
     stubCreateConfig
 } from '../TestHelper';
-import { ObjectInfoRepresentation } from '../../types';
+import { ObjectInfoRepresentation } from '../../src/types';
 
 suite('OrgUtils Test Suite - Server', () => {
     let sandbox: sinon.SinonSandbox;

lsp/server/src/test/utils/workspaceUtils.test.ts → lsp/server/test/utils/workspaceUtils.test.ts

@@ -9,14 +9,14 @@ import * as assert from 'assert';
 import * as path from 'path';
 import * as fs from 'fs';
 import { mkdir } from 'fs/promises';
-import { WorkspaceUtils } from '../../utils/workspaceUtils';
+import { WorkspaceUtils } from '../../src/utils/workspaceUtils';
 import {
     TempProjectDirManager,
     setupTempWorkspaceDirectoryStub
 } from '../TestHelper';
 import { suite, test, afterEach, beforeEach } from 'mocha';
 import * as sinon from 'sinon';
-import { SFDX_PROJECT_FILE } from '../../utils/constants';
+import { SFDX_PROJECT_FILE } from '../../src/utils/constants';
 
 suite('Workspace Test Suite - Server', () => {
     let getWorkspaceDirStub: sinon.SinonStub<[], string>;

lsp/server/src/test/utils/yamlParser.test.ts → lsp/server/test/utils/yamlParser.test.ts

@@ -8,7 +8,7 @@
 import * as assert from 'assert';
 import * as sinon from 'sinon';
 import { suite, test, afterEach } from 'mocha';
-import { transformYamlToObject } from '../../utils/yamlParser';
+import { transformYamlToObject } from '../../src/utils/yamlParser';
 
 suite('YamlParser Test Suite', () => {
     afterEach(function () {

lsp/server/src/test/validator/graphqlValidator.test.ts → lsp/server/test/validator/graphqlValidator.test.ts

@@ -6,18 +6,18 @@
  */
 
 import { TextDocument } from 'vscode-languageserver-textdocument';
-import { GraphQLValidator } from '../../validator/gqlValidator';
+import { GraphQLValidator } from '../../src/validator/gqlValidator';
 import {
     OversizedRecord,
     RULE_ID
-} from '../../diagnostic/gql/over-sized-record';
+} from '../../src/diagnostic/gql/over-sized-record';
 
 import * as assert from 'assert';
 import { suite, test, beforeEach, afterEach } from 'mocha';
 import * as sinon from 'sinon';
-import { OrgUtils } from '../../utils/orgUtils';
-import Book__c from '../../../testFixture/objectInfos/Book__c.json';
-import { ObjectInfoRepresentation } from '../../types';
+import { OrgUtils } from '../../src/utils/orgUtils';
+import Book__c from '../../testFixture/objectInfos/Book__c.json';
+import { ObjectInfoRepresentation } from '../../src/types';
 
 suite('Diagnostics Test Suite - Server - GraphQL Validator', () => {
     let sandbox: sinon.SinonSandbox;

lsp/server/src/test/validator/htmlValidator.test.ts → lsp/server/test/validator/htmlValidator.test.ts

@@ -7,12 +7,12 @@
 
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import { suite, test } from 'mocha';
-import { HTMLValidator } from '../../validator/htmlValidator';
+import { HTMLValidator } from '../../src/validator/htmlValidator';
 import * as assert from 'assert';
 import {
     MobileOfflineFriendly,
     RULE_ID
-} from '../../diagnostic/html/mobileOfflineFriendly';
+} from '../../src/diagnostic/html/mobileOfflineFriendly';
 
 suite('Diagnostics Test Suite - Server - HTML Validator', () => {
     const htmlValidator: HTMLValidator = new HTMLValidator();

lsp/server/src/test/validator/jsValidator.test.ts → lsp/server/test/validator/jsValidator.test.ts

@@ -9,12 +9,12 @@ import { TextDocument } from 'vscode-languageserver-textdocument';
 import * as assert from 'assert';
 import { suite, test } from 'mocha';
 
-import { JSValidator } from '../../validator/jsValidator';
+import { JSValidator } from '../../src/validator/jsValidator';
 import {
     AdaptersLocalChangeNotAware,
     MESSAGE_FOR_GET_RELATED_LIST_RECORDS,
     RULE_ID
-} from '../../diagnostic/js/adapters-local-change-not-aware';
+} from '../../src/diagnostic/js/adapters-local-change-not-aware';
 
 suite('Diagnostics Test Suite - Server - JS Validator', () => {
     const jsValidator = new JSValidator();

lsp/server/src/test/validatorManager.test.ts → lsp/server/test/validatorManager.test.ts

@@ -9,8 +9,8 @@ import { TextDocument } from 'vscode-languageserver-textdocument';
 import * as assert from 'assert';
 import { suite, test } from 'mocha';
 
-import { ValidatorManager } from '../validatorManager';
-import { MESSAGE_FOR_GET_RELATED_LIST_RECORDS } from '../diagnostic/js/adapters-local-change-not-aware';
+import { ValidatorManager } from '../src/validatorManager';
+import { MESSAGE_FOR_GET_RELATED_LIST_RECORDS } from '../src/diagnostic/js/adapters-local-change-not-aware';
 
 suite('Diagnostics Test Suite - Server - ValidatorManager', () => {
     const validatorManager = ValidatorManager.createInstance();

lsp/server/tsconfig.json

@@ -9,10 +9,9 @@
         "sourceMap": true,
         "strict": true,
         "outDir": "out",
-        "rootDir": "src",
+        "rootDir": ".",
         "composite": true
     },
-
-    "include": ["src"],
+    "include": ["src", "test", "testFixture/**/*.json"],
     "exclude": ["node_modules"]
 }

package.json

@@ -38,7 +38,7 @@
     "extensionDependencies": [
         "salesforce.salesforcedx-vscode-core"
     ],
-    "main": "out/extension.js",
+    "main": "out/src/extension.js",
     "l10n": "./l10n",
     "contributes": {
         "menus": {
@@ -95,7 +95,7 @@
     "scripts": {
         "clean": "rimraf out ./lsp/server/out ./lsp/client/out",
         "compile": "rimraf ./lsp/server/tsconfig.tsbuildinfo ./lsp/client/tsconfig.tsbuildinfo && tsc -b ./ && npm run copy-resources",
-        "copy-resources": "cp -r './lsp/server/resources' './lsp/server/out/'",
+        "copy-resources": "cp -r './lsp/server/resources' './lsp/server/out/src/'",
         "watch": "tsc -watch -b ./",
         "pretest": "npm run compile && npm run lint",
         "lint": "eslint src --ext ts",

src/test/TestHelper.ts → test/TestHelper.ts

@@ -8,7 +8,7 @@
 import * as path from 'path';
 import * as process from 'process';
 import * as sinon from 'sinon';
-import { WorkspaceUtils } from '../utils/workspaceUtils';
+import { WorkspaceUtils } from '../src/utils/workspaceUtils';
 import { TempProjectDirManager } from 'mobile-lsp-server';
 export { TempProjectDirManager };
 
@@ -34,4 +34,4 @@ export function setupTempWorkspaceDirectoryStub(
     const getWorkspaceDirStub = sinon.stub(WorkspaceUtils, 'getWorkspaceDir');
     getWorkspaceDirStub.returns(projectDirManager.projectDir);
     return getWorkspaceDirStub;
-}
+}

src/test/runTest.ts → test/runTest.ts

@@ -13,7 +13,7 @@ import {
     runTests
 } from '@vscode/test-electron';
 import { spawnSync } from 'child_process';
-import { CORE_EXTENSION_ID } from '../utils/constants';
+import { CORE_EXTENSION_ID } from '../src/utils/constants';
 
 const VSCODE_TEST_VERSION = 'stable';
 

src/test/suite/commands/lint/configureLintingToolsCommand.test.ts → test/suite/commands/lint/configureLintingToolsCommand.test.ts

@@ -11,8 +11,8 @@ import * as path from 'path';
 import * as fs from 'fs';
 import { window } from 'vscode';
 import { afterEach } from 'mocha';
-import { ConfigureLintingToolsCommand } from '../../../../commands/lint/configureLintingToolsCommand';
-import { WorkspaceUtils } from '../../../../utils/workspaceUtils';
+import { ConfigureLintingToolsCommand } from '../../../../src/commands/lint/configureLintingToolsCommand';
+import { WorkspaceUtils } from '../../../../src/utils/workspaceUtils';
 import {
     TempProjectDirManager,
     setupTempWorkspaceDirectoryStub
@@ -147,7 +147,7 @@ suite('Configure Linting Tools Command Test Suite', () => {
             devDependencies: {
                 lwc: '1.2.3',
                 // eslint-disable-next-line @typescript-eslint/naming-convention
-                '@salesforce/eslint-plugin-lwc-mobile': '^1.0.0',
+                "@salesforce/eslint-plugin-lwc-mobile":"^1.0.0",
                 // eslint-disable-next-line @typescript-eslint/naming-convention
                 '@salesforce/eslint-plugin-lwc-graph-analyzer': '^0.9.0',
                 eslint: '^8.47.0'

src/test/suite/commands/wizard/authorizeToOrgCommand.test.ts → test/suite/commands/wizard/authorizeToOrgCommand.test.ts

@@ -9,8 +9,8 @@ import * as assert from 'assert';
 import * as sinon from 'sinon';
 import { commands, window } from 'vscode';
 import { afterEach } from 'mocha';
-import { AuthorizeCommand } from '../../../../commands/wizard/authorizeCommand';
-import { OrgUtils } from '../../../../utils/orgUtils';
+import { AuthorizeCommand } from '../../../../src/commands/wizard/authorizeCommand';
+import { OrgUtils } from '../../../../src/utils/orgUtils';
 
 suite('Authorize Org Command Test Suite', () => {
     afterEach(function () {

src/test/suite/commands/wizard/briefcaseCommand.test.ts → test/suite/commands/wizard/briefcaseCommand.test.ts

@@ -8,10 +8,10 @@
 import * as assert from 'assert';
 import * as sinon from 'sinon';
 import { afterEach, beforeEach } from 'mocha';
-import { BriefcaseCommand } from '../../../../commands/wizard/briefcaseCommand';
+import { BriefcaseCommand } from '../../../../src/commands/wizard/briefcaseCommand';
 import { Uri, l10n, window, Progress, CancellationToken } from 'vscode';
 import { CommonUtils } from '@salesforce/lwc-dev-mobile-core/lib/common/CommonUtils';
-import { InstructionsWebviewProvider } from '../../../../webviews/instructions';
+import { InstructionsWebviewProvider } from '../../../../src/webviews/instructions';
 
 suite('Briefcase Command Test Suite', () => {
     beforeEach(function () {});

src/test/suite/commands/wizard/configureProjectCommand.test.ts → test/suite/commands/wizard/configureProjectCommand.test.ts

@@ -17,7 +17,7 @@ import {
     ConfigureProjectCommand,
     DefaultProjectConfigurationProcessor,
     ProjectConfigurationProcessor
-} from '../../../../commands/wizard/configureProjectCommand';
+} from '../../../../src/commands/wizard/configureProjectCommand';
 import {
     TempProjectDirManager,
     createPlatformAbsolutePath

src/test/suite/commands/wizard/deployToOrgCommand.test.ts → test/suite/commands/wizard/deployToOrgCommand.test.ts

@@ -9,7 +9,7 @@ import * as assert from 'assert';
 import * as sinon from 'sinon';
 import { afterEach } from 'mocha';
 import { Uri, commands, window, workspace } from 'vscode';
-import { DeployToOrgCommand } from '../../../../commands/wizard/deployToOrgCommand';
+import { DeployToOrgCommand } from '../../../../src/commands/wizard/deployToOrgCommand';
 
 suite('Deploy To Org Command Test Suite', () => {
     afterEach(function () {

src/test/suite/commands/wizard/landingPageCommand.test.ts → test/suite/commands/wizard/landingPageCommand.test.ts

@@ -8,13 +8,13 @@
 import * as assert from 'assert';
 import * as sinon from 'sinon';
 import * as vscode from 'vscode';
-import { OrgUtils, SObject } from '../../../../utils/orgUtils';
+import { OrgUtils, SObject } from '../../../../src/utils/orgUtils';
 import { SinonStub } from 'sinon';
 import { afterEach, beforeEach } from 'mocha';
-import { UIUtils } from '../../../../utils/uiUtils';
-import { UEMBuilder } from '../../../../utils/uemBuilder';
+import { UIUtils } from '../../../../src/utils/uiUtils';
+import { UEMBuilder } from '../../../../src/utils/uemBuilder';
 import { QuickPickItem } from 'vscode';
-import { LandingPageCommand } from '../../../../commands/wizard/landingPageCommand';
+import { LandingPageCommand } from '../../../../src/commands/wizard/landingPageCommand';
 
 suite('Landing Page Command Test Suite', () => {
     let originalShowQuickPickFunction: (