From a0f3650f6fcb941d9991960b357d1660d32e7b43 Mon Sep 17 00:00:00 2001 From: Al Niessner Date: Thu, 7 Nov 2024 10:31:58 -0800 Subject: [PATCH 1/3] add internal error check --- model-lddtool/src/test/java/cucumber/ValidateStepDefs.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/model-lddtool/src/test/java/cucumber/ValidateStepDefs.java b/model-lddtool/src/test/java/cucumber/ValidateStepDefs.java index 9f4f5f98..6a3e8b4e 100644 --- a/model-lddtool/src/test/java/cucumber/ValidateStepDefs.java +++ b/model-lddtool/src/test/java/cucumber/ValidateStepDefs.java @@ -211,9 +211,7 @@ public void execute_a_validate_command(String commandArgs) { // [], we have to // convert this.commandArgs into an array of strings. String[] args = this.resolveArgumentStrings(commandArgs); - this.launcher.processMain(args); - this.tearDown(); // Will do the compare of the report in another function. @@ -248,8 +246,9 @@ public void produced_output_from_validate_command_should_be_similar_to_reference + this.refOutputValue); // Compare the count from this test with the this.messageCount from test table. - assertEquals(count, this.messageCount, this.messageText + " " + reportJson.toString()); - + assertEquals(this.messageCount, count, this.messageText + " " + reportJson.toString()); + assertEquals(0, this.getMessageCountBasedOnProblemType("INTERNAL_ERROR,ARRAY_INTERNAL_ERROR,TABLE_INTERNAL_ERROR", reportJson), + "Required that internal errors do not occur."); } catch (ExitException e) { assertEquals(0, e.status, "Exit status"); } catch (Exception e) { From 0860fa768281a0d76fe906e5bc2713fa1ae8a7ee Mon Sep 17 00:00:00 2001 From: Al Niessner Date: Thu, 7 Nov 2024 10:35:30 -0800 Subject: [PATCH 2/3] use latest validate --- model-lddtool/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model-lddtool/pom.xml b/model-lddtool/pom.xml index 277f027d..1d0ef2db 100644 --- a/model-lddtool/pom.xml +++ b/model-lddtool/pom.xml @@ -197,7 +197,7 @@ gov.nasa.pds validate - 3.6.0-SNAPSHOT + 3.7.0-SNAPSHOT test From 9c88b290630b340efd792208c79fed467d4549db Mon Sep 17 00:00:00 2001 From: Al Niessner Date: Thu, 7 Nov 2024 10:59:13 -0800 Subject: [PATCH 3/3] enable all validate tests --- model-lddtool/src/test/resources/features/validate.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model-lddtool/src/test/resources/features/validate.feature b/model-lddtool/src/test/resources/features/validate.feature index 361a7df0..6f09385b 100644 --- a/model-lddtool/src/test/resources/features/validate.feature +++ b/model-lddtool/src/test/resources/features/validate.feature @@ -20,7 +20,7 @@ Feature: Running integration tests for validate module | "NASA-PDS/pds4-information-model#795 Test Schematron 2" | "github795b" | 1 | "1 errors expected" | "SCHEMATRON_ERROR" | "--target {resourceDir}/github795b/" | "" | - #| "NASA-PDS/pds4-information-model#797 Test Schematron 1" | "github797" | 3 | "3 errors expected" | "SCHEMATRON_ERROR" | "--target {resourceDir}/github797/test_label1_FAIL.xml {resourceDir}/github797/u5.xml" | "PDS4_GEOM_IngestLDD.xml" | + | "NASA-PDS/pds4-information-model#797 Test Schematron 1" | "github797" | 3 | "3 errors expected" | "SCHEMATRON_ERROR" | "--target {resourceDir}/github797/test_label1_FAIL.xml {resourceDir}/github797/u5.xml" | "PDS4_GEOM_IngestLDD.xml" |