fixing unit test errors

Signed-off-by: Amber Torrise <[email protected]>

packages/imperative/__tests__/__unit__/cmd/CommandPreparer.unit.test.ts

@@ -23,7 +23,7 @@ import {
     VALID_COMMANDS_WITH_PROFILES,
     SAMPLE_BASE_PROFILE
 } from "./__resources__/CommandDefinitions";
-import { ImperativeError } from "../../error/src/ImperativeError";
+import { ImperativeError } from "../../../src/error/ImperativeError";
 
 // UnitTestUtils.replaceIt();
 

packages/imperative/__tests__/__unit__/cmd/CommandProcessor.unit.test.ts

@@ -15,7 +15,7 @@ import { CommandProcessor } from "../../../src/cmd/CommandProcessor";
 import { ICommandResponse } from "../../../src/cmd/doc/response/response/ICommandResponse";
 import { CommandResponse } from "../../../src/cmd/response/CommandResponse";
 import { IHelpGenerator } from "../../../src/cmd/help/doc/IHelpGenerator";
-import { BasicProfileManager, IProfileManagerFactory, IProfileTypeConfiguration } from "../../profiles";
+import { BasicProfileManager, IProfileManagerFactory, IProfileTypeConfiguration } from "../../../src/profiles";
 import { ImperativeError } from "../../../src/error";
 import { ICommandValidatorResponse } from "../../../src/cmd/doc/response/response/ICommandValidatorResponse";
 import { SharedOptions } from "../../../src/cmd/utils/SharedOptions";
@@ -29,7 +29,7 @@ import { join } from "path";
 
 jest.mock("../../../src/cmd/syntax/SyntaxValidator");
 jest.mock("../../../src/cmd/utils/SharedOptions");
-jest.mock("../../utilities/ImperativeConfig");
+jest.mock("../../../src/utilities/ImperativeConfig");
 
 // Persist the original definitions of process.write
 const ORIGINAL_STDOUT_WRITE = process.stdout.write;

packages/imperative/__tests__/__unit__/cmd/help/DefaultHelpGenerator.unit.test.ts

@@ -9,8 +9,8 @@
 *
 */
 
-jest.mock("../../../imperative/src/Imperative");
-jest.mock("../../../utilities/ImperativeConfig");
+jest.mock("../../../../src/imperative/Imperative");
+jest.mock("../../../../src/utilities/ImperativeConfig");
 
 import { IHelpGeneratorFactoryParms } from "../../../../src/cmd/help/doc/IHelpGeneratorFactoryParms";
 import { ICommandDefinition } from "../../../../src/cmd/doc/ICommandDefinition";

packages/imperative/__tests__/__unit__/cmd/profiles/CliProfileManager.credentials.unit.test.ts

@@ -22,8 +22,8 @@ import { CredentialManagerFactory, DefaultCredentialManager } from "../../../../
 import { BasicProfileManager } from "../../../../src/profiles/BasicProfileManager";
 import { ProfilesConstants, ISaveProfile, IProfileSaved } from "../../../../src/profiles";
 
-jest.mock("../../../profiles/src/utils/ProfileIO");
-jest.mock("../../../security/src/DefaultCredentialManager");
+jest.mock("../../../../src/profiles/utils/ProfileIO");
+jest.mock("../../../../src/profiles/security/DefaultCredentialManager");
 
 // TODO: Some of these tests are not completely isolated, some may cause others to fail depending on mocks
 

packages/imperative/__tests__/__unit__/cmd/profiles/CliProfileManager.unit.test.ts

@@ -22,8 +22,8 @@ import { STRAWBERRY_PROFILE_TYPE } from "../../../../__tests__/__unit__/profiles
 import { TEST_PROFILE_ROOT_DIR } from "../../../../__tests__/__unit__/profiles/TestConstants";
 import { IProfileLoaded } from "../../../..";
 
-jest.mock("../../../profiles/utils/ProfileIO");
-jest.mock("../../../security/DefaultCredentialManager");
+jest.mock("../../../../src/profiles/utils/ProfileIO");
+jest.mock("../../../../src/security/DefaultCredentialManager");
 
 describe("Cli Profile Manager", () => {
     let writtenProfile: any;

packages/imperative/__tests__/__unit__/cmd/profiles/CommandProfileLoader.unit.test.ts

@@ -9,10 +9,10 @@
 *
 */
 
-jest.mock("../../../profiles/src/BasicProfileManager");
-jest.mock("../../../profiles/src/BasicProfileManagerFactory");
-jest.mock("../../../utilities/ImperativeConfig");
-jest.mock("../../../logger/src/LoggerUtils");
+jest.mock("../../../../src/profiles/BasicProfileManager");
+jest.mock("../../../../src/profiles/BasicProfileManagerFactory");
+jest.mock("../../../../src/utilities/ImperativeConfig");
+jest.mock("../../../../src/logger/LoggerUtils");
 import { CommandProfileLoader } from "../../../../src/cmd/profiles/CommandProfileLoader";
 import { ICommandDefinition } from "../../../../src/cmd/doc/ICommandDefinition";
 import { BasicProfileManager } from "../../../../src/profiles/BasicProfileManager";

packages/imperative/__tests__/__unit__/config/ConfigAutoStore.unit.test.ts

@@ -9,7 +9,7 @@
 *
 */
 
-jest.mock("../../logger/src/LoggerUtils");
+jest.mock("../../../src/logger/LoggerUtils");
 import { AbstractAuthHandler } from "../../../src/imperative";
 import { SessConstants } from "../../../src/rest";
 import { ImperativeConfig } from "../../../src/utilities/ImperativeConfig";

packages/imperative/__tests__/__unit__/imperative/Imperative.unit.test.ts

@@ -100,7 +100,7 @@ describe("Imperative", () => {
             // If we error here, jest silently fails and says the test is empty. So let's make sure
             // that doesn't happen!
 
-            const { Logger } = (jest as any).requireActual("../../logger/src/Logger");
+            const { Logger } = (jest as any).requireActual("../src/logger/Logger");
 
             Logger.getConsoleLogger().fatal("Imperative.test.ts test execution error!");
             Logger.getConsoleLogger().fatal(error);

packages/imperative/__tests__/__unit__/imperative/config/cmd/convert-profiles/convert-profiles.handler.unit.test.ts

@@ -21,8 +21,8 @@ import * as npmInterface from "../../../../../../src/imperative/plugins/utilitie
 import { PluginIssues } from "../../../../../../src/imperative/plugins/utilities/PluginIssues";
 import ConvertProfilesHandler from "../../../../../../src/imperative/config/cmd/convert-profiles/convert-profiles.handler";
 
-jest.mock("../../../../src/plugins/utilities/npm-interface");
-jest.mock("../../../../../../src/imperative/src/OverridesLoader");
+jest.mock("../../../../../../src/plugins/utilities/npm-interface");
+jest.mock("../../../../../../src/imperative/OverridesLoader");
 
 let stdout: string;
 let stderr: string;

packages/imperative/__tests__/__unit__/imperative/plugins/PluginManagementFacility.unit.test.ts

@@ -13,8 +13,8 @@ import Mock = jest.MockedFunction;
 
 jest.mock("fs");
 jest.mock("jsonfile");
-jest.mock("../../src/plugins/utilities/PMFConstants");
-jest.mock("../../src/plugins/PluginRequireProvider");
+jest.mock("../../../../src/imperative/plugins/utilities/PMFConstants");
+jest.mock("../../../../src/imperative/plugins/PluginRequireProvider");
 
 import * as fs from "fs";
 import { AppSettings } from "../../../../src/settings";

packages/imperative/__tests__/__unit__/imperative/plugins/PluginRequireProvider.unit.test.ts

@@ -11,7 +11,7 @@
 
 import { getMockWrapper } from "../../../../__tests__/__src__/types/MockWrapper";
 
-jest.mock("../../../../../src/utilities/ImperativeConfig");
+jest.mock("../../../../src/utilities/ImperativeConfig");
 jest.mock("find-up");
 jest.mock("path");
 

packages/imperative/__tests__/__unit__/imperative/plugins/utilities/npm-interface/install.unit.test.ts

@@ -17,15 +17,15 @@ let returnedVal: any;
 jest.mock("cross-spawn");
 jest.mock("jsonfile");
 jest.mock("find-up");
-jest.mock("../../../../src/plugins/utilities/PMFConstants");
-jest.mock("../../../../src/plugins/PluginManagementFacility");
-jest.mock("../../../../src/ConfigurationLoader");
-jest.mock("../../../../src/UpdateImpConfig");
-jest.mock("../../../../../config/src/ConfigSchema");
-jest.mock("../../../../../logger");
-jest.mock("../../../../../cmd/src/response/CommandResponse");
-jest.mock("../../../../../cmd/src/response/HandlerResponse");
-jest.mock("../../../../src/plugins/utilities/NpmFunctions");
+jest.mock("../../../../../../src/plugins/utilities/PMFConstants");
+jest.mock("../../../../../../src/plugins/PluginManagementFacility");
+jest.mock("../../../../../../src/ConfigurationLoader");
+jest.mock("../../../../../../src/UpdateImpConfig");
+jest.mock("../../../../../../src/config/ConfigSchema");
+jest.mock("../../../../../../src/logger");
+jest.mock("../../../../../../src/cmd/response/CommandResponse");
+jest.mock("../../../../../../src/cmd/response/HandlerResponse");
+jest.mock("../../../../../../src/plugins/utilities/NpmFunctions");
 jest.doMock("path", () => {
     const originalPath = jest.requireActual("path");
     return {

packages/imperative/__tests__/__unit__/profiles/BasicProfileManager.save.unit.test.ts

@@ -28,7 +28,7 @@ import {
     STRAWBERRY_WITH_REQUIRED_APPLE_DEPENDENCY,
     TEST_PROFILE_ROOT_DIR
 } from "./TestConstants";
-import { BasicProfileManager } from "../src/BasicProfileManager";
+import { BasicProfileManager } from "../../../src/profiles/BasicProfileManager";
 
 const BAD_SAMPLE_SAVE_PARMS: ISaveProfile = {
     name: "bad_apple",

packages/imperative/__tests__/__unit__/rest/session/ConnectionPropsForSessCfg.unit.test.ts

@@ -9,7 +9,8 @@
 *
 */
 
-jest.mock("../../../logger/src/LoggerUtils");
+jest.mock("../../../../src/LoggerUtils");
+
 import { ConnectionPropsForSessCfg } from "../../../../src/rest/session/ConnectionPropsForSessCfg";
 import { CliUtils } from "../../../../src/utilities/CliUtils";
 import { ImperativeError } from "../../../../src/error";

packages/imperative/src/cmd/syntax/__tests__/SyntaxValidator.unit.test.ts

@@ -12,7 +12,7 @@
 /* eslint-disable jest/expect-expect */
 import { TextUtils } from "../../../utilities/TextUtils";
 
-jest.mock("../../../../imperative/src/Imperative");
+jest.mock("../../../../src/imperative/Imperative");
 import { inspect, isNullOrUndefined } from "util";
 import { TestLogger } from "../../../../__tests__/src/TestLogger";
 import { CommandResponse, ICommandDefinition, ICommandValidatorResponse } from "../../../";

packages/imperative/src/imperative/auth/__tests__/__data__/FakeAuthHandler.ts

@@ -10,8 +10,8 @@
 */
 
 import { BaseAuthHandler } from "../../handlers/BaseAuthHandler";
-import { ICommandArguments } from "../../../../../cmd";
-import { ISession, AbstractSession, SessConstants } from "../../../../../rest";
+import { ICommandArguments } from "../../../../cmd";
+import { ISession, AbstractSession, SessConstants } from "../../../../rest";
 
 export default class FakeAuthHandler extends BaseAuthHandler {
     public mProfileType: string = "fruit";

packages/imperative/src/profiles/utils/__tests__/ProfileIO.unit.test.ts

@@ -12,10 +12,10 @@
 import Mock = jest.Mock;
 
 jest.mock("fs");
-jest.mock("../../../../io/src/IO");
+jest.mock("../../../io/IO");
 jest.mock("js-yaml");
 jest.mock("yamljs");
-jest.mock("../../../../utilities/ImperativeConfig");
+jest.mock("../../../utilities/ImperativeConfig");
 
 import * as fs from "fs";
 import { IO } from "../../../io/IO";

packages/imperative/src/profiles/validation/__tests__/ProfileValidation.unit.test.ts

@@ -18,7 +18,7 @@ import { IProfileValidationTaskResult } from "../doc/IProfileValidationTaskResul
 import { ProfileValidator } from "../api/ProfileValidator";
 import { IProfileValidationTask } from "../../..";
 
-jest.mock("../../../../imperative/src/Imperative");
+jest.mock("../../../imperative/Imperative");
 
 
 const oldForceColorOption = process.env.FORCE_COLOR;