Fix to encoding tests

Signed-off-by: worksofliam <mrliamallan@live.co.uk>

Author: worksofliam

src/api/CompileTools.ts

@@ -13,7 +13,7 @@ export interface ILELibrarySettings {
 export namespace CompileTools {
   export const NEWLINE = `\r\n`;
   export const DID_NOT_RUN = -123;
-  const HIDE_MESSAGE_IDS = [`CPF3485`];
+  const HIDE_MESSAGE_IDS = [`CPF3485`, `SQL0462`];
 
   const ileQueue = new SimpleQueue();
 
@@ -125,8 +125,16 @@ export namespace CompileTools {
 
               // Then fetch the job log
 
-              if (!options.skipDetail) {
+              if (options.skipDetail) {
+                // We still need to skip all the messages for the next time the commands are run
+                const lastMessage = await connection.runSQL(`select max(ORDINAL_POSITION) as O from table(qsys2.joblog_info('*'))`);
+                if (lastMessage && lastMessage.length === 1) {
+                  jobLogOrdinal = Number(lastMessage[0].O);
+                }
+
+              } else {
                 try {
+                  // We only care about messages since the last run :)
                   const lastJobLog = await connection.runSQL(`select ORDINAL_POSITION, message_id, message_text from table(qsys2.joblog_info('*')) where ordinal_position > ?`, { fakeBindings: [jobLogOrdinal] });
                   if (lastJobLog && lastJobLog.length > 0) {
                     commandResult.stderr = lastJobLog

src/api/IBMi.ts

@@ -1364,7 +1364,6 @@ export default class IBMi {
               const rs = await query.execute(99999);
               lastResultSet = rs.data;
             } catch (e: any) {
-              console.log(e);
               error = new Tools.SqlError(e.message);
               error.cause = statement
 

src/api/tests/connection.ts

@@ -65,8 +65,6 @@ export async function newConnection(reloadSettings?: boolean) {
     name: `${ENV_CREDS.host}_${ENV_CREDS.username}_test`
   };
 
-  console.log(`Connecting to ${creds.username}@${creds.host}`);
-
   // Override this so not to spam the console.
   conn.appendOutput = (data) => { };
 

src/api/tests/setup.ts

@@ -9,21 +9,19 @@ export async function setup(project: TestProject) {
   // When the config files exist, it makes future connections just slightly faster.
   // Mostly useful during the CI stage.
 
-    // const configsExist = exists(JSONConfig.NAME) && exists(JsonStorage.NAME);
+    const configsExist = exists(JSONConfig.NAME) && exists(JsonStorage.NAME);
 
-    // if (configsExist) {
-    //   console.log(`Connection settings already existing. Skipped connection setup.`);
-    // } else {
+    if (configsExist) {
+      console.log(`Connection settings already exists. Skipped connection setup.`);
+    } else {
+      console.log(``);
+      console.log(`Connecting before tests run to create/refresh settings.`);
+      const conn = await newConnection(true);
+      await disposeConnection(conn);
 
-    // }
-
-    console.log(``);
-    console.log(`Connecting before tests run to create/refresh settings.`);
-    const conn = await newConnection(true);
-    await disposeConnection(conn);
-
-    console.log(`Testing connection complete. Settings written/refreshed.`);
-    console.log(``);
+      console.log(`Testing connection complete. Settings written/refreshed.`);
+      console.log(``);
+    }
 }
 
 function exists(fileName: string) {

src/api/tests/suites/encoding.test.ts

@@ -21,7 +21,8 @@ async function runCommandsWithCCSID(connection: IBMi, commands: string[], ccsid:
   const config = connection.getConfig();
 
   const tempLib = config.tempLibrary;
-  const testPgmName = connection.upperCaseName(`T${commands.length}${ccsid}${Tools.makeid(2)}`);
+  const name = `T${commands.length}${ccsid}${Tools.makeid(2)}`.padEnd(10).substring(0, 10).trim();
+  const testPgmName = connection.upperCaseName(name);
 
   await connection.runCommand({ command: `DLTOBJ OBJ(${tempLib}/${testPgmSrcFile}) OBJTYPE(*FILE)`, noLibList: true });
   await connection.runCommand({ command: `DLTOBJ OBJ(${tempLib}/${testPgmName}) OBJTYPE(*PGM)`, noLibList: true });
@@ -329,22 +330,22 @@ describe('Encoding tests', { concurrent: true }, () => {
 
       await connection.runCommand({ command: `DLTF FILE(${tempLib}/${testFile})`, noLibList: true });
 
-      const createResult = await runCommandsWithCCSID(connection, [`CRTSRCPF FILE(${tempLib}/${testFile}) RCDLEN(112) CCSID(${ccsidData.userDefaultCCSID})`], ccsidData.userDefaultCCSID);
+      const createResult = await runCommandsWithCCSID(connection, [`CRTSRCPF FILE(${tempLib}/${testFile}) RCDLEN(112) CCSID(${ccsidData.runtimeCcsid})`], ccsidData.runtimeCcsid);
       expect(createResult.code).toBe(0);
       try {
         const addPf = await connection.runCommand({ command: `ADDPFM FILE(${tempLib}/${testFile}) MBR(${testMember}) SRCTYPE(TXT)`, noLibList: true });
         expect(addPf.code).toBe(0);
 
         const attributes = await connection.getContent().getAttributes({ library: tempLib, name: testFile, member: testMember }, `CCSID`);
         expect(attributes).toBeTruthy();
-        expect(attributes![`CCSID`]).toBe(String(ccsidData.userDefaultCCSID));
+        expect(attributes![`CCSID`]).toBe(String(ccsidData.runtimeCcsid));
 
         const addPfB = await connection.runCommand({ command: `ADDPFM FILE(${tempLib}/${testFile}) MBR(${variantMember}) SRCTYPE(TXT)`, noLibList: true });
         expect(addPfB.code).toBe(0);
 
         const attributesB = await connection.getContent().getAttributes({ library: tempLib, name: testFile, member: variantMember }, `CCSID`);
         expect(attributesB).toBeTruthy();
-        expect(attributesB![`CCSID`]).toBe(String(ccsidData.userDefaultCCSID));
+        expect(attributesB![`CCSID`]).toBe(String(ccsidData.runtimeCcsid));
 
         const objects = await connection.getContent().getObjectList({ library: tempLib, types: [`*SRCPF`] });
         expect(objects.length).toBeTruthy();
@@ -366,7 +367,6 @@ describe('Encoding tests', { concurrent: true }, () => {
         await connection.getContent().uploadMemberContent(tempLib, testFile, testMember, [`**free`, `dsply 'Hello world';`, `   `, `   `, `return;`].join(`\n`));
 
         const compileResult = await connection.runCommand({ command: `CRTBNDRPG PGM(${tempLib}/${testMember}) SRCFILE(${tempLib}/${testFile}) SRCMBR(${testMember})`, noLibList: true });
-        console.log(compileResult);
         expect(compileResult.code).toBe(0);
 
         await connection.runCommand({ command: `DLTOBJ OBJ(${tempLib}/${testMember}) OBJTYPE(*PGM)`, noLibList: true });