From 04b0fc89832f0e9b8b4e29142fd593d0e5586bc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakob=20Vo=C3=9F?= Date: Wed, 20 Dec 2023 20:35:27 +0100 Subject: [PATCH] Rename error hasInvalidValue to invalidValue (#389) This solves the most crucial part of #383. --- README.md | 6 +++--- .../marc/model/validation/ValidationErrorType.java | 6 +++--- .../gwdg/metadataqa/marc/ValidationErrorTypeTest.java | 2 +- .../de/gwdg/metadataqa/marc/dao/Control007Test.java | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index d3b57331b..6e93819b9 100644 --- a/README.md +++ b/README.md @@ -511,13 +511,13 @@ options: * `ambiguousLinkage`: ambiguous linkage * `obsoleteControlPosition`: obsolete code * `controlValueContainsInvalidCode`: invalid code - * `hasInvalidValue`: invalid value + * `invalidValue`: invalid value * `missingSubfield`: missing reference subfield (880$6) * `nonrepeatableField`: repetition of non-repeatable field * `undefinedField`: undefined field * `obsoleteIndicator`: obsolete value * `nonEmptyIndicator`: non-empty indicator - * `hasInvalidValue`: invalid value + * `invalidValue`: invalid value * `undefinedSubfield`: undefined subfield * `invalidLength`: invalid length * `invalidReference`: invalid classification reference @@ -527,7 +527,7 @@ options: * `invalidISSN`: invalid ISSN * `unparsableContent`: content is not well-formatted * `nullCode`: null subfield code - * `hasInvalidValue`: invalid value + * `invalidValue`: invalid value Outputs: * `count.csv`: the count of bibliographic records in the source dataset diff --git a/src/main/java/de/gwdg/metadataqa/marc/model/validation/ValidationErrorType.java b/src/main/java/de/gwdg/metadataqa/marc/model/validation/ValidationErrorType.java index 814b0f593..21cfd22f2 100644 --- a/src/main/java/de/gwdg/metadataqa/marc/model/validation/ValidationErrorType.java +++ b/src/main/java/de/gwdg/metadataqa/marc/model/validation/ValidationErrorType.java @@ -11,7 +11,7 @@ public enum ValidationErrorType { // control subfield CONTROL_POSITION_OBSOLETE_CODE(4, "obsoleteControlPosition", "obsolete code", ValidationErrorCategory.CONTROLFIELD), CONTROL_POSITION_INVALID_CODE(5, "controlValueContainsInvalidCode", "invalid code", ValidationErrorCategory.CONTROLFIELD), - CONTROL_POSITION_INVALID_VALUE(6, "hasInvalidValue", "invalid value", ValidationErrorCategory.CONTROLFIELD), + CONTROL_POSITION_INVALID_VALUE(6, "invalidValue", "invalid value", ValidationErrorCategory.CONTROLFIELD), // field FIELD_MISSING_REFERENCE_SUBFIELD(7, "missingSubfield", "missing reference subfield (880$6)", ValidationErrorCategory.DATAFIELD), @@ -21,7 +21,7 @@ public enum ValidationErrorType { // indicator INDICATOR_OBSOLETE(10, "obsoleteIndicator", "obsolete value", ValidationErrorCategory.INDICATOR), INDICATOR_NON_EMPTY(11, "nonEmptyIndicator", "non-empty indicator", ValidationErrorCategory.INDICATOR), - INDICATOR_INVALID_VALUE(12, "hasInvalidValue", "invalid value", ValidationErrorCategory.INDICATOR), + INDICATOR_INVALID_VALUE(12, "invalidValue", "invalid value", ValidationErrorCategory.INDICATOR), // subfield SUBFIELD_UNDEFINED(13, "undefinedSubfield", "undefined subfield", ValidationErrorCategory.SUBFIELD), @@ -33,7 +33,7 @@ public enum ValidationErrorType { SUBFIELD_ISSN(19, "invalidISSN", "invalid ISSN", ValidationErrorCategory.SUBFIELD), SUBFIELD_UNPARSABLE_CONTENT(20, "unparsableContent", "content is not well-formatted", ValidationErrorCategory.SUBFIELD), SUBFIELD_NULL_CODE(21, "nullCode", "null subfield code", ValidationErrorCategory.SUBFIELD), - SUBFIELD_INVALID_VALUE(22, "hasInvalidValue", "invalid value", ValidationErrorCategory.SUBFIELD), + SUBFIELD_INVALID_VALUE(22, "invalidValue", "invalid value", ValidationErrorCategory.SUBFIELD), ; private final int id; diff --git a/src/test/java/de/gwdg/metadataqa/marc/ValidationErrorTypeTest.java b/src/test/java/de/gwdg/metadataqa/marc/ValidationErrorTypeTest.java index 4d0e48d9b..2fa4f06cc 100644 --- a/src/test/java/de/gwdg/metadataqa/marc/ValidationErrorTypeTest.java +++ b/src/test/java/de/gwdg/metadataqa/marc/ValidationErrorTypeTest.java @@ -37,7 +37,7 @@ public void testHasInvalidValue() { ValidationErrorType errorType = ValidationErrorType.SUBFIELD_INVALID_VALUE; assertEquals("SUBFIELD_INVALID_VALUE", errorType.name()); assertEquals("SUBFIELD_INVALID_VALUE", errorType.toString()); - assertEquals("hasInvalidValue", errorType.getCode()); + assertEquals("invalidValue", errorType.getCode()); assertEquals("invalid value", errorType.getMessage()); assertEquals("subfield", errorType.getCategory().getName()); } diff --git a/src/test/java/de/gwdg/metadataqa/marc/dao/Control007Test.java b/src/test/java/de/gwdg/metadataqa/marc/dao/Control007Test.java index cb6803d2f..0ab6795fd 100644 --- a/src/test/java/de/gwdg/metadataqa/marc/dao/Control007Test.java +++ b/src/test/java/de/gwdg/metadataqa/marc/dao/Control007Test.java @@ -78,7 +78,7 @@ public void testMap() { validator.getValidationErrors().get(0).getMarcPath()); assertEquals("c", validator.getValidationErrors().get(0).getMessage()); - assertEquals("hasInvalidValue", + assertEquals("invalidValue", validator.getValidationErrors().get(0).getType().getCode()); assertEquals(ValidationErrorType.CONTROL_POSITION_INVALID_VALUE, validator.getValidationErrors().get(0).getType()); @@ -89,7 +89,7 @@ public void testMap() { validator.getValidationErrors().get(1).getMarcPath()); assertEquals(" ", validator.getValidationErrors().get(1).getMessage()); - assertEquals("hasInvalidValue", + assertEquals("invalidValue", validator.getValidationErrors().get(1).getType().getCode()); assertEquals(ValidationErrorType.CONTROL_POSITION_INVALID_VALUE, validator.getValidationErrors().get(1).getType()); @@ -809,7 +809,7 @@ public void testSoundRecording() { validator.getValidationErrors().get(0).getMarcPath()); assertEquals(" ", validator.getValidationErrors().get(0).getMessage()); - assertEquals("hasInvalidValue", + assertEquals("invalidValue", validator.getValidationErrors().get(0).getType().getCode()); assertEquals(ValidationErrorType.CONTROL_POSITION_INVALID_VALUE, validator.getValidationErrors().get(0).getType()); @@ -820,7 +820,7 @@ public void testSoundRecording() { validator.getValidationErrors().get(1).getMarcPath()); assertEquals(" ", validator.getValidationErrors().get(1).getMessage()); - assertEquals("hasInvalidValue", + assertEquals("invalidValue", validator.getValidationErrors().get(1).getType().getCode()); assertEquals(ValidationErrorType.CONTROL_POSITION_INVALID_VALUE, validator.getValidationErrors().get(1).getType()); @@ -831,7 +831,7 @@ public void testSoundRecording() { validator.getValidationErrors().get(2).getMarcPath()); assertEquals(" ", validator.getValidationErrors().get(2).getMessage()); - assertEquals("hasInvalidValue", + assertEquals("invalidValue", validator.getValidationErrors().get(2).getType().getCode()); assertEquals(ValidationErrorType.CONTROL_POSITION_INVALID_VALUE, validator.getValidationErrors().get(2).getType());