Add presentation holder tests, update test file numeration, fix related resources tests

Signed-off-by: PatStLouis <[email protected]>

Author: PatStLouis

tests/1-3-conformance.js renamed to tests/1.3-conformance.js

@@ -28,6 +28,25 @@ describe('Status', function() {
     describe(name, function() {
       beforeEach(addPerTestMetadata);
 
+      it('The type property is REQUIRED.', async function() {
+        this.test.link = `https://w3c.github.io/vc-data-model/#status:~:text=credential%20status%20object.-,If%20present%2C%20the%20normative%20guidance%20in%20Section%204.4%20Identifiers%20MUST%20be%20followed.,-type`;
+        await assert.rejects(endpoints.issue(require(
+          './input/credential-status-missing-type-fail.json')),
+        'Failed to reject a VC with `credentialStatus` without a `type`.');
+      });
+
+      it('The related normative guidance in Section 4.5 ' +
+        'Types MUST be followed.',
+      async function() {
+        this.test.link = `https://w3c.github.io/vc-data-model/#status:~:text=credential%20status%20object.-,If%20present%2C%20the%20normative%20guidance%20in%20Section%204.4%20Identifiers%20MUST%20be%20followed.,-type`;
+        await assert.doesNotReject(endpoints.issue(require(
+          './input/credential-status-ok.json')),
+        'Failed to accept a VC with `credentialStatus` with a `type`.');
+        await assert.rejects(endpoints.issue(require(
+          './input/credential-status-missing-type-fail.json')),
+        'Failed to reject a VC with `credentialStatus` without a `type`.');
+      });
+
       it('If present (credentialStatus.id), the normative guidance ' +
         'in Section 4.4 Identifiers MUST be followed.', async function() {
         this.test.link = `https://w3c.github.io/vc-data-model/#status:~:text=credential%20status%20object.-,If%20present%2C%20the%20normative%20guidance%20in%20Section%204.4%20Identifiers%20MUST%20be%20followed.,-type`;

tests/410-status.js renamed to tests/4.10-status.js

@@ -6,9 +6,9 @@
 
 import {addPerTestMetadata, setupMatrix}
   from './helpers.js';
+import {createLocalVp, localIssuer} from './data-generator.js';
 import assert from 'node:assert/strict';
 import chai from 'chai';
-import {createLocalVp} from './data-generator.js';
 import {createRequire} from 'module';
 import {filterByTag} from 'vc-test-suite-implementations';
 import {TestEndpoints} from './TestEndpoints.js';
@@ -33,7 +33,6 @@ describe('Verifiable Presentations', function() {
       it('If [the `id` field is] present, the normative guidance in Section ' +
         '4.4 Identifiers MUST be followed.', async function() {
         this.test.link = `https://w3c.github.io/vc-data-model/#verifiable-presentations:~:text=verifiable%20presentation.-,If%20present%2C%20the%20normative%20guidance%20in%20Section%204.4%20Identifiers%20MUST%20be%20followed.,-type`;
-        // a presentation with a valid id should verify
         const presentationValidId = await createLocalVp({
           presentation: require('./input/presentation-id-ok.json')
         });
@@ -43,19 +42,33 @@ describe('Verifiable Presentations', function() {
         );
       });
 
-      it('The type property MUST be present. One value of this property MUST ' +
+      it('The type property MUST be present.',
+        async function() {
+          this.test.link = `https://w3c.github.io/vc-data-model/#verifiable-presentations:~:text=The%20type%20property%20MUST%20be%20present.%20It%20is%20used%20to%20express%20the%20type%20of%20verifiable%20presentation.%20One%20value%20of%20this%20property%20MUST%20be%20VerifiablePresentation%2C%20but%20additional%20types%20MAY%20be%20included.%20The%20related%20normative%20guidance%20in%20Section%204.5%20Types%20MUST%20be%20followed.`;
+          const presentationWithType = await createLocalVp({
+            presentation: require('./input/presentation-ok.json')
+          });
+          await assert.doesNotReject(
+            endpoints.verifyVp(presentationWithType),
+            `Expected verifier ${name} to verify a VP with initial ` +
+          `type VerifiablePresentation.`);
+          // TODO, how to create negative fixture (missing type)
+        });
+
+      it('One value of this property MUST ' +
         'be VerifiablePresentation, but additional types MAY be included.' +
         'The related normative guidance in Section 4.5 Types MUST be followed.',
       async function() {
         this.test.link = `https://w3c.github.io/vc-data-model/#verifiable-presentations:~:text=The%20type%20property%20MUST%20be%20present.%20It%20is%20used%20to%20express%20the%20type%20of%20verifiable%20presentation.%20One%20value%20of%20this%20property%20MUST%20be%20VerifiablePresentation%2C%20but%20additional%20types%20MAY%20be%20included.%20The%20related%20normative%20guidance%20in%20Section%204.5%20Types%20MUST%20be%20followed.`;
         const presentationWithType = await createLocalVp({
-          presentation: require('./input/presentation-vc-ok.json')
+          presentation: require('./input/presentation-ok.json')
         });
         await assert.doesNotReject(
           endpoints.verifyVp(presentationWithType),
           `Expected verifier ${name} to verify a VP with initial ` +
           `type VerifiablePresentation.`
         );
+        // TODO, how to create negative fixture (wrong type)
       });
 
       it('The verifiableCredential property MAY be present. The value MUST be' +
@@ -71,13 +84,38 @@ describe('Verifiable Presentations', function() {
         await assert.doesNotReject(endpoints.verifyVp(
           presentationWithCredentials
         ), 'Failed to verify a valid VP.');
-        await assert.rejects(endpoints.verifyVp(require(
-          './input/presentation-vc-missing-required-type-fail.json')),
+        // TODO, how to create negative fixture (bad vc values)
+      });
+
+      it('If present (holder), the value MUST be either a URL or ' +
+        'an object containing an id property.',
+      async function() {
+        this.test.link = `https://w3c.github.io/vc-data-model/#verifiable-presentations:~:text=The%20verifiableCredential%20property%20MAY%20be%20present.%20The%20value%20MUST%20be%20one%20or%20more%20verifiable%20credential%20and/or%20enveloped%20verifiable%20credential%20objects%20(the%20values%20MUST%20NOT%20be%20non%2Dobject%20values%20such%20as%20numbers%2C%20strings%2C%20or%20URLs).`;
+        // TODO: Test with remote presentation creation or querying if/when
+        // supported by the implementation
+        const presentationWithHolder = await createLocalVp({
+          presentation: require('./input/presentation-holder-ok.json')
+        });
+        await assert.doesNotReject(endpoints.verifyVp(
+          presentationWithHolder
+        ), 'Failed to verify a valid VP with holder.');
+
+        // presentation.holder = {id: localIssuer};
+        const presentationWithHolderObject = await createLocalVp({
+          presentation: require('./input/presentation-holder-object-ok.json')
+        });
+        await assert.doesNotReject(endpoints.verifyVp(
+          presentationWithHolderObject
+        ), 'Failed to verify a valid VP with holder object.');
 
-        'Failed to reject a VP containing a VC with no `type` value.');
-        await assert.rejects(endpoints.verifyVp(require(
-          './input/presentation-vc-as-string-fail.json')),
-        'Failed to reject a VP containing a VC represented as a string.');
+        const presentationMissingHolderId = await createLocalVp({
+          presentation: require('./input/presentation-holder-object-fail.json')
+        });
+        await assert.rejects(endpoints.verifyVp(
+          presentationMissingHolderId
+        ), 'Failed to reject a VP with an invalid holder.');
+
+        // TODO, how to create negative fixture (bad holder values)
       });
     });
   }
@@ -86,7 +124,8 @@ describe('Verifiable Presentations', function() {
 // 4.12.4 Presentations Including Holder Claims https://w3c.github.io/vc-data-model/#presentations-including-holder-claims
 describe('VP - Presentations Including Holder Claims', function() {
   setupMatrix.call(this, match);
-  for(const [name] of match) {
+  for(const [name, implementation] of match) {
+    const endpoints = new TestEndpoints({implementation, tag});
 
     describe(name, function() {
       beforeEach(addPerTestMetadata);
@@ -96,9 +135,15 @@ describe('VP - Presentations Including Holder Claims', function() {
         'verifiable presentation MUST include a holder property.',
       async function() {
         this.test.link = `https://w3c.github.io/vc-data-model/#presentations-including-holder-claims:~:text=A%20verifiable%20presentation%20that%20includes%20a%20self%2Dasserted%20verifiable%20credential%20that%20is%20only%20secured%20using%20the%20same%20mechanism%20as%20the%20verifiable%20presentation%20MUST%20include%20a%20holder%20property.`;
-        // TODO: implement test
-        this.test.cell.skipMessage = 'TBD';
-        this.skip();
+        const presentation = require('./input/presentation-vc-ok.json');
+
+        presentation.verifiableCredential[0].issuer = localIssuer;
+        const presentationMissingHolder = await createLocalVp({
+          presentation
+        });
+        await assert.rejects(endpoints.verifyVp(
+          presentationMissingHolder
+        ), 'Failed to reject a VP with self-asserted VC without holder.');
       });
 
       it('When a self-asserted verifiable credential is secured using the ' +
@@ -107,9 +152,36 @@ describe('VP - Presentations Including Holder Claims', function() {
         'the holder property of the verifiable presentation.',
       async function() {
         this.test.link = `https://w3c.github.io/vc-data-model/#presentations-including-holder-claims:~:text=When%20a%20self%2Dasserted%20verifiable%20credential%20is%20secured%20using%20the%20same%20mechanism%20as%20the%20verifiable%20presentation%2C%20the%20value%20of%20the%20issuer%20property%20of%20the%20verifiable%20credential%20MUST%20be%20identical%20to%20the%20holder%20property%20of%20the%20verifiable%20presentation.`;
-        // TODO: implement test
-        this.test.cell.skipMessage = 'TBD';
-        this.skip();
+        const presentation = require('./input/presentation-vc-ok.json');
+
+        presentation.verifiableCredential[0].issuer = localIssuer;
+        presentation.holder = localIssuer;
+        const presentationHolderMatch = await createLocalVp({
+          presentation
+        });
+        await assert.doesNotReject(endpoints.verifyVp(
+          presentationHolderMatch
+        ), 'Failed to verify a VP containing a self-asserted VC.');
+
+        presentation.verifiableCredential[0].issuer = localIssuer;
+        presentation.holder = 'did:example:acme';
+        const presentationHolderMismatch = await createLocalVp({
+          presentation
+        });
+        await assert.rejects(endpoints.verifyVp(
+          presentationHolderMismatch
+        ), 'Failed to reject a VP with self-asserted VC ' +
+        'with a holder/issuer mismatch.');
+
+        presentation.verifiableCredential[0].issuer = 'did:example:acme';
+        presentation.holder = localIssuer;
+        const presentationIssuerMismatch = await createLocalVp({
+          presentation
+        });
+        await assert.rejects(endpoints.verifyVp(
+          presentationIssuerMismatch
+        ), 'Failed to reject a VP with self-asserted VC ' +
+        'with a holder/issuer mismatch.');
       });
     });
   }

tests/411-data-schemas.js renamed to tests/4.11-data-schemas.js

@@ -35,8 +35,10 @@ describe('Issuer', function() {
             require('./input/credential-ok.json'));
           vc.hasOwnProperty('issuer');
         });
-      it('The value of the issuer property MUST be either a URL, or ' +
-        'an object containing an id property whose value is a URL.',
+      it('The value of the issuer property MUST be either a URL or an ' +
+        'object containing an id property whose value is a URL; ' +
+        'in either case, the issuer selects this URL to identify itself in a ' +
+        'globally unambiguous way.',
       async function() {
         this.test.link = `https://w3c.github.io/vc-data-model/#issuer:~:text=The%20value%20of%20the%20issuer%20property%20MUST%20be%20either%20a%20URL%2C%20or%20an%20object%20containing%20an%20id%20property%20whose%20value%20is%20a%20URL`;
         await assert.doesNotReject(endpoints.issue(require(