Use configurable metadata for model

[Etiquette] / model.test.js

diff --git a/model.test.js b/model.test.js
index 15a2f54cfa955831457a64d8dcd215e486937ed4..74f73daf349f5c068405994f03729d4e36e5fe57 100644 (file)
--- a/model.test.js
+++ b/model.test.js
@@ -105,13 +105,13 @@ describe("TagSystem", () => {
     });
 
     it("[[Construct]] defaults the preferred label to the empty string", () => {
-      assertStrictEquals(new Tag().prefLabel, "");
+      assertEquals({ ...new Tag().prefLabel }, { "@value": "" });
     });
 
     it("[[Construct]] correctly sets the preferred label to a simple string", () => {
-      assertStrictEquals(
-        new Tag("RelationshipTag", "Shadow, Me").prefLabel,
-        "Shadow, Me",
+      assertEquals(
+        { ...new Tag("RelationshipTag", "Shadow, Me").prefLabel },
+        { "@value": "Shadow, Me" },
       );
     });
 
@@ -140,6 +140,12 @@ describe("TagSystem", () => {
       });
     });
 
+    describe(".For", () => {
+      it("[[Has]] is not present", () => {
+        assertFalse("For" in Tag);
+      });
+    });
+
     describe(".all", () => {
       it("[[Call]] yields all the persisted tags", () => {
         const tags = new Set(function* () {
@@ -187,7 +193,9 @@ describe("TagSystem", () => {
       });
 
       it("[[Call]] throws if passed an invalid I·R·I", () => {
-        assertThrows(() => {Tag.fromIRI(`bad iri`)});
+        assertThrows(() => {
+          Tag.fromIRI(`bad iri`);
+        });
       });
     });
 
@@ -295,13 +303,10 @@ describe("TagSystem", () => {
           { "@value": "three", "@language": "en" },
         );
         assertEquals(
-          Array.from(
-            tag.altLabels(),
-            ($) => typeof $ == "string" ? $ : { ...$ },
-          ),
+          Array.from(tag.altLabels(), ($) => ({ ...$ })),
           [
-            "one",
-            "two",
+            { "@value": "one" },
+            { "@value": "two" },
             { "@value": "three", "@language": "en" },
           ],
         );
@@ -371,13 +376,10 @@ describe("TagSystem", () => {
           { "@value": "three", "@language": "en" },
         );
         assertEquals(
-          Array.from(
-            tag.hiddenLabels(),
-            ($) => typeof $ == "string" ? $ : { ...$ },
-          ),
+          Array.from(tag.hiddenLabels(), ($) => ({ ...$ })),
           [
-            "one",
-            "two",
+            { "@value": "one" },
+            { "@value": "two" },
             { "@value": "three", "@language": "en" },
           ],
         );
@@ -415,8 +417,10 @@ describe("TagSystem", () => {
       });
 
       it("[[Call]] throws when this is not a tag which can be placed in canon", () => {
+        const canon = new Tag("CanonTag");
+        canon.persist();
         assertThrows(() => {
-          new Tag().addInCanonTag();
+          new Tag().addInCanonTag(canon);
         });
       });
 
@@ -473,8 +477,10 @@ describe("TagSystem", () => {
       });
 
       it("[[Call]] throws when this is not a conceptual tag", () => {
+        const involved = new Tag();
+        involved.persist();
         assertThrows(() => {
-          new Tag().addInvolvesTag();
+          new Tag().addInvolvesTag(involved);
         });
       });
 
@@ -553,7 +559,10 @@ describe("TagSystem", () => {
         const tag = new Tag();
         tag.addAltLabel("etaoin");
         tag.deleteAltLabel();
-        assertEquals([...tag.altLabels()], ["etaoin"]);
+        assertEquals(
+          Array.from(tag.altLabels(), ($) => ({ ...$ })),
+          [{ "@value": "etaoin" }],
+        );
       });
 
       it("[[Call]] deletes only the provided hidden labels", () => {
@@ -570,7 +579,10 @@ describe("TagSystem", () => {
           { "@value": "three", "@language": "en" },
           { "@value": "four", "@language": "en" },
         );
-        assertEquals([...tag.altLabels()], ["four"]);
+        assertEquals(
+          Array.from(tag.altLabels(), ($) => ({ ...$ })),
+          [{ "@value": "four" }],
+        );
       });
 
       it("[[Call]] returns this", () => {
@@ -621,7 +633,10 @@ describe("TagSystem", () => {
         const tag = new Tag();
         tag.addHiddenLabel("etaoin");
         tag.deleteHiddenLabel();
-        assertEquals([...tag.hiddenLabels()], ["etaoin"]);
+        assertEquals(
+          Array.from(tag.hiddenLabels(), ($) => ({ ...$ })),
+          [{ "@value": "etaoin" }],
+        );
       });
 
       it("[[Call]] deletes only the provided alternative labels", () => {
@@ -638,7 +653,10 @@ describe("TagSystem", () => {
           { "@value": "three", "@language": "en" },
           { "@value": "four", "@language": "en" },
         );
-        assertEquals([...tag.hiddenLabels()], ["four"]);
+        assertEquals(
+          Array.from(tag.hiddenLabels(), ($) => ({ ...$ })),
+          [{ "@value": "four" }],
+        );
       });
 
       it("[[Call]] returns this", () => {
@@ -916,9 +934,9 @@ describe("TagSystem", () => {
       it("[[Set]] sets the preferred label", () => {
         const tag = new Tag();
         tag.prefLabel = "one";
-        assertStrictEquals(tag.prefLabel, "one");
+        assertEquals({ ...tag.prefLabel }, { "@value": "one" });
         tag.prefLabel = { "@value": "two" };
-        assertStrictEquals(tag.prefLabel, "two");
+        assertEquals({ ...tag.prefLabel }, { "@value": "two" });
         tag.prefLabel = { "@value": "three", "@language": "en" };
         assertEquals(
           { ...tag.prefLabel },