From abf67169423439d6d23d25e22c38124673736507 Mon Sep 17 00:00:00 2001 From: worksofliam Date: Wed, 10 Apr 2024 15:35:33 -0400 Subject: [PATCH] Remove override CCSID ability Signed-off-by: worksofliam --- src/api/IBMi.ts | 11 ++--------- src/testing/encoding.ts | 7 ------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/api/IBMi.ts b/src/api/IBMi.ts index 07be64364..5273d6713 100644 --- a/src/api/IBMi.ts +++ b/src/api/IBMi.ts @@ -50,8 +50,6 @@ export default class IBMi { private runtimeCcsid: number = CCSID_SYSVAL; /** User default CCSID is job default CCSID */ private userDefaultCCSID: number = 0; - /** override allows the API to hardcode a CCSID. Usually good for testing */ - private overrideCcsid: number | undefined; client: node_ssh.NodeSSH; currentHost: string = ``; @@ -1293,13 +1291,9 @@ export default class IBMi { } } - setOverrideCcsid(ccsid: number | undefined) { - this.overrideCcsid = ccsid; - } - getEncoding() { - const fallback = this.overrideCcsid !== undefined || ((this.runtimeCcsid < 1 || this.runtimeCcsid === 65535) && this.userDefaultCCSID > 0 ? true : false); - const ccsid = fallback ? (this.overrideCcsid || this.userDefaultCCSID) : this.runtimeCcsid; + const fallback = ((this.runtimeCcsid < 1 || this.runtimeCcsid === 65535) && this.userDefaultCCSID > 0 ? true : false); + const ccsid = fallback ? (this.userDefaultCCSID) : this.runtimeCcsid; return { fallback, ccsid, @@ -1312,7 +1306,6 @@ export default class IBMi { origin: this.runtimeCcsidOrigin, runtimeCcsid: this.runtimeCcsid, userDefaultCCSID: this.userDefaultCCSID, - overrideCcsid: this.overrideCcsid, }; } } \ No newline at end of file diff --git a/src/testing/encoding.ts b/src/testing/encoding.ts index 1c141cff2..0a0480ebd 100644 --- a/src/testing/encoding.ts +++ b/src/testing/encoding.ts @@ -10,11 +10,6 @@ import { getMemberUri } from "../filesystems/qsys/QSysFs"; export const EncodingSuite: TestSuite = { name: `Encoding tests`, - after: async () => { - const connection = instance.getConnection(); - connection?.setOverrideCcsid(undefined); - }, - before: async () => { const config = instance.getConfig()!; assert.ok(config.enableSourceDates, `Source dates must be enabled for this test.`); @@ -32,8 +27,6 @@ export const EncodingSuite: TestSuite = { const tempLib = config!.tempLibrary; - connection?.setOverrideCcsid(37); - const file = `TEST37`; await connection!.runCommand({ command: `CRTSRCPF FILE(${tempLib}/${file}) RCDLEN(112) CCSID(37)`, noLibList: true });