item #10 progress toward preparing batch files for Generator

ALLTESTS

@@ -0,0 +1 @@
+           TESTSUITE 'GREETING AND FAREWELL (FAREWELL WILL FAIL)'           TESTCASE 'IT RETURNS HELLO, WORLD! AS GREETING'            MOVE 'GREETING' TO WS-MESSAGE-TYPE           PERFORM 2000-SPEAK           EXPECT WS-MESSAGE TO BE 'HELLO, WORLD!'           TESTCASE 'IT RETURNS GOODBYE, CRUEL WORLD! AS FAREWELL'            MOVE 'FAREWELL' TO WS-MESSAGE-TYPE           PERFORM 2000-SPEAK           EXPECT WS-MESSAGE TO BE 'GOODBYE, CRUEL WORLD!'           TESTSUITE 'GREETING AND FAREWELL (FAREWELL WILL FAIL)'           TESTCASE 'IT RETURNS HELLO, WORLD! AS GREETING'            MOVE 'GREETING' TO WS-MESSAGE-TYPE           PERFORM 2000-SPEAK           EXPECT WS-MESSAGE TO BE 'HELLO, WORLD!'           TESTCASE 'IT RETURNS GOODBYE, CRUEL WORLD! AS FAREWELL'            MOVE 'FAREWELL' TO WS-MESSAGE-TYPE           PERFORM 2000-SPEAK           EXPECT WS-MESSAGE TO BE 'GOODBYE, CRUEL WORLD!'

config.properties

@@ -32,7 +32,7 @@ application.copybook.directory = copybooks
 application.copybook.filename.suffix = none
 
 # optional override of system default Locale
-locale.language = ja
+#locale.language = ja
 #locale.country =
 #locale.variant =
 

src/main/java/com/neopragma/cobolcheck/Driver.java

@@ -48,7 +48,8 @@ public class Driver implements Constants, StringHelper {
             "      Default: INFO",
             "  -t|--test-suite-path absolute-or-relative-path[:absolute-or-relative-path[...]]",
             "      Location(s) of test suite input file(s) for this run. Values specified here are prefixed",
-            "      to those specified in the config file as test.suite.path (if any)."
+            "      to those specified in the config file as test.suite.path (if any). Globs are supported here",
+            "      but not in the config file."
     };
 
     public Driver(
@@ -73,8 +74,6 @@ void run() {
     }
 
     void prepareInputAndOutputFiles() {
-
-        //TODO: concatenate test suite files
         TestSuiteConcatenator concatenator =
                 new TestSuiteConcatenator(config, options);
         testSuite = concatenator.concatenateTestSuites();

src/main/java/com/neopragma/cobolcheck/GetOpt.java

@@ -108,10 +108,6 @@ private void processCommandLineArgumentArray(String[] args) {
         OptionValue optionValue = new OptionValue();
         String lastOption = EMPTY_STRING;
         for (String argValue : args) {
-
-            System.out.println("argValue: " + argValue);
-
-
             if (isKey(argValue)) {
                 if (expectValueNext) throw new CommandLineArgumentException(
                         messages.get("ERR004", lastOption, argValue)

src/main/java/com/neopragma/cobolcheck/TestSuiteConcatenator.java

@@ -37,7 +37,7 @@ public class TestSuiteConcatenator implements Constants, StringHelper {
     private Config config;
     private Messages messages;
     private GetOpt options;
-    private Reader testSuite;
+    private BufferedReader testSuite;
 
     public TestSuiteConcatenator(Config config, GetOpt options) {
         this.config = config;
@@ -88,17 +88,19 @@ Reader concatenateTestSuites() {
         }
         String[] testSuitePathList = testSuitePaths.toString().split(COLON);
 
-        String line = EMPTY_STRING;
+        String line;
         for (String pathname : testSuitePathList) {
             try {
                 Log.info(messages.get("INF007", pathname, concatenatedTestSuiteFileName));
-                testSuite = new FileReader(pathname);
-            } catch (FileNotFoundException testSuiteException) {
+                testSuite = new BufferedReader(new FileReader(pathname));
+                while ((line = testSuite.readLine()) != null) {
+                    concatenatedTestSuitesWriter.write(line);
+                }
+            } catch (IOException testSuiteNotFound) {
                 throw new TestSuiteInputFileNotFoundException(
                         messages.get("ERR011", pathname),
-                        testSuiteException);
+                        testSuiteNotFound);
             }
-
         }
         FileReader testSuite;
         try {

testfiles/SECOND-TESTSUITE

@@ -0,0 +1,11 @@
+           TESTSUITE 'GREETING AND FAREWELL (FAREWELL WILL FAIL)'
+
+           TESTCASE 'IT RETURNS HELLO, WORLD! AS GREETING' 
+           MOVE 'GREETING' TO WS-MESSAGE-TYPE
+           PERFORM 2000-SPEAK
+           EXPECT WS-MESSAGE TO BE 'HELLO, WORLD!'
+
+           TESTCASE 'IT RETURNS GOODBYE, CRUEL WORLD! AS FAREWELL' 
+           MOVE 'FAREWELL' TO WS-MESSAGE-TYPE
+           PERFORM 2000-SPEAK
+           EXPECT WS-MESSAGE TO BE 'GOODBYE, CRUEL WORLD!'