Fixes to handling of Map and Set objects in DID document props.

- Map and Set objects are not treated correctly - Added test cases with hierarchical objects
w3c · May 24, 2021 · 329cc57 · 329cc57
1 parent b8983a5
commit 329cc57
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 16 deletions.
diff --git a/packages/jest-did-matcher/src/matchers/toBeDidDocumentMap/index.test.js b/packages/jest-did-matcher/src/matchers/toBeDidDocumentMap/index.test.js
@@ -4,16 +4,21 @@ import matcher from '.';
 
 expect.extend(matcher);
 
+
 describe('.toBeDidDocumentMap', () => {
   each([
     [
         {
             "a": "1"
-        },
+        }
+    ],
+    [
         {
             "b": [ "1", "2", "3" ]
         },
-        {
+    ],
+    [
+       {
             "didDocumentMetadata": {
                 "canonicalId":"x",
                 "equivalentId":[
@@ -26,9 +31,11 @@ describe('.toBeDidDocumentMap', () => {
                   "published":true
                 }
             }
-        }
+        },
     ],
-  ]).test('passes when item is a type allowed in a DID Document map: %s', given => {
+    [new Map(Object.entries({ a: "1", b: "2", c: {"x": "1", "y": "2"}}))],
+    [new Set(["1", "2", "3", ["4", "5", "6"], {"x":"1", "y": "2"}])]
+]).test('passes when item is a type allowed in a DID Document map: %s', given => {
     expect(given).toBeDidDocumentMap();
   });
 });
@@ -62,7 +69,15 @@ describe('.not.toBeDidDocumentMap', () => {
           "published":true
         }
     }}],
-  ]).test('passes when not item is not of type DID Document map: %s', given => {
+    [new Map(Object.entries({ a: NaN, b: "2", c: {"x": "1", "y": "2"}}))],
+    [new Map(Object.entries({ a: "1", b: "2", c: {"x": NaN, "y": "2"}}))],
+    [new Map(Object.entries({ a: "1", b: undefined, c: {"x": "1", "y": "2"}}))],
+    [new Map(Object.entries({ a: "1", b: "2", c: {"x": "1", "y": undefined}}))],
+    [new Set(["1", "2", "3", ["4", NaN, "6"], {"x":"1", "y": "2"}])],
+    [new Set(["1", "2", "3", ["4", "5", undefined], {"x":"1", "y": "2"}])],
+    [new Set(["1", "2", "3", ["4", "5", "6"], {"x": undefined, "y": "2"}])],
+    [new Set(["1", "2", "3", ["4", "5", "6"], {"x": "1", "y": undefined }])]
+  ]).test('passes when item is not of type DID Document map: %s', given => {
     expect(given).not.toBeDidDocumentMap();
   });
 });
diff --git a/packages/jest-did-matcher/src/matchers/toBeDidDocumentMap/predicate.js b/packages/jest-did-matcher/src/matchers/toBeDidDocumentMap/predicate.js
@@ -9,14 +9,12 @@ export function predicate(expected) {
         return expected.map(element => predicate(element)).reduce( (p, c) => (p && c), true);
     }
 
-    if (expected instanceof Set) {
-        return expected.map(element => predicate(element)).reduce( (p, c) => (p && c), true);
+    if (expected instanceof Map || expected instanceof Set) {
+        let r = true;
+        expected.forEach(v => { r = r && predicate(v); });
+        return r;
     }
 
-    if (expected instanceof Map) {
-        return expected.map(element => predicate(element)).reduce( (p, c) => (p && c), true);
-    }
-
     if (typeof expected == "object") {
         return Object.keys(expected).map(key => predicate(expected[key])).reduce( (p, c) => (p && c), true);
     }

diff --git a/packages/jest-did-matcher/src/matchers/toBeDidDocumentPropertyValueType/index.test.js b/packages/jest-did-matcher/src/matchers/toBeDidDocumentPropertyValueType/index.test.js
@@ -7,12 +7,15 @@ expect.extend(matcher);
 describe('.toBeDidDocumentPropertyValueType', () => {
   each([
     ["String"],
-    [new String],
+    [new String()],
     [{}],
-    [new Map],
+    [{ a: "1", b: "2", c: {"x": "1", "y": "2"}}],
+    [new Map()],
+    [new Map(Object.entries({ a: "1", b: "2", c: {"x": "1", "y": "2"}}))],
     [[]],
-    [new Array],
-    [new Set],
+    [new Array(1)],
+    [new Set()],
+    [new Set(["1", "2", "3", ["4", "5", "6"], {"x":"1", "y": "2"}])],
     [true],
     [false],
     [null]

diff --git a/packages/jest-did-matcher/src/matchers/toBeDidDocumentPropertyValueType/predicate.js b/packages/jest-did-matcher/src/matchers/toBeDidDocumentPropertyValueType/predicate.js
@@ -8,7 +8,7 @@ export default expected => {
         return true;
     }
 
-    if (expected instanceof Set) {
+    if (expected instanceof Map || expected instanceof Set) {
         return true;
     }