@natlibfi/marc-record-validators-melinda 12.0.0-alpha.1 → 12.0.0-alpha.12

package/dist/ending-punctuation.test.js

@@ -12,11 +12,21 @@ describe("ending-punctuation", () => {
           ind1: " ",
           ind2: " ",
           subfields: [
-            { code: "a", value: "El\xE4m\xE4ni ja tutkimusretkeni / " },
+            { code: "a", value: "El\xE4m\xE4ni ja tutkimusretkeni /" },
             { code: "c", value: "Roald Amundsen ; suomentanut Sulo Veikko Pekkola." },
             { code: "6", value: "FOO" }
           ]
         },
+        {
+          // Hackily putting 2nd 245 here
+          tag: "245",
+          ind1: "0",
+          ind2: "4",
+          subfields: [
+            { code: "a", value: "The Disaster /" },
+            { code: "c", value: "(J.L.)." }
+          ]
+        },
         {
           tag: "337",
           // Range 336-338
@@ -33,7 +43,21 @@ describe("ending-punctuation", () => {
           // Range 500-509
           ind1: " ",
           ind2: " ",
-          subfields: [{ code: "a", value: "FOO (Bar)" }]
+          subfields: [{ code: "a", value: "FOO (Bar)." }]
+        },
+        {
+          tag: "500",
+          // Range 500-509
+          ind1: " ",
+          ind2: " ",
+          subfields: [{ code: "a", value: '"Lorum ipsum."' }]
+        },
+        {
+          tag: "500",
+          // Range 500-509
+          ind1: " ",
+          ind2: " ",
+          subfields: [{ code: "a", value: 'Foo "Bar".' }]
         }
       ]
     });
@@ -45,9 +69,20 @@ describe("ending-punctuation", () => {
           ind1: " ",
           ind2: " ",
           subfields: [
-            { code: "a", value: "El\xE4m\xE4ni ja tutkimusretkeni / " },
+            { code: "a", value: "El\xE4m\xE4ni ja tutkimusretkeni /" },
             { code: "c", value: "Roald Amundsen ; suomentanut Sulo Veikko Pekkola" },
             { code: "6", value: "FOO" }
+            // NV: not changing this now, but this is wrong: $6 is *always* the first subfield. Also , the value is not valid for $6...
+          ]
+        },
+        {
+          // Hackily putting 2nd 245 here
+          tag: "245",
+          ind1: "0",
+          ind2: "4",
+          subfields: [
+            { code: "a", value: "The Disaster /" },
+            { code: "c", value: "(J.L.)" }
           ]
         },
         {
@@ -57,7 +92,7 @@ describe("ending-punctuation", () => {
           subfields: [
             { code: "a", value: "k\xE4ytett\xE4viss\xE4 ilman laitetta" },
             { code: "b", value: "n." },
-            // This can be abbreviation -> does not generate error
+            // This can be abbreviation -> does not generate error (NV: huh?!?)
             { code: "2", value: "rdamedia" }
           ]
         },
@@ -65,7 +100,21 @@ describe("ending-punctuation", () => {
           tag: "500",
           ind1: " ",
           ind2: " ",
-          subfields: [{ code: "a", value: "FOO (Bar)." }]
+          subfields: [{ code: "a", value: "FOO (Bar)" }]
+        },
+        {
+          tag: "500",
+          // Range 500-509
+          ind1: " ",
+          ind2: " ",
+          subfields: [{ code: "a", value: '"Lorum ipsum.".' }]
+        },
+        {
+          tag: "500",
+          // Range 500-509
+          ind1: " ",
+          ind2: " ",
+          subfields: [{ code: "a", value: 'Foo "Bar"' }]
         }
       ]
     });
@@ -77,11 +126,21 @@ describe("ending-punctuation", () => {
           ind1: " ",
           ind2: " ",
           subfields: [
-            { code: "a", value: "El\xE4m\xE4ni ja tutkimusretkeni / " },
+            { code: "a", value: "El\xE4m\xE4ni ja tutkimusretkeni /" },
             { code: "c", value: "Roald Amundsen ; suomentanut Sulo Veikko Pekkola" },
             { code: "6", value: "FOO" }
           ]
         },
+        {
+          // Hackily putting 2nd 245 here
+          tag: "245",
+          ind1: "0",
+          ind2: "4",
+          subfields: [
+            { code: "a", value: "The Disaster /" },
+            { code: "c", value: "(J.L.)" }
+          ]
+        },
         {
           tag: "337",
           ind1: " ",
@@ -89,7 +148,7 @@ describe("ending-punctuation", () => {
           subfields: [
             { code: "a", value: "k\xE4ytett\xE4viss\xE4 ilman laitetta" },
             { code: "b", value: "n" },
-            // Dot removed from possible abbreviation as it cannot be removed in fixing
+            // Dot removed from possible abbreviation as it cannot be removed in fixing (NV: huh?)
             { code: "2", value: "rdamedia" }
           ]
         },
@@ -97,7 +156,21 @@ describe("ending-punctuation", () => {
           tag: "500",
           ind1: " ",
           ind2: " ",
-          subfields: [{ code: "a", value: "FOO (Bar)." }]
+          subfields: [{ code: "a", value: "FOO (Bar)" }]
+        },
+        {
+          tag: "500",
+          // Range 500-509
+          ind1: " ",
+          ind2: " ",
+          subfields: [{ code: "a", value: '"Lorum ipsum.".' }]
+        },
+        {
+          tag: "500",
+          // Range 500-509
+          ind1: " ",
+          ind2: " ",
+          subfields: [{ code: "a", value: 'Foo "Bar"' }]
         }
       ]
     });
@@ -110,19 +183,19 @@ describe("ending-punctuation", () => {
       const validator = await validatorFactory();
       const result = await validator.validate(recordInvalid);
       assert.deepEqual(result, {
-        message: ["Field 245 has invalid ending punctuation", "Field 500 has invalid ending punctuation"],
+        message: ["Field 245 requires ending punctuation, ends in 'a'", "Field 245 requires ending punctuation, ends in ')'", "Field 500 requires ending punctuation, ends in ')'", `Field 500 has an extra dot in '.".'`, `Field 500 requires ending punctuation, ends in '"'`],
         valid: false
       });
     });
     it("Repairs the invalid record", async () => {
       const validator = await validatorFactory();
       const result = await validator.fix(recordBroken);
-      assert.equal(recordBroken.equalsTo(recordValid), true);
       assert.deepEqual(result, {
-        message: ["Field 245 has invalid ending punctuation", "Field 500 has invalid ending punctuation"],
-        fix: ["Field 245 - Added punctuation to $c", "Field 500 - Removed double punctuation from $a"],
+        message: ["Field 245 requires ending punctuation, ends in 'a'", "Field 245 requires ending punctuation, ends in ')'", "Field 500 requires ending punctuation, ends in ')'", `Field 500 has an extra dot in '.".'`, `Field 500 requires ending punctuation, ends in '"'`],
+        fix: ["Field 245 - Added punctuation to $c", "Field 245 - Added punctuation to $c", "Field 500 - Added punctuation to $a", `Field 500 - Removed '.' after '."'`, "Field 500 - Added punctuation to $a"],
         valid: false
       });
+      assert.equal(recordBroken.equalsTo(recordValid), true);
     });
   });
   describe("#specials", () => {
@@ -192,7 +265,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalid);
         assert.deepEqual(result, {
-          message: ["Field 036 has invalid ending punctuation"],
+          message: ["Field 036 requires ending punctuation, ends in 'e'"],
           valid: false
         });
       });
@@ -200,7 +273,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalidOnlyA);
         assert.deepEqual(result, {
-          message: ["Field 036 has invalid ending punctuation"],
+          message: ["Field 036 has unwanted ending punctuation '.'"],
           valid: false
         });
       });
@@ -209,7 +282,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalid);
         assert.equal(recordInvalid.equalsTo(recordValid), true);
         assert.deepEqual(result, {
-          message: ["Field 036 has invalid ending punctuation"],
+          message: ["Field 036 requires ending punctuation, ends in 'e'"],
           fix: ["Field 036 - Added punctuation to $b"],
           valid: false
         });
@@ -219,7 +292,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalidOnlyA);
         assert.equal(recordInvalidOnlyA.equalsTo(recordValidOnlyA), true);
         assert.deepEqual(result, {
-          message: ["Field 036 has invalid ending punctuation"],
+          message: ["Field 036 has unwanted ending punctuation '.'"],
           fix: ["Field 036 - Removed punctuation from $a"],
           valid: false
         });
@@ -357,7 +430,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalidOnlyAMissingA);
         assert.deepEqual(result, {
-          message: ["Field 242 has invalid ending punctuation"],
+          message: ["Field 242 requires ending punctuation, ends in 't'"],
           valid: false
         });
       });
@@ -365,7 +438,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalidOnlyAPuncY);
         assert.deepEqual(result, {
-          message: ["Field 242 has invalid ending punctuation"],
+          message: ["Field 242 has unwanted ending punctuation '.'"],
           valid: false
         });
       });
@@ -373,7 +446,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalidOnlyAMissingAPuncY);
         assert.deepEqual(result, {
-          message: ["Field 242 has invalid ending punctuation", "Field 242 has invalid ending punctuation"],
+          message: ["Field 242 has unwanted ending punctuation '.'", "Field 242 requires ending punctuation, ends in 't'"],
           valid: false
         });
       });
@@ -381,7 +454,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordValidMultipleMissingP);
         assert.deepEqual(result, {
-          message: ["Field 242 has invalid ending punctuation"],
+          message: ["Field 242 requires ending punctuation, ends in 'y'"],
           valid: false
         });
       });
@@ -389,7 +462,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordValidWithoutYMissingA);
         assert.deepEqual(result, {
-          message: ["Field 242 has invalid ending punctuation"],
+          message: ["Field 242 requires ending punctuation, ends in 't'"],
           valid: false
         });
       });
@@ -398,7 +471,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalidOnlyAMissingA);
         assert.equal(recordInvalidOnlyAMissingA.equalsTo(recordValidOnlyA), true);
         assert.deepEqual(result, {
-          message: ["Field 242 has invalid ending punctuation"],
+          message: ["Field 242 requires ending punctuation, ends in 't'"],
           fix: ["Field 242 - Added punctuation to $a"],
           valid: false
         });
@@ -408,7 +481,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalidOnlyAPuncY);
         assert.equal(recordInvalidOnlyAPuncY.equalsTo(recordValidOnlyA), true);
         assert.deepEqual(result, {
-          message: ["Field 242 has invalid ending punctuation"],
+          message: ["Field 242 has unwanted ending punctuation '.'"],
           fix: ["Field 242 - Removed punctuation from $y"],
           valid: false
         });
@@ -418,7 +491,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalidOnlyAMissingAPuncY);
         assert.equal(recordInvalidOnlyAMissingAPuncY.equalsTo(recordValidOnlyA), true);
         assert.deepEqual(result, {
-          message: ["Field 242 has invalid ending punctuation", "Field 242 has invalid ending punctuation"],
+          message: ["Field 242 has unwanted ending punctuation '.'", "Field 242 requires ending punctuation, ends in 't'"],
           fix: ["Field 242 - Removed punctuation from $y", "Field 242 - Added punctuation to $a"],
           valid: false
         });
@@ -428,7 +501,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordValidMultipleMissingP);
         assert.equal(recordValidMultipleMissingP.equalsTo(recordValidMultiple), true);
         assert.deepEqual(result, {
-          message: ["Field 242 has invalid ending punctuation"],
+          message: ["Field 242 requires ending punctuation, ends in 'y'"],
           fix: ["Field 242 - Added punctuation to $p"],
           valid: false
         });
@@ -438,7 +511,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordValidWithoutYMissingA);
         assert.equal(recordValidWithoutYMissingA.equalsTo(recordValidWithoutY), true);
         assert.deepEqual(result, {
-          message: ["Field 242 has invalid ending punctuation"],
+          message: ["Field 242 requires ending punctuation, ends in 't'"],
           fix: ["Field 242 - Added punctuation to $a"],
           valid: false
         });
@@ -541,7 +614,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalidEndC);
         assert.deepEqual(result, {
-          message: ["Field 260 has invalid ending punctuation"],
+          message: ["Field 260 requires ending punctuation, ends in '2'"],
           valid: false
         });
       });
@@ -549,7 +622,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalidEndGDouble);
         assert.deepEqual(result, {
-          message: ["Field 260 has invalid ending punctuation"],
+          message: ["Field 260 has an extra dot after ')'"],
           valid: false
         });
       });
@@ -558,7 +631,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalidEndC);
         assert.equal(recordInvalidEndC.equalsTo(recordValidEndC), true);
         assert.deepEqual(result, {
-          message: ["Field 260 has invalid ending punctuation"],
+          message: ["Field 260 requires ending punctuation, ends in '2'"],
           fix: ["Field 260 - Added punctuation to $c"],
           valid: false
         });
@@ -568,8 +641,8 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalidEndGDouble);
         assert.equal(recordInvalidEndGDouble.equalsTo(recordValidEndG), true);
         assert.deepEqual(result, {
-          message: ["Field 260 has invalid ending punctuation"],
-          fix: ["Field 260 - Removed double punctuation from $g"],
+          message: ["Field 260 has an extra dot after ')'"],
+          fix: ["Field 260 - Removed dot after punctuation from $g"],
           valid: false
         });
       });
@@ -688,7 +761,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalidInd2v1);
         assert.deepEqual(result, {
-          message: ["Field 264 has invalid ending punctuation"],
+          message: ["Field 264 requires ending punctuation, ends in '6'"],
           valid: false
         });
       });
@@ -696,7 +769,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalidCopyrightCExtra);
         assert.deepEqual(result, {
-          message: ["Field 264 has invalid ending punctuation"],
+          message: ["Field 264 has unwanted ending punctuation '.'"],
           valid: false
         });
       });
@@ -705,7 +778,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalidInd2v1);
         assert.equal(recordInvalidInd2v1.equalsTo(recordValidInd2v1), true);
         assert.deepEqual(result, {
-          message: ["Field 264 has invalid ending punctuation"],
+          message: ["Field 264 requires ending punctuation, ends in '6'"],
           fix: ["Field 264 - Added punctuation to $c"],
           valid: false
         });
@@ -715,7 +788,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalidCopyrightCExtra);
         assert.equal(recordInvalidCopyrightCExtra.equalsTo(recordValidCopyright), true);
         assert.deepEqual(result, {
-          message: ["Field 264 has invalid ending punctuation"],
+          message: ["Field 264 has unwanted ending punctuation '.'"],
           fix: ["Field 264 - Removed punctuation from $c"],
           valid: false
         });
@@ -898,7 +971,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalidA);
         assert.deepEqual(result, {
-          message: ["Field 340 has invalid ending punctuation"],
+          message: ["Field 340 requires ending punctuation, ends in 'e'"],
           valid: false
         });
       });
@@ -906,7 +979,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalidAMissingB);
         assert.deepEqual(result, {
-          message: ["Field 340 has invalid ending punctuation"],
+          message: ["Field 340 requires ending punctuation, ends in 't'"],
           valid: false
         });
       });
@@ -914,7 +987,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalidABMissing);
         assert.deepEqual(result, {
-          message: ["Field 340 has invalid ending punctuation"],
+          message: ["Field 340 requires ending punctuation, ends in 'm'"],
           valid: false
         });
       });
@@ -922,7 +995,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalidDDMissing);
         assert.deepEqual(result, {
-          message: ["Field 340 has invalid ending punctuation"],
+          message: ["Field 340 requires ending punctuation, ends in 'd'"],
           valid: false
         });
       });
@@ -930,7 +1003,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalidComplexDMissing);
         assert.deepEqual(result, {
-          message: ["Field 340 has invalid ending punctuation"],
+          message: ["Field 340 requires ending punctuation, ends in 'e'"],
           valid: false
         });
       });
@@ -939,7 +1012,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalidA);
         assert.equal(recordInvalidA.equalsTo(recordInvalidA), true);
         assert.deepEqual(result, {
-          message: ["Field 340 has invalid ending punctuation"],
+          message: ["Field 340 requires ending punctuation, ends in 'e'"],
           fix: ["Field 340 - Added punctuation to $a"],
           valid: false
         });
@@ -949,7 +1022,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalidAMissingB);
         assert.equal(recordInvalidAMissingB.equalsTo(recordValidAB), true);
         assert.deepEqual(result, {
-          message: ["Field 340 has invalid ending punctuation"],
+          message: ["Field 340 requires ending punctuation, ends in 't'"],
           fix: ["Field 340 - Added punctuation to $a"],
           valid: false
         });
@@ -959,7 +1032,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalidABMissing);
         assert.equal(recordInvalidABMissing.equalsTo(recordValidAB), true);
         assert.deepEqual(result, {
-          message: ["Field 340 has invalid ending punctuation"],
+          message: ["Field 340 requires ending punctuation, ends in 'm'"],
           fix: ["Field 340 - Added punctuation to $b"],
           valid: false
         });
@@ -969,7 +1042,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalidDDMissing);
         assert.equal(recordInvalidDDMissing.equalsTo(recordValidDD), true);
         assert.deepEqual(result, {
-          message: ["Field 340 has invalid ending punctuation"],
+          message: ["Field 340 requires ending punctuation, ends in 'd'"],
           fix: ["Field 340 - Added punctuation to $d"],
           valid: false
         });
@@ -979,7 +1052,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalidComplexDMissing);
         assert.equal(recordInvalidComplexDMissing.equalsTo(recordInvalidComplexDMissing), true);
         assert.deepEqual(result, {
-          message: ["Field 340 has invalid ending punctuation"],
+          message: ["Field 340 requires ending punctuation, ends in 'e'"],
           fix: ["Field 340 - Added punctuation to $d"],
           valid: false
         });
@@ -1071,7 +1144,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalid);
         assert.deepEqual(result, {
-          message: ["Field 520 has invalid ending punctuation"],
+          message: ["Field 520 requires ending punctuation, ends in '\xF6'"],
           valid: false
         });
       });
@@ -1079,7 +1152,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalidWithU);
         assert.deepEqual(result, {
-          message: ["Field 520 has invalid ending punctuation"],
+          message: ["Field 520 requires ending punctuation, ends in 'i'"],
           valid: false
         });
       });
@@ -1088,7 +1161,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalid);
         assert.equal(recordInvalid.equalsTo(recordValid), true);
         assert.deepEqual(result, {
-          message: ["Field 520 has invalid ending punctuation"],
+          message: ["Field 520 requires ending punctuation, ends in '\xF6'"],
           fix: ["Field 520 - Added punctuation to $a"],
           valid: false
         });
@@ -1098,7 +1171,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalidWithU);
         assert.equal(recordInvalidWithU.equalsTo(recordValidWithU), true);
         assert.deepEqual(result, {
-          message: ["Field 520 has invalid ending punctuation"],
+          message: ["Field 520 requires ending punctuation, ends in 'i'"],
           fix: ["Field 520 - Added punctuation to $a"],
           valid: false
         });
@@ -1208,7 +1281,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalidMissingI);
         assert.deepEqual(result, {
-          message: ["Field 538 has invalid ending punctuation"],
+          message: ["Field 538 requires ending punctuation, ends in 's'"],
           valid: false
         });
       });
@@ -1216,7 +1289,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalidI);
         assert.deepEqual(result, {
-          message: ["Field 538 has invalid ending punctuation"],
+          message: ["Field 538 requires ending punctuation, ends in ':'"],
           valid: false
         });
       });
@@ -1224,7 +1297,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalidOnlyA);
         assert.deepEqual(result, {
-          message: ["Field 538 has invalid ending punctuation"],
+          message: ["Field 538 requires ending punctuation, ends in 'e'"],
           valid: false
         });
       });
@@ -1233,7 +1306,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalidMissingI);
         assert.equal(recordInvalidMissingI.equalsTo(recordValid), true);
         assert.deepEqual(result, {
-          message: ["Field 538 has invalid ending punctuation"],
+          message: ["Field 538 requires ending punctuation, ends in 's'"],
           fix: ["Field 538 - Added punctuation to $i"],
           valid: false
         });
@@ -1243,7 +1316,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalidOnlyA);
         assert.equal(recordInvalidOnlyA.equalsTo(recordValidOnlyA), true);
         assert.deepEqual(result, {
-          message: ["Field 538 has invalid ending punctuation"],
+          message: ["Field 538 requires ending punctuation, ends in 'e'"],
           fix: ["Field 538 - Added punctuation to $a"],
           valid: false
         });
@@ -1314,7 +1387,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalid);
         assert.deepEqual(result, {
-          message: ["Field 567 has invalid ending punctuation"],
+          message: ["Field 567 requires ending punctuation, ends in 's'"],
           valid: false
         });
       });
@@ -1322,7 +1395,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalidWithoutA);
         assert.deepEqual(result, {
-          message: ["Field 567 has invalid ending punctuation"],
+          message: ["Field 567 has unwanted ending punctuation '.'"],
           valid: false
         });
       });
@@ -1331,7 +1404,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalid);
         assert.equal(recordInvalid.equalsTo(recordValid), true);
         assert.deepEqual(result, {
-          message: ["Field 567 has invalid ending punctuation"],
+          message: ["Field 567 requires ending punctuation, ends in 's'"],
           fix: ["Field 567 - Added punctuation to $a"],
           valid: false
         });
@@ -1341,7 +1414,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalidWithoutA);
         assert.equal(recordInvalidWithoutA.equalsTo(recordValidWithoutA), true);
         assert.deepEqual(result, {
-          message: ["Field 567 has invalid ending punctuation"],
+          message: ["Field 567 has unwanted ending punctuation '.'"],
           fix: ["Field 567 - Removed punctuation from $b"],
           valid: false
         });
@@ -1363,7 +1436,7 @@ describe("ending-punctuation", () => {
           }
         ]
       });
-      const recordVali648dFinNo = new MarcRecord({
+      const recordValid648FinNo = new MarcRecord({
         leader: "",
         fields: [
           {
@@ -1374,6 +1447,17 @@ describe("ending-punctuation", () => {
               { code: "a", value: "1900-luku" },
               { code: "2", value: "yso/swe" }
             ]
+          },
+          {
+            // Exception: term ending in dot:
+            tag: "648",
+            ind1: " ",
+            ind2: "7",
+            subfields: [
+              { code: "a", value: "1200-luku eaa." },
+              { code: "2", value: "yso/fin" },
+              { code: "0", value: "http://www.yso.fi/onto/yso/p1129911200" }
+            ]
           }
         ]
       });
@@ -1441,7 +1525,7 @@ describe("ending-punctuation", () => {
       });
       it("Finds record valid - 648 Finnish, without punc", async () => {
         const validator = await validatorFactory();
-        const result = await validator.validate(recordVali648dFinNo);
+        const result = await validator.validate(recordValid648FinNo);
         assert.equal(result.valid, true);
       });
       it("Finds record valid - 648 Fast, without punc", async () => {
@@ -1479,7 +1563,7 @@ describe("ending-punctuation", () => {
           }
         ]
       });
-      const recordInvali648dFinYes = new MarcRecord({
+      const recordInvalid648FinYes = new MarcRecord({
         leader: "",
         fields: [
           {
@@ -1490,6 +1574,17 @@ describe("ending-punctuation", () => {
               { code: "a", value: "1900-luku." },
               { code: "2", value: "yso/swe" }
             ]
+          },
+          {
+            // Exception:
+            tag: "648",
+            ind1: " ",
+            ind2: "7",
+            subfields: [
+              { code: "a", value: "1200-luku eaa" },
+              { code: "2", value: "yso/fin" },
+              { code: "0", value: "http://www.yso.fi/onto/yso/p1129911200" }
+            ]
           }
         ]
       });
@@ -1553,15 +1648,15 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalid647FastEndPunc);
         assert.deepEqual(result, {
-          message: ["Field 647 has invalid ending punctuation"],
+          message: ["Field 647 has an extra dot after ')'"],
           valid: false
         });
       });
       it("Finds record invalid - 648 Finnish, with punc", async () => {
         const validator = await validatorFactory();
-        const result = await validator.validate(recordInvali648dFinYes);
+        const result = await validator.validate(recordInvalid648FinYes);
         assert.deepEqual(result, {
-          message: ["Field 648 has invalid ending punctuation"],
+          message: ["Field 648 has unwanted ending punctuation '.'", "Field 648 requires ending punctuation, ends in 'a'"],
           valid: false
         });
       });
@@ -1569,11 +1664,11 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalid648FastYes);
         assert.deepEqual(result, {
-          message: ["Field 648 has invalid ending punctuation"],
+          message: ["Field 648 has unwanted ending punctuation '.'"],
           valid: false
         });
       });
-      const invalidField650Message = "Field 650 has invalid ending punctuation";
+      const invalidField650Message = "Field 650 has unwanted ending punctuation '.'";
       it("Finds record invalid - 650 Finnish, with punc", async () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalid650FinYes);
@@ -1586,7 +1681,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalid650EngNoControl);
         assert.deepEqual(result, {
-          message: [invalidField650Message],
+          message: ["Field 650 requires ending punctuation, ends in 's'"],
           valid: false
         });
       });
@@ -1594,7 +1689,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalid650EngControl);
         assert.deepEqual(result, {
-          message: ["Field 650 has invalid ending punctuation"],
+          message: ["Field 650 requires ending punctuation, ends in 'n'"],
           valid: false
         });
       });
@@ -1603,18 +1698,18 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalid647FastEndPunc);
         assert.equal(recordInvalid647FastEndPunc.equalsTo(recordValid647FastEndPunc), true);
         assert.deepEqual(result, {
-          message: ["Field 647 has invalid ending punctuation"],
-          fix: ["Field 647 - Removed double punctuation from $d"],
+          message: ["Field 647 has an extra dot after ')'"],
+          fix: ["Field 647 - Removed dot after punctuation from $d"],
           valid: false
         });
       });
       it("Repairs the invalid record - 648 Finnish, removes punc $a", async () => {
         const validator = await validatorFactory();
-        const result = await validator.fix(recordInvali648dFinYes);
-        assert.equal(recordInvali648dFinYes.equalsTo(recordVali648dFinNo), true);
+        const result = await validator.fix(recordInvalid648FinYes);
+        assert.deepEqual(recordInvalid648FinYes, recordValid648FinNo);
         assert.deepEqual(result, {
-          message: ["Field 648 has invalid ending punctuation"],
-          fix: ["Field 648 - Removed punctuation from $a"],
+          message: ["Field 648 has unwanted ending punctuation '.'", "Field 648 requires ending punctuation, ends in 'a'"],
+          fix: ["Field 648 - Removed punctuation from $a", "Field 648 - Added punctuation to $a"],
           valid: false
         });
       });
@@ -1623,7 +1718,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalid648FastYes);
         assert.equal(recordInvalid648FastYes.equalsTo(recordValid648FastNo), true);
         assert.deepEqual(result, {
-          message: ["Field 648 has invalid ending punctuation"],
+          message: ["Field 648 has unwanted ending punctuation '.'"],
           fix: ["Field 648 - Removed punctuation from $a"],
           valid: false
         });
@@ -1643,7 +1738,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalid650EngNoControl);
         assert.equal(recordInvalid650EngNoControl.equalsTo(recordValid650EngNoControl), true);
         assert.deepEqual(result, {
-          message: ["Field 650 has invalid ending punctuation"],
+          message: ["Field 650 requires ending punctuation, ends in 's'"],
           fix: ["Field 650 - Added punctuation to $v"],
           valid: false
         });
@@ -1653,13 +1748,13 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalid650EngControl);
         assert.equal(recordInvalid650EngControl.equalsTo(recordValid650EngControl), true);
         assert.deepEqual(result, {
-          message: ["Field 650 has invalid ending punctuation"],
+          message: ["Field 650 requires ending punctuation, ends in 'n'"],
           fix: ["Field 650 - Added punctuation to $a"],
           valid: false
         });
       });
     });
-    describe("#654-662 TRUE - If finnish, else TRUE", () => {
+    describe("#654-662 TRUE - If Finnish, else TRUE", () => {
       const recordValid655FinNo = new MarcRecord({
         leader: "",
         fields: [
@@ -1930,7 +2025,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalid655FinYes);
         assert.deepEqual(result, {
-          message: ["Field 655 has invalid ending punctuation"],
+          message: ["Field 655 has unwanted ending punctuation '.'"],
           valid: false
         });
       });
@@ -1938,7 +2033,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalid655FinYes2);
         assert.deepEqual(result, {
-          message: ["Field 655 has invalid ending punctuation"],
+          message: ["Field 655 has unwanted ending punctuation '.'"],
           valid: false
         });
       });
@@ -1946,7 +2041,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalid655EngNo);
         assert.deepEqual(result, {
-          message: ["Field 655 has invalid ending punctuation"],
+          message: ["Field 655 requires ending punctuation, ends in '4'"],
           valid: false
         });
       });
@@ -1954,7 +2049,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalid655EngNoNoControl);
         assert.deepEqual(result, {
-          message: ["Field 655 has invalid ending punctuation"],
+          message: ["Field 655 requires ending punctuation, ends in 's'"],
           valid: false
         });
       });
@@ -1962,7 +2057,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalid656FinYes);
         assert.deepEqual(result, {
-          message: ["Field 656 has invalid ending punctuation"],
+          message: ["Field 656 has unwanted ending punctuation '.'"],
           valid: false
         });
       });
@@ -1970,7 +2065,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalid657EngNo);
         assert.deepEqual(result, {
-          message: ["Field 657 has invalid ending punctuation"],
+          message: ["Field 657 requires ending punctuation, ends in 'k'"],
           valid: false
         });
       });
@@ -1978,7 +2073,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalid658EngNo);
         assert.deepEqual(result, {
-          message: ["Field 658 has invalid ending punctuation"],
+          message: ["Field 658 requires ending punctuation, ends in 'd'"],
           valid: false
         });
       });
@@ -1986,7 +2081,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalid662EngNo);
         assert.deepEqual(result, {
-          message: ["Field 662 has invalid ending punctuation"],
+          message: ["Field 662 requires ending punctuation, ends in 'a'"],
           valid: false
         });
       });
@@ -1995,7 +2090,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalid655FinYes);
         assert.equal(recordInvalid655FinYes.equalsTo(recordValid655FinNo), true);
         assert.deepEqual(result, {
-          message: ["Field 655 has invalid ending punctuation"],
+          message: ["Field 655 has unwanted ending punctuation '.'"],
           fix: ["Field 655 - Removed punctuation from $a"],
           valid: false
         });
@@ -2005,7 +2100,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalid655FinYes2);
         assert.equal(recordInvalid655FinYes2.equalsTo(recordValid655FinNo2), true);
         assert.deepEqual(result, {
-          message: ["Field 655 has invalid ending punctuation"],
+          message: ["Field 655 has unwanted ending punctuation '.'"],
           fix: ["Field 655 - Removed punctuation from $a"],
           valid: false
         });
@@ -2015,7 +2110,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalid655EngNo);
         assert.equal(recordInvalid655EngNo.equalsTo(recordValid655EngYes), true);
         assert.deepEqual(result, {
-          message: ["Field 655 has invalid ending punctuation"],
+          message: ["Field 655 requires ending punctuation, ends in '4'"],
           fix: ["Field 655 - Added punctuation to $y"],
           valid: false
         });
@@ -2025,7 +2120,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalid655EngNoNoControl);
         assert.equal(recordInvalid655EngNoNoControl.equalsTo(recordValid655EngYesNoControl), true);
         assert.deepEqual(result, {
-          message: ["Field 655 has invalid ending punctuation"],
+          message: ["Field 655 requires ending punctuation, ends in 's'"],
           fix: ["Field 655 - Added punctuation to $a"],
           valid: false
         });
@@ -2035,7 +2130,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalid656FinYes);
         assert.equal(recordInvalid656FinYes.equalsTo(recordValid656FinNo), true);
         assert.deepEqual(result, {
-          message: ["Field 656 has invalid ending punctuation"],
+          message: ["Field 656 has unwanted ending punctuation '.'"],
           fix: ["Field 656 - Removed punctuation from $a"],
           valid: false
         });
@@ -2045,7 +2140,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalid657EngNo);
         assert.equal(recordInvalid657EngNo.equalsTo(recordValid657EngYes), true);
         assert.deepEqual(result, {
-          message: ["Field 657 has invalid ending punctuation"],
+          message: ["Field 657 requires ending punctuation, ends in 'k'"],
           fix: ["Field 657 - Added punctuation to $z"],
           valid: false
         });
@@ -2055,17 +2150,17 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalid658EngNo);
         assert.equal(recordInvalid658EngNo.equalsTo(recordValid658EngYes), true);
         assert.deepEqual(result, {
-          message: ["Field 658 has invalid ending punctuation"],
+          message: ["Field 658 requires ending punctuation, ends in 'd'"],
           fix: ["Field 658 - Added punctuation to $d"],
           valid: false
         });
       });
-      it("Repairs the invalid record - 662 !Finnish, add pun $a", async () => {
+      it("Repairs the invalid record - 662 !Finnish, add punc $a", async () => {
         const validator = await validatorFactory();
         const result = await validator.fix(recordInvalid662EngNo);
         assert.equal(recordInvalid662EngNo.equalsTo(recordValid662EngYes), true);
         assert.deepEqual(result, {
-          message: ["Field 662 has invalid ending punctuation"],
+          message: ["Field 662 requires ending punctuation, ends in 'a'"],
           fix: ["Field 662 - Added punctuation to $a"],
           valid: false
         });
@@ -2138,7 +2233,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalid);
         assert.deepEqual(result, {
-          message: ["Field 760 has invalid ending punctuation"],
+          message: ["Field 760 has unwanted ending punctuation '.'"],
           valid: false
         });
       });
@@ -2146,7 +2241,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalidOnlyA);
         assert.deepEqual(result, {
-          message: ["Field 760 has invalid ending punctuation"],
+          message: ["Field 760 requires ending punctuation, ends in 'c'"],
           valid: false
         });
       });
@@ -2155,7 +2250,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalid);
         assert.equal(recordInvalid.equalsTo(recordValid), true);
         assert.deepEqual(result, {
-          message: ["Field 760 has invalid ending punctuation"],
+          message: ["Field 760 has unwanted ending punctuation '.'"],
           fix: ["Field 760 - Removed punctuation from $e"],
           valid: false
         });
@@ -2165,7 +2260,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalidOnlyA);
         assert.equal(recordInvalidOnlyA.equalsTo(recordValidOnlyA), true);
         assert.deepEqual(result, {
-          message: ["Field 760 has invalid ending punctuation"],
+          message: ["Field 760 requires ending punctuation, ends in 'c'"],
           fix: ["Field 760 - Added punctuation to $a"],
           valid: false
         });
@@ -2252,7 +2347,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalidSimple);
         assert.deepEqual(result, {
-          message: ["Field 880 has invalid ending punctuation"],
+          message: ["Field 880 requires ending punctuation, ends in '3'"],
           valid: false
         });
       });
@@ -2260,7 +2355,7 @@ describe("ending-punctuation", () => {
         const validator = await validatorFactory();
         const result = await validator.validate(recordInvalidComplex);
         assert.deepEqual(result, {
-          message: ["Field 880 has invalid ending punctuation"],
+          message: ["Field 880 requires ending punctuation, ends in '6'"],
           valid: false
         });
       });
@@ -2269,7 +2364,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalidSimple);
         assert.equal(recordInvalidSimple.equalsTo(recordValidSimple), true);
         assert.deepEqual(result, {
-          message: ["Field 880 has invalid ending punctuation"],
+          message: ["Field 880 requires ending punctuation, ends in '3'"],
           fix: ["Field 880 - Added punctuation to $b"],
           valid: false
         });
@@ -2279,7 +2374,7 @@ describe("ending-punctuation", () => {
         const result = await validator.fix(recordInvalidComplex);
         assert.equal(recordInvalidComplex.equalsTo(recordValidComplex), true);
         assert.deepEqual(result, {
-          message: ["Field 880 has invalid ending punctuation"],
+          message: ["Field 880 requires ending punctuation, ends in '6'"],
           fix: ["Field 880 - Added punctuation to $c"],
           valid: false
         });