From fc5b9c34ce79a7e10b80fc56baed2455f068234f Mon Sep 17 00:00:00 2001 From: worksofliam Date: Thu, 1 Feb 2024 13:28:40 -0500 Subject: [PATCH] Use different CCSID to test CCSIDs can differ between directories --- cli/test/fixtures/pseudo/qrpglesrc/.ibmi.json | 2 +- cli/test/pseudo.test.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/test/fixtures/pseudo/qrpglesrc/.ibmi.json b/cli/test/fixtures/pseudo/qrpglesrc/.ibmi.json index 5bae580..37389b6 100644 --- a/cli/test/fixtures/pseudo/qrpglesrc/.ibmi.json +++ b/cli/test/fixtures/pseudo/qrpglesrc/.ibmi.json @@ -1,6 +1,6 @@ { "version": "0.0.1", "build": { - "tgtCcsid": "37" + "tgtCcsid": "273" } } \ No newline at end of file diff --git a/cli/test/pseudo.test.ts b/cli/test/pseudo.test.ts index 98d7fa7..bf01d42 100644 --- a/cli/test/pseudo.test.ts +++ b/cli/test/pseudo.test.ts @@ -46,7 +46,7 @@ describe.skipIf(files.length === 0)(`psuedo tests`, () => { // Rules.mk rules const testerProgram = makefile.findIndex(l => l.startsWith(`$(PREPATH)/TESTER.PGM: qrpglesrc/tester.pgm.rpgle`)); expect(testerProgram).toBeGreaterThan(-1); - expect(makefile[testerProgram + 3]).toBe(`\tsystem "CRTBNDRPG PGM($(BIN_LIB)/TESTER) SRCSTMF('qrpglesrc/tester.pgm.rpgle') OPTION(*EVENTF) DBGVIEW(*SOURCE) TGTRLS(*CURRENT) TGTCCSID(37) BNDDIR(MYBND) DFTACTGRP(*NO) TEXT('My program')" > .logs/tester.splf`); + expect(makefile[testerProgram + 3]).toBe(`\tsystem "CRTBNDRPG PGM($(BIN_LIB)/TESTER) SRCSTMF('qrpglesrc/tester.pgm.rpgle') OPTION(*EVENTF) DBGVIEW(*SOURCE) TGTRLS(*CURRENT) TGTCCSID(273) BNDDIR(MYBND) DFTACTGRP(*NO) TEXT('My program')" > .logs/tester.splf`); // Covers: // Rules.mk rules @@ -62,7 +62,7 @@ describe.skipIf(files.length === 0)(`psuedo tests`, () => { // .ibmi.json -> tgtCcsid -> updating COMPILEOPT const testerProgram = makefile.findIndex(l => l.startsWith(`$(PREPATH)/OTHER.PGM: qrpglesrc/other.pgm.sqlrpgle`)); expect(testerProgram).toBeGreaterThan(-1); - expect(makefile[testerProgram + 3]).toBe(`\tsystem "CRTSQLRPGI OBJ($(BIN_LIB)/OTHER) SRCSTMF('qrpglesrc/other.pgm.sqlrpgle') COMMIT(*NONE) DBGVIEW(*SOURCE) OPTION(*EVENTF) RPGPPOPT(*LVL2) COMPILEOPT('TGTCCSID(37) BNDDIR($(BNDDIR)) DFTACTGRP(*no)')" > .logs/other.splf`); + expect(makefile[testerProgram + 3]).toBe(`\tsystem "CRTSQLRPGI OBJ($(BIN_LIB)/OTHER) SRCSTMF('qrpglesrc/other.pgm.sqlrpgle') COMMIT(*NONE) DBGVIEW(*SOURCE) OPTION(*EVENTF) RPGPPOPT(*LVL2) COMPILEOPT('TGTCCSID(273) BNDDIR($(BNDDIR)) DFTACTGRP(*no)')" > .logs/other.splf`); }); test(`Ensure TGTCCSID is applied to CRTSRCPF CCSID`, () => {