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.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',