If the source is .test, then force a T prefix in the name

Signed-off-by: worksofliam <[email protected]>

Author: worksofliam

cli/src/utils.ts

@@ -10,10 +10,16 @@ import { CommandParameters } from "./builders/environment";
 import { ReadFileSystem } from "./readFileSystem";
 
 export function getSystemNameFromPath(inputName: string) {
+	const isTest = inputName.toUpperCase().endsWith(`.TEST`);
 	let baseName = inputName.includes(`-`) ? inputName.split(`-`)[0] : inputName;
 
+	if (isTest) {
+		// Remove the .TEST part
+		baseName = baseName.substring(0, baseName.length - 5);
+	}
+
 	// If the name is of valid length, return it
-	if (baseName.length <= 10) {
+	if (baseName.length <= 10 && !isTest) {
 		return baseName.toUpperCase();
 	}
 
@@ -27,8 +33,9 @@ export function getSystemNameFromPath(inputName: string) {
 		name = parts[1];
 	}
 
-	if (baseName.toUpperCase().endsWith(`.TEST`)) {
-		name = name.substring(0, name.length - 5);
+	if (isTest) {
+		prefix = `T`;
+		name = name.toUpperCase();
 	}
 
 	// We start the system name with the suppliedPrefix

cli/test/cs_srvpgm.test.ts

@@ -28,7 +28,7 @@ describe(`pseudo tests`, () => {
     expect(targets).toBeDefined();
     expect(targets.binderRequired()).toBeFalsy();
 
-    const testModule = targets.getTarget({systemName: `EMPTEST`, type: `MODULE`});
+    const testModule = targets.getTarget({systemName: `TEMPTEST`, type: `MODULE`});
     expect(testModule).toBeDefined();
 
     expect(testModule.deps.length).toBe(3);
@@ -63,7 +63,7 @@ describe(`pseudo tests`, () => {
     expect(files[`Rules.mk`]).toBeDefined();
     expect(files[`Rules.mk`]).toBe(`SUBDIRS = qddssrc qrpglesrc qtestsrc`);
 
-    expect(files[path.join(`qtestsrc`, `Rules.mk`)]).toBe(`EMPTEST.MODULE: emptest.test.sqlrpgle qrpgleref/empdet.rpgleinc EMPLOYEE.FILE DEPARTMENT.FILE EMPDET.MODULE`)
+    expect(files[path.join(`qtestsrc`, `Rules.mk`)]).toBe(`TEMPTEST.MODULE: emptest.test.sqlrpgle qrpgleref/empdet.rpgleinc EMPLOYEE.FILE DEPARTMENT.FILE EMPDET.MODULE`)
 
     expect(files[path.join(`qrpglesrc`, `Rules.mk`)]).toContain(`EMPLOYEES.MODULE: employees.pgm.sqlrpgle qrpgleref/constants.rpgleinc qrpgleref/empdet.rpgleinc`);
     expect(files[path.join(`qrpglesrc`, `Rules.mk`)]).toContain(`EMPLOYEES.PGM: EMPLOYEE.FILE EMPS.FILE EMPDET.MODULE EMPLOYEES.MODULE`);

cli/test/cs_with_bnddir.test.ts

@@ -28,7 +28,7 @@ describe(`pseudo tests`, () => {
     expect(targets).toBeDefined();
     expect(targets.binderRequired()).toBeTruthy();
 
-    const testModule = targets.getTarget({systemName: `EMPDETT`, type: `MODULE`});
+    const testModule = targets.getTarget({systemName: `TEMPDETT`, type: `MODULE`});
     expect(testModule).toBeDefined();
 
     expect(testModule.deps.length).toBe(3);
@@ -59,8 +59,6 @@ describe(`pseudo tests`, () => {
 
     const contents = makefile.getMakefile().join(`\n`);
 
-    console.log(contents);
-
     expect(contents).toContain(`APP_BNDDIR=APP\n`);
     expect(contents).toContain(`BNDDIR=($(BIN_LIB)/$(APP_BNDDIR))\n`);
 
@@ -75,12 +73,11 @@ describe(`pseudo tests`, () => {
     const bobProject = new BobProject(targets);
 
     const files = bobProject.createRules();
-    console.log(files[`qrpglesrc/Rules.mk`]);
 
     expect(files[`Rules.mk`]).toBeDefined();
     expect(files[`Rules.mk`]).toBe(`SUBDIRS = qddssrc qrpglesrc qsqlsrc qtestsrc`);
 
-    expect(files[path.join(`qtestsrc`,`Rules.mk`)]).toBe(`EMPDETT.MODULE: empdett.test.sqlrpgle qrpgleref/empdet.rpgleinc EMPLOYEE.FILE DEPARTMENT.FILE APP.BNDDIR`)  
+    expect(files[path.join(`qtestsrc`,`Rules.mk`)]).toBe(`TEMPDETT.MODULE: empdett.test.sqlrpgle qrpgleref/empdet.rpgleinc EMPLOYEE.FILE DEPARTMENT.FILE APP.BNDDIR`)  
 
     expect(files[path.join(`qrpglesrc`,`Rules.mk`)]).toContain(`EMPDET.MODULE: empdet.sqlrpgle qrpgleref/empdet.rpgleinc EMPLOYEE.FILE DEPARTMENT.FILE`);  
     expect(files[path.join(`qrpglesrc`,`Rules.mk`)]).toContain(`EMPDET.SRVPGM: empdet.bnd EMPDET.MODULE`); 

cli/test/project.test.ts

@@ -86,7 +86,6 @@ describe(`company_system tests`, () => {
 
     expect(myPgm.headers).toBeDefined();
     expect(myPgm.headers.length).toBe(2);
-    console.log(myPgm.headers);
   });
 
   test(`Check utils`, async () => {
@@ -438,7 +437,6 @@ describe(`company_system tests`, () => {
     expect(resolvedObject.deps[0].systemName).toBe(`EMPLOYEE`);
 
     const logs = targets.logger.getLogsFor(resolvedObject.relativePath);
-    console.log(logs);
     expect(logs.length).toBe(0);
     // expect(logs[0].message).toBe(`Extension should be based on type. Suggested name is 'getTotalSalary.sqludf'`);
     // expect(logs[0].type).toBe(`warning`);

cli/test/project2.test.ts

@@ -430,7 +430,6 @@ describe(`company_system tests`, () => {
     expect(resolvedObject.deps[0].systemName).toBe(`EMPLOYEE`);
 
     const logs = targets.logger.getLogsFor(resolvedObject.relativePath);
-    console.log(logs);
     expect(logs.length).toBe(0);
     // expect(logs[0].message).toBe(`Extension should be based on type. Suggested name is 'getTotalSalary.sqludf'`);
     // expect(logs[0].type).toBe(`warning`);