TAZ and test framework fixes (#564)

* Fixes to TAZ updates
* Updating preview build test case

Signed-off-by: Dennis Behm <dennis.behm@de.ibm.com>

Author: dennis-behm

test/applications/MortgageApplication/test.properties

@@ -67,9 +67,9 @@ impactBuild_changedFiles = bms/epsmort.bms,cobol/epsmlist.cbl,copybook/epsmtout.
 impactBuild_datasetsToCleanUp = BMS,COBOL,LINK
 #
 # Use file properties to associate expected files built to changed files
-impactBuild_expectedFilesBuilt = epsmort.bms,epscmort.cbl :: bms/epsmort.bms
+impactBuild_expectedFilesBuilt = epsmort.bms,epscmort.cbl,epsnbrvl.cbl :: bms/epsmort.bms
 impactBuild_expectedFilesBuilt = epsmlist.cbl,epsmlist.lnk :: cobol/epsmlist.cbl
-impactBuild_expectedFilesBuilt = epsmlist.cbl,epscsmrt.cbl,epscmort.cbl,epsmlist.lnk :: copybook/epsmtout.cpy
+impactBuild_expectedFilesBuilt = epsmlist.cbl,epscsmrt.cbl,epscmort.cbl,epsmlist.lnk,epsnbrvl.cbl :: copybook/epsmtout.cpy
 impactBuild_expectedFilesBuilt = epsmlist.lnk :: link/epsmlist.lnk
 
 
@@ -124,7 +124,7 @@ impactBuild_preview_changedFiles = copybook/epsmtout.cpy
 impactBuild_preview_datasetsToCleanUp = BMS,COBOL,LINK
 #
 # Use file properties to associate expected files built to changed files
-impactBuild_preview_expectedFilesBuilt = epsmlist.cbl,epscsmrt.cbl,epscmort.cbl,epsmlist.lnk :: copybook/epsmtout.cpy
+impactBuild_preview_expectedFilesBuilt = epsmlist.cbl,epscsmrt.cbl,epscmort.cbl,epsmlist.lnk,epsnbrvl.cbl :: copybook/epsmtout.cpy
 
 
 #############################

test/testScripts/impactBuild_preview.groovy

@@ -111,14 +111,14 @@ def validateImpactBuild(String changedFile, PropertyMappings filesBuiltMappings,
 
     try{
 	// Validate clean build
-	assert outputStream.contains("Build State : CLEAN") : "*! IMPACT BUILD FAILED FOR $changedFile\nOUTPUT STREAM:\n$outputStream\n"
+	assert outputStream.contains("Build State : CLEAN") : "*! IMPACT BUILD WITH PREVIEW FOR $changedFile\nOUTPUT STREAM:\n$outputStream\n"
 
 	// Validate expected number of files built
 	def numImpactFiles = expectedFilesBuiltList.size()
-	assert outputStream.contains("Total files processed : ${numImpactFiles}") : "*! IMPACT BUILD FOR $changedFile TOTAL FILES PROCESSED ARE NOT EQUAL TO ${numImpactFiles}\nOUTPUT STREAM:\n$outputStream\n"
+	assert outputStream.contains("Total files processed : ${numImpactFiles}") : "*! IMPACT BUILD WITH PREVIEW FOR $changedFile TOTAL FILES PROCESSED ARE NOT EQUAL TO ${numImpactFiles}\nOUTPUT STREAM:\n$outputStream\n"
 
 	// Validate expected built files in output stream
-	assert expectedFilesBuiltList.count{ i-> outputStream.contains(i) } == expectedFilesBuiltList.size() : "*! IMPACT BUILD FOR $changedFile DOES NOT CONTAIN THE LIST OF BUILT FILES EXPECTED ${expectedFilesBuiltList}\nOUTPUT STREAM:\n$outputStream\n"
+	assert expectedFilesBuiltList.count{ i-> outputStream.contains(i) } == expectedFilesBuiltList.size() : "*! IMPACT BUILD WITH PREVIEW FOR $changedFile DOES NOT CONTAIN THE LIST OF BUILT FILES EXPECTED ${expectedFilesBuiltList}\nOUTPUT STREAM:\n$outputStream\n"
 
 	println "**"
 	println "** IMPACT BUILD WITH PREVIEW TEST : PASSED FOR $changedFile **"

utilities/ImpactUtilities.groovy

@@ -64,8 +64,8 @@ def createImpactBuildList() {
 			// if the changed file has a build script then add to build list
 			if (ScriptMappings.getScriptName(changedFile)) {
 				// skip adding generated test cases, when the testing is disabled 
-				if (buildUtils.isGeneratedzUnitTestCaseProgram(changedFile) && !(props.runzTests && props.runzTests.toBoolean())) {
-					if (props.verbose) println "** Identified $changedFile as a generated zunit test case program. Processing zUnit tests is not enabled for this build. Skip building this program."
+				if (buildUtils.isGeneratedTazTestCaseProgram(changedFile) && !(props.runzTests && props.runzTests.toBoolean())) {
+					if (props.verbose) println "** Identified $changedFile as a generated TAZ unit test case program. Processing TAZ unit tests is not enabled for this build. Skip building this program."
 				} else {
 					buildSet.add(changedFile)
 					if (props.verbose) println "** Found build script mapping for $changedFile. Adding to build list"
@@ -802,7 +802,7 @@ def boolean shouldCalculateImpacts(String changedFile){
 	if (onskipImpactCalculationList) return false
 
 	// return false if the changed file is a generated test case program but testing is disabled
-	if (buildUtils.isGeneratedzUnitTestCaseProgram(changedFile) && !(props.runzTests && props.runzTests.toBoolean())) {
+	if (buildUtils.isGeneratedTazTestCaseProgram(changedFile) && !(props.runzTests && props.runzTests.toBoolean())) {
 		return false
 	}