Make cobol-check insert FD variables in the FD area and not in WS. This removes naming collisions (Handle 88 level spanning multiple lines)

.gitignore

@@ -2,7 +2,6 @@
 *~
 *.lock
 *.DS_Store
-*.swp
 *.out
 ALLTESTS
 ALPHAT
@@ -51,7 +50,6 @@ hs_err_pid*
 ##############################
 ## Maven
 ##############################
-target/
 pom.xml.tag
 pom.xml.releaseBackup
 pom.xml.versionsBackup

approvaltest

@@ -1,6 +1,6 @@
-./cobolcheck -p NUMBERS > approval-test-actual.txt
-./cobolcheck -p ALPHA >> approval-test-actual.txt
-./cobolcheck -p GREETING >> approval-test-actual.txt
-./cobolcheck -p FILECOPY >> approval-test-actual.txt
-./cobolcheck -p MOCKTEST >> approval-test-actual.txt
-./cobolcheck -p DPICNUMBERS >> approval-test-actual.txt
+./temp/approvalTest/cobolcheck -p NUMBERS > ./actual-output.txt
+./temp/approvalTest/cobolcheck -p ALPHA >> ./actual-output.txt
+./temp/approvalTest/cobolcheck -p GREETING >> ./actual-output.txt
+./temp/approvalTest/cobolcheck -p FILECOPY >> ./actual-output.txt
+./temp/approvalTest/cobolcheck -p MOCKTEST >> ./actual-output.txt
+./temp/approvalTest/cobolcheck -p DPICNUMBERS >> ./actual-output.txt

approvaltestWin.cmd

@@ -1 +1 @@
-./cobolcheck -p ALPHA DB2PROG DPICNUMBERS FILECOPY GREETING MOCK MOCKPARA MOCKTEST NUMBERS RETURNCODE TESTNESTED LONGLINESANDNUMBERS > approval-test-actual.txt
+temp/approvalTest/cobolcheck.cmd -p NUMBERS ALPHA GREETING FILECOPY MOCKTEST DPICNUMBERS  > actual-output.txt

build.gradle

@@ -11,8 +11,8 @@ def productName = 'cobol-check'
 group = 'org.openmainframeproject'
 description = 'Unit testing framework for Cobol'
 
-def approvalExpectedOutput = "approval-test-expected.txt"
-def approvalActualOutput = "output/testResults.txt"
+def approvalExpectedOutput = "./expected-output.txt"
+def approvalActualOutput = "./actual-output.txt"
 
 sonarqube {
     properties {
@@ -162,12 +162,17 @@ task copyJarToExtension(type: Copy) {
 
 task copyRunScripts(type: Copy) {
     description 'Makes copies of run scripts'
+
+    // copy and modify run scripts for bin version
     from "${projectDir}/cobolcheck.cmd"
-    into "${projectDir}/GradleTemp"
+    into "${projectDir}/temp/approvalTest"
     filter { line -> line.replaceAll('@VERSION@', productVersion) }
     from "${projectDir}/cobolcheck"
-    into "${projectDir}/GradleTemp"
+    into "${projectDir}/temp/approvalTest"
     filter { line -> line.replaceAll('@VERSION@', productVersion) }
+
+    println("Copied with jar version ${productVersion} to approvalTest directory")
+
 }
 
 task prepareDistribution(type: Zip) {
@@ -185,37 +190,52 @@ task prepareDistribution(type: Zip) {
         rename("build/libs/(.*)", "\$1")
     }
 
-    from ("${projectDir}/GradleTemp")
+    from ("${projectDir}/gradleBuildTemp")
 
     doLast {
-        delete "GradleTemp"
+        delete "${projectDir}/gradleBuildTemp"
     }
 }
 
-def approvalTest = tasks.register("approvalTest", Test) {
+def approvalTest
+approvalTest = tasks.register("approvalTest", Test) {
     description 'Run approval test only'
-    dependsOn fatJar
+    dependsOn copyJarToBin, copyRunScripts
+
     def output = -1
+    def weRanATest = false
+    def runningOs = OS_NAME.toLowerCase()
 
-    if ("${OS_NAME}" == "linux") {
+    if (runningOs == "linux") {
         println "Linux detected"
+
+        // grant execute permission to run script
+        def procChmod = "chmod +x ./approvaltest".execute()
+        procChmod.waitForProcessOutput(System.out, System.err)
+
         def proc = "./approvaltest".execute()
         proc.waitForProcessOutput(System.out, System.err)
+        weRanATest = true
     }
-    if ("${OS_NAME}".toLowerCase().contains("windows")) {
+    if (runningOs.contains("windows")) {
         println "Windows detected"
         def proc = "./approvaltestWin.cmd".execute()
         proc.waitForProcessOutput(System.out, System.err)
+        weRanATest = true
     }
 
-    output = new BuildHelper().compareFiles(approvalExpectedOutput, approvalActualOutput, true)
-    println "exit from compare: ${output}"
-
-    if (output != 0) {
-        println "*** FAIL ***"
-        throw new StopExecutionException("${approvalExpectedOutput} and ${approvalActualOutput} are different")
+    if (!weRanATest){
+        println "No prepared test for the OS detected: ${runningOs} - skipping"
     } else {
-        println "${approvalExpectedOutput} matches ${approvalActualOutput} - PASS"
+        output = new BuildHelper().compareFiles(approvalExpectedOutput, approvalActualOutput, true)
+        println "exit from compare: ${output}"
+
+        if (output != 0) {
+            println "*** FAIL ***"
+            throw new StopExecutionException("${approvalExpectedOutput} and ${approvalActualOutput} are different")
+        } else {
+            println "${approvalExpectedOutput} matches ${approvalActualOutput} - PASS"
+        }
     }
 }
 
@@ -241,7 +261,7 @@ task osInfo {
 }
 
 class BuildHelper{
-    int compareFiles(String file1, String file2, boolean trimLines){
+    static int compareFiles(String file1, String file2, boolean trimLines){
         BufferedReader reader1
         BufferedReader reader2
         try{

config.properties

@@ -58,7 +58,7 @@ cobolcheck.append.rules = null
 # cobolcheck.test.program.path = /home/myName/temp
 # cobolcheck.test.program.path = c:\\Developer\\temp
 # cobolcheck.test.program.path = c:/Developer/temp
-cobolcheck.test.program.path = ./
+cobolcheck.test.program.path = ./testruns
 
 #---------------------------------------------------------------------------------------------------------------------
 # Suffix to append to the name of each program under test to produce the name of the corresponding
@@ -73,13 +73,13 @@ cobolcheck.test.program.name = CC##99.CBL
 # When true, COBOL Check will report the unmocked calls, and the test summary will contain the number of unmocked calls.
 # Default: false
 #---------------------------------------------------------------------------------------------------------------------
-cobolcheck.test.unmockcall.display = false
+cobolcheck.test.unmockcall.display =false
 
 #---------------------------------------------------------------------------------------------------------------------
 # Path for the generated testsuite parse error log
 # Default: ./
 #---------------------------------------------------------------------------------------------------------------------
-testsuite.parser.error.log.path = ./
+testsuite.parser.error.log.path = ./testruns
 
 #---------------------------------------------------------------------------------------------------------------------
 # Name of the generated testsuite parse error log file - with extension
@@ -132,7 +132,7 @@ test.suite.directory = src/test/cobol
 #---------------------------------------------------------------------------------------------------------------------
 # Location of test output. File extension is determined by a given format.
 #---------------------------------------------------------------------------------------------------------------------
-test.results.file = output/testResults
+test.results.file = testruns/testResults
 
 #---------------------------------------------------------------------------------------------------------------------
 # Determines the format of the test results written to the output file.
@@ -173,7 +173,7 @@ application.copybook.filename.suffix = CBL,cbl,COB,cob,CPY,cpy
 # This is the relative or absolute path of the concatenated file. If not specified, the default
 # is "./ALLTESTS" relative to the directory in which Cobol Check was started.
 #---------------------------------------------------------------------------------------------------------------------
-concatenated.test.suites = ./ALLTESTS
+concatenated.test.suites = ./testruns/ALLTESTS
 
 #---------------------------------------------------------------------------------------------------------------------
 # The GnuCOBOL compiler has a lot of different compile options.

src/main/cobol/MOCKTEST.CBL

@@ -10,7 +10,7 @@
        WORKING-STORAGE SECTION.
        01  FILLER.
            05  VALUE-1           PIC X(80).
-           05  VALUE-2           PIC X(80).
+           05  VALUE-2           PIC X(80) Value 'initial'.
            05  VALUE-3           PIC X(80).
            05  TEMP              PIC X(80).
 
@@ -85,15 +85,15 @@
            CALL 'PROG1'
            .
 
-       610-MAKE-CALL-VALUE-IN-STRUCTURE.
-           MOVE "1" to ACTION-PARAM
-           MOVE "2" to BOOK-PARAM
-           MOVE "3" to OUTPUT-VALUE
-           CALL 'MYCOBOL' USING ACTION-PARAM,
-                                BOOK-PARAM IN BOOK-STRUCTURE,
-                                OUTPUT-PARAM
+       610-CALL-VALUE-IN-STRUCTURE.
+           MOVE "1" to action-value
+           MOVE "2" to book-value
+           MOVE "3" to output-value
+           CALL 'MYCOBOL' USING action-value,
+                                book-value IN BOOK-STRUCTURE,
+                                output-value
            END-CALL
-           MOVE OUTPUT-PARAM TO VALUE-1
+           MOVE OUTPUT-VALUE TO VALUE-1
            .
 
        700-MAKE-CALL.
@@ -115,7 +115,7 @@
               BY CONTENT VALUE-1,
               BY VALUE VALUE-2,
               VALUE-3
-          CALL 'PROG3' USING VALUE-1.
+           CALL 'PROG3' USING VALUE-1.
 
        900-MAKE-CALL.
            CALL 'PROGRAM' USING VALUE-1

src/main/cobol/REPLAC.CBL

@@ -0,0 +1,65 @@
+       IDENTIFICATION DIVISION.
+       PROGRAM-ID.  GREETING.
+      *****************************************************************
+      * Trivial program to exercise CobolCheck.
+      * With regards to REPLACE statement.
+      *****************************************************************       
+       ENVIRONMENT DIVISION.
+       INPUT-OUTPUT SECTION.
+       FILE-CONTROL.
+       DATA DIVISION.
+       WORKING-STORAGE SECTION.
+
+           REPLACE  ==:PROGRAM:==  BY ==REPDEMO3==
+                    ==:REQUEST:==  BY ==UPDATE-MY-ADVANCED-REQUEST==
+                    ==:RESPONSE:== BY ==UPDATE-MY-ADVANCED-RESPONSE==.
+
+123456 01  FILLER.
+           05  WS-COUNT           PIC S9(5) COMP-3.
+           05  FILLER             PIC X VALUE 'G'.
+               88  MESSAGE-IS-GREETING  VALUE 'G'.
+               88  MESSAGE-IS-FAREWELL  VALUE 'F'.
+       01  WS-FRIEND           PIC X(10) VALUE SPACES.
+       01  WS-GREETING.
+               10  FILLER          PIC X(07) VALUE 'Hello, '.
+               10  WS-USER-NAME    PIC X(05) VALUE SPACES.
+               10  FILLER          PIC X     VALUE '!'.
+       01  WS-FAREWELL.
+               10  FILLER          PIC X(15) VALUE 'See you later, '.
+               10  WS-USER-NAME    PIC X(09) VALUE SPACES.
+               10  FILLER          PIC X     VALUE '!'.
+
+       01  :program:-param         PIC X(10) VALUE "program".
+       01  :request:-data       PIC X(10) VALUE "data data".
+       01  :response:-element      PIC X(10) VALUE ".response.".
+
+       PROCEDURE DIVISION.
+
+           ACCEPT WS-FRIEND.
+
+
+       2000-SPEAK.
+           IF MESSAGE-IS-GREETING
+               IF WS-FRIEND EQUAL SPACES
+                   MOVE 'World' TO WS-USER-NAME OF WS-GREETING
+               ELSE
+                   MOVE WS-FRIEND TO WS-USER-NAME OF WS-GREETING
+               END-IF
+           END-IF
+           IF MESSAGE-IS-FAREWELL
+               IF WS-FRIEND EQUAL SPACES
+                   MOVE 'alligator!' TO WS-USER-NAME OF WS-FAREWELL
+               ELSE
+                   MOVE WS-FRIEND TO WS-USER-NAME OF WS-FAREWELL
+               END-IF
+           END-IF
+           .
+
+       3000-SAY-NO-MORE.
+              DISPLAY WS-GREETING :PROGRAM:-param
+              DISPLAY WS-FAREWELL :PROGRAM:-param :REQUEST:-data
+              DISPLAY :PROGRAM:-param :REQUEST:-data :RESPONSE:-element
+           .
+
+       9999-END.
+           .