Merge pull request #974 from NASA-PDS/i967

NASA-PDS/PDS4-CCB#28 Test cases for allowing whitespace in numeric fields in delimited tables

Author: jordanpadams

model-lddtool/src/site/markdown/developer/contribute.md

@@ -27,23 +27,25 @@ A recording of a meeting where we went through tutorial can be [found here](http
 ```
     @my_tutorial
     Examples: 
-| testId | testName | testDir     | messageCount | messageText         | problemEnum        | commandArgs                                             | ingestLDDFileName         |
+| testId | testName | testDir     | messageCount | problemEnum        | commandArgs                                             | ingestLDDFileName         | pds4Version | enableContentValidation |
 ```
 * Add new line(s) for test cases to `src/test/resources/features/validate.feature`: (NOTE: This feature file is organized by minor versions, 15.2.x, 15.3.x, etc. based upon the next expected minor version. If the next minor version is not included create a new section of the document. Contact Jordan for more details if needed.)
 * 
   * **testId** - this should be the GitHub reference to the applicable Github ticket. For this use case, that should be set to `NASA-PDS/pds4-information-model#753`
   * **testName** - title for the test that would be useful from someone trying to review a test plan with that title.  For this use case, that should be set to `My test for new Current units nA, microA`
   * **testDir** - directory under `odel-lddtool/src/test/resources/` where your test data exists.  For this use case, that should be set to `github753b`
   * **messageCount** - number of expected errors or warnings. For this use case, that should be set to `0` (success).
-  * **messageText** - the expected output should match very closely to messageCount, e.g. `4 errors expected`, `8 warnings expected` (not sure how this is really used or why we have this right now...). For this use case, that should be set to `0 errors expected` (success).
-  * **problemEnum** - `totalErrors`, `totalWarnings`, or specific error you expect from validate output. For this use case, that should be set to `SCHEMATRON_ERROR`
+  * **problemEnum** - `totalErrors`, `totalWarnings`, or specific error you expect from validate output. For this use case, that should be set to `totalErrors`
     * for specific error, search [Validate ProblemTypes](https://github.com/NASA-PDS/validate/blob/main/src/main/java/gov/nasa/pds/tools/validate/ProblemType.java) for the error identifier, and put the ALL CAPS value in the file, e.g. for `error.label.schematron`, if I search the file I see this line `SCHEMATRON_ERROR("error.label.schematron")`, so the problemEnum value == `SCHEMATRON_ERROR`
   * **commandArgs** - these are the Validate Tool command-line arguments. For this example, let's set the target directory `--target {resourceDir}/github753/pc__d139.xml`. By default, the following are already included for validate under the hood of the test code: 
     * `--disable-context-mismatch-warnings`
     * `--report-style json`
-    * `--skip-content-validation`
+    * `--skip-content-validation` (unless `enableContentValidation` is set to `"true"`)
+    * `--skip-context-validation`
     * `--report-file {reportDir}/...`
   * **ingestLDDFileName** - the IngestLDD filenames you would like to have LDDTool generate the schema/schmematron for testing. These files should be in the test directory created earlier.
+  * **pds4Version** - the PDS4 Information Model version to use (e.g., `"1C00"`, `"1D00"`). Leave empty (`""`) to use the latest version.
+  * **enableContentValidation** - set to `"true"` to enable content validation for this test case (e.g., when testing table content validation). Default is `"false"`.
 * Now run the test(s):
   * Via Eclipse: right-click `Run as` -> `Cucumber Feature`
   * Via Maven (replace with applicable tag for this build):

model-lddtool/src/test/java/cucumber/ValidateStepDefs.java

@@ -29,9 +29,11 @@ public class ValidateStepDefs {
 
   private static final Logger LOG = LoggerFactory.getLogger(ValidateStepDefs.class);
   private static final String DEFAULT_REPORT_FILENAME = "report_{testDir}.json";
-  private static final String DEFAULT_VALIDATE_ARGS =
-      "--disable-context-mismatch-warnings --report-style json --skip-content-validation --skip-context-validation --report-file {reportDir}/"
-          + DEFAULT_REPORT_FILENAME + " ";
+  private static final String DEFAULT_VALIDATE_ARGS_BASE =
+      "--disable-context-mismatch-warnings --report-style json ";
+  private static final String DEFAULT_VALIDATE_SKIP_CONTENT = "--skip-content-validation ";
+  private static final String DEFAULT_VALIDATE_ARGS_SUFFIX =
+      "--skip-context-validation --report-file {reportDir}/" + DEFAULT_REPORT_FILENAME + " ";
   private static final String DEFAULT_CORE_ARGS = "-p";
   private static final String DEFAULT_LDDTOOL_ARGS = "-lp";
   private static final String PINNED_VERSION_DIR = "pinned_version";
@@ -72,6 +74,7 @@ public class ValidateStepDefs {
   private String reportDir;
   private String commandArgs;
   private String refOutputValue;
+  private boolean enableContentValidation;
 
 
   @Before
@@ -195,6 +198,12 @@ public void with_test_property(int messageCount, String problemEnum) {
         + "]");
   }
 
+  @Given("content validation is enabled {string}")
+  public void content_validation_is_enabled(String enableContentValidation) {
+    this.enableContentValidation = enableContentValidation.equalsIgnoreCase("true");
+    LOG.debug("content_validation_is_enabled: " + this.enableContentValidation);
+  }
+
   @Given("the latest PDS4 schema\\/schematron is generated for IM Version {string}")
   public void generate_pds4_schema(String pds4Version) throws Exception {
     String lddtoolArgs = DEFAULT_CORE_ARGS;
@@ -348,7 +357,15 @@ private String getAbsolutePath(String path) throws Exception {
 
   private String[] getDefaultValidateArguments(String commandArgs) throws URISyntaxException {
     List<String> argsList = new ArrayList<String>();
-    String[] args = DEFAULT_VALIDATE_ARGS.concat(this.commandArgs).split("\\s+");
+    
+    // Build validate args conditionally based on enableContentValidation
+    String validateArgs = DEFAULT_VALIDATE_ARGS_BASE;
+    if (!this.enableContentValidation) {
+      validateArgs += DEFAULT_VALIDATE_SKIP_CONTENT;
+    }
+    validateArgs += DEFAULT_VALIDATE_ARGS_SUFFIX;
+    
+    String[] args = validateArgs.concat(this.commandArgs).split("\\s+");
 
     // Get schema
     String[] schemas = Utility