Resolving issues with findIntent conformance tests cause by context metadata test additions

Author: kriswest

toolbox/fdc3-conformance/src/mock/intent-l.ts

@@ -0,0 +1,38 @@
+import { closeWindowOnCompletion, sendContextToTests, validateContext } from './mock-functions';
+import { getAgent } from '@finos/fdc3';
+import { IntentUtilityContext } from '../context-types';
+import { ContextMetadata, IntentResult } from '@finos/fdc3';
+import { ContextType, ControlContextType, Intent } from '../test/support/intent-support';
+
+// Used in 'IntentContextMetadata' and 'IntentContextMetadataWithAppMetadata' conformance tests
+getAgent().then(async fdc3 => {
+  await closeWindowOnCompletion(fdc3);
+
+  fdc3.addIntentListener(
+    Intent.lTestingIntent,
+    async (context: IntentUtilityContext, metadata?: ContextMetadata): Promise<IntentResult> => {
+      validateContext(fdc3, context.type, ContextType.testContextX);
+
+      const { appMetadata } = await fdc3.getInfo();
+
+      const controlContext: Record<string, unknown> = {
+        type: ControlContextType.A_TESTING_INTENT_LISTENER_TRIGGERED,
+        instanceId: appMetadata.instanceId,
+      };
+
+      if (metadata) {
+        controlContext.contextMetadata = {
+          source: metadata.source,
+          timestamp: metadata.timestamp instanceof Date ? metadata.timestamp.toISOString() : String(metadata.timestamp),
+          traceId: metadata.traceId,
+          signature: metadata.signature,
+          custom: metadata.custom,
+        };
+      }
+
+      await sendContextToTests(fdc3, controlContext as unknown as IntentUtilityContext);
+
+      return;
+    }
+  );
+});

toolbox/fdc3-conformance/src/test/advanced/fdc3.findIntent.ts

@@ -60,7 +60,7 @@ export default async () =>
       );
     });
 
-    it("(IntentAppDMultiple2) Should find intent 'sharedTestingIntent2' belonging to multiple apps (intent-a & intent-b) filtered by specific context 'testContextY'", async () => {
+    it("(FindIntentAppDMultiple2) Should find intent 'sharedTestingIntent2' belonging to multiple apps (intent-a & intent-b) filtered by specific context 'testContextY'", async () => {
       const appIntent = await fdc3.findIntent(Intent.sharedTestingIntent2, { type: ContextType.testContextY });
       validateAppIntent(
         appIntent,

toolbox/fdc3-conformance/src/test/advanced/fdc3.findIntentsByContext.ts

@@ -16,21 +16,23 @@ export default async () =>
     it("(FindIntentByContextSingleContext) Should find intents by context 'testContextX'", async () => {
       try {
         const intents = await fdc3.findIntentsByContext({ type: ContextType.testContextX });
-        expect(intents).to.have.length(5);
+        expect(intents).to.have.length(6);
         const intentNames = intents.map(appIntent => appIntent.intent.name);
         expect(intentNames).to.have.all.members([
           Intent.aTestingIntent,
           Intent.sharedTestingIntent1,
           Intent.cTestingIntent,
           Intent.sharedTestingIntent2,
           Intent.kTestingIntent,
+          Intent.lTestingIntent,
         ]);
 
         validateIntents(intents, Intent.aTestingIntent, 1, [IntentApp.IntentAppA]);
         validateIntents(intents, Intent.sharedTestingIntent1, 2, [IntentApp.IntentAppA, IntentApp.IntentAppB]);
         validateIntents(intents, Intent.cTestingIntent, 1, [IntentApp.IntentAppC]);
         validateIntents(intents, Intent.sharedTestingIntent2, 1, [IntentApp.IntentAppD]);
         validateIntents(intents, Intent.kTestingIntent, 1, [IntentApp.IntentAppK]);
+        validateIntents(intents, Intent.lTestingIntent, 1, [IntentApp.IntentAppL]);
       } catch (ex) {
         handleFail(findIntentsByContextDocs, ex);
       }

toolbox/fdc3-conformance/src/test/advanced/fdc3.intent-context-metadata.ts

@@ -32,10 +32,10 @@ export default async () => {
         }
       );
 
-      const resolution = await control.raiseIntent(Intent.aTestingIntent, ContextType.testContextX, {
-        appId: IntentApp.IntentAppA,
+      const resolution = await control.raiseIntent(Intent.lTestingIntent, ContextType.testContextX, {
+        appId: IntentApp.IntentAppL,
       });
-      control.validateIntentResolution(IntentApp.IntentAppA, resolution);
+      control.validateIntentResolution(IntentApp.IntentAppL, resolution);
 
       await wrapper.promise;
       listener.unsubscribe();
@@ -65,9 +65,9 @@ export default async () => {
       // Raise intent with app-provided metadata
       const context = { type: ContextType.testContextX };
       await fdc3.raiseIntent(
-        Intent.aTestingIntent,
+        Intent.lTestingIntent,
         context,
-        { appId: IntentApp.IntentAppA },
+        { appId: IntentApp.IntentAppL },
         {
           traceId: 'intent-trace-456',
           signature: 'intent-sig',

toolbox/fdc3-conformance/src/test/support/intent-support.ts

@@ -326,7 +326,7 @@ export enum Intent {
   bTestingIntent = 'bTestingIntent',
   cTestingIntent = 'cTestingIntent',
   kTestingIntent = 'kTestingIntent',
-  lTestingIntent = 'LTestingIntent',
+  lTestingIntent = 'lTestingIntent',
   sharedTestingIntent1 = 'sharedTestingIntent1',
   sharedTestingIntent2 = 'sharedTestingIntent2',
   privateChannelIsPrivate = 'privateChannelIsPrivate',

toolbox/fdc3-conformance/static/apps/intent-l/index.html

@@ -0,0 +1,15 @@
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8" />
+  <link rel="stylesheet" href="../../lib/index.css" />
+</head>
+
+<body>
+  <p>Conformance Framework Mock Intent App L</p>
+  <p>This app is only used by the conformance framework for intent context metadata test purposes.</p>
+  <script src="../../lib/intent-l.js"></script>
+  
+</body>
+
+</html>