issue #75: reformat and sort validator output.

pkiraly · Dec 21, 2020 · 32ff1e9 · 32ff1e9
1 parent 82436c5
commit 32ff1e9
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/src/test/java/de/gwdg/metadataqa/marc/LeaderTest.java b/src/test/java/de/gwdg/metadataqa/marc/LeaderTest.java
@@ -5,10 +5,6 @@
 import de.gwdg.metadataqa.marc.model.validation.ValidationErrorFormat;
 import de.gwdg.metadataqa.marc.model.validation.ValidationErrorFormatter;
 import de.gwdg.metadataqa.marc.model.validation.ValidationErrorType;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 import java.util.List;
@@ -287,13 +283,13 @@ public void testBadLeaderWithDefaultType() {
     assertFalse(errors.isEmpty());
     assertEquals(2, errors.size());
     assertEquals(
-      "\"Leader\"\t\"1\"\t\"record: undetectable type\"\t\"Leader/06 (typeOfRecord): 'n', Leader/07 (bibliographicLevel): 'm'\"\t\"https://www.loc.gov/marc/bibliographic/bdleader.html\"",
+      "\"Leader\"\t\"1\"\t\"1\"\t\"undetectable type\"\t\"Leader/06 (typeOfRecord): 'n', Leader/07 (bibliographicLevel): 'm'\"\t\"https://www.loc.gov/marc/bibliographic/bdleader.html\"",
       ValidationErrorFormatter.format(
         errors.get(0), ValidationErrorFormat.TAB_SEPARATED
       )
     );
     assertEquals(
-      "\"Leader/06 (leader06)\"\t\"6\"\t\"control subfield: invalid value\"\t\"n\"\t\"https://www.loc.gov/marc/bibliographic/bdleader.html\"",
+      "\"Leader/06 (leader06)\"\t\"2\"\t\"6\"\t\"invalid value\"\t\"n\"\t\"https://www.loc.gov/marc/bibliographic/bdleader.html\"",
       ValidationErrorFormatter.format(
         errors.get(1), ValidationErrorFormat.TAB_SEPARATED
       )

diff --git a/src/test/java/de/gwdg/metadataqa/marc/ValidationErrorTypeTest.java b/src/test/java/de/gwdg/metadataqa/marc/ValidationErrorTypeTest.java
@@ -14,20 +14,22 @@ public void test() {
 
   @Test
   public void testObsoleteIndicator() {
-    ValidationErrorType obsolete = ValidationErrorType.INDICATOR_OBSOLETE;
-    assertEquals("INDICATOR_OBSOLETE", obsolete.name());
-    assertEquals("INDICATOR_OBSOLETE", obsolete.toString());
-    assertEquals("obsoleteIndicator", obsolete.getCode());
-    assertEquals("indicator: obsolete value", obsolete.getMessage());
+    ValidationErrorType errorType = ValidationErrorType.INDICATOR_OBSOLETE;
+    assertEquals("INDICATOR_OBSOLETE", errorType.name());
+    assertEquals("INDICATOR_OBSOLETE", errorType.toString());
+    assertEquals("obsoleteIndicator", errorType.getCode());
+    assertEquals("obsolete value", errorType.getMessage());
+    assertEquals("indicator", errorType.getCategory().getName());
   }
 
   @Test
   public void testObsoleteControlSubfield() {
-    ValidationErrorType obsolete = ValidationErrorType.CONTROL_SUBFIELD_OBSOLETE_CODE;
-    assertEquals("CONTROL_SUBFIELD_OBSOLETE_CODE", obsolete.name());
-    assertEquals("CONTROL_SUBFIELD_OBSOLETE_CODE", obsolete.toString());
-    assertEquals("obsoleteControlSubfield", obsolete.getCode());
-    assertEquals("control subfield: obsolete code", obsolete.getMessage());
+    ValidationErrorType errorType = ValidationErrorType.CONTROL_SUBFIELD_OBSOLETE_CODE;
+    assertEquals("CONTROL_SUBFIELD_OBSOLETE_CODE", errorType.name());
+    assertEquals("CONTROL_SUBFIELD_OBSOLETE_CODE", errorType.toString());
+    assertEquals("obsoleteControlSubfield", errorType.getCode());
+    assertEquals("obsolete code", errorType.getMessage());
+    assertEquals("control field", errorType.getCategory().getName());
   }
 
   @Test
@@ -36,7 +38,8 @@ public void testHasInvalidValue() {
     assertEquals("SUBFIELD_INVALID_VALUE", errorType.name());
     assertEquals("SUBFIELD_INVALID_VALUE", errorType.toString());
     assertEquals("hasInvalidValue", errorType.getCode());
-    assertEquals("subfield: invalid value", errorType.getMessage());
+    assertEquals("invalid value", errorType.getMessage());
+    assertEquals("subfield", errorType.getCategory().getName());
   }
 
   @Test
@@ -45,6 +48,7 @@ public void testContainsInvalidValue() {
     assertEquals("CONTROL_SUBFIELD_INVALID_CODE", errorType.name());
     assertEquals("CONTROL_SUBFIELD_INVALID_CODE", errorType.toString());
     assertEquals("controlValueContainsInvalidCode", errorType.getCode());
-    assertEquals("control subfield: invalid code", errorType.getMessage());
+    assertEquals("invalid code", errorType.getMessage());
+    assertEquals("control field", errorType.getCategory().getName());
   }
 }
diff --git a/src/test/java/de/gwdg/metadataqa/marc/ValidationTest.java b/src/test/java/de/gwdg/metadataqa/marc/ValidationTest.java
@@ -97,7 +97,7 @@ public void test246_6() throws URISyntaxException, IOException {
     boolean isValid = record.validate(MarcVersion.MARC21, false);
     if (!isValid) {
       String message = ValidationErrorFormatter.format(record.getValidationErrors(), ValidationErrorFormat.TEXT);
-      assertTrue(message.contains("880$6: 3 - record: ambiguous linkage 'There are multiple $6'"));
+      assertTrue(message.contains("880$6: 3 - ambiguous linkage 'There are multiple $6'"));
     }
   }