Tidying up

finos · Jun 3, 2024 · 9132ad1 · 9132ad1
1 parent e0437ab
commit 9132ad1
Showing 1 changed file with 20 additions and 22 deletions.
diff --git a/src/test/v2.0/support/intent-support-2.0.ts b/src/test/v2.0/support/intent-support-2.0.ts
@@ -163,29 +163,27 @@ export class RaiseIntentControl2_0 {
     });
   }
 
-  async receiveContextStreamFromMockApp(privChannel: PrivateChannel, streamedNumberStart: number, streamedNumberEnd: number): Promise<Listener> {
-    let timeout;
-    const wrapper = wrapPromise();
-
-    //receive multiple contexts in succession from intent-k
-    const listener = privChannel.addContextListener(ContextType.testContextZ, (context: IntentUtilityContext) => {
-      expect(context.number, "Unexpected context stream number received.").to.be.equal(streamedNumberStart);
-      expect(context.type).to.be.equal(ContextType.testContextZ);
-
-      if (streamedNumberStart === streamedNumberEnd) {
-        wrapper.resolve();
-        clearTimeout(timeout);
-      }
-
-      streamedNumberStart += 1;
-    });
-
-    timeout = window.setTimeout(() => {
-      wrapper.reject("Timeout: did not receive all 5 streamed contexts back from the mock app. onAddContextListener may not have been triggered");
-    }, constants.WaitTime);
+  receiveContextStreamFromMockApp(privChannel: PrivateChannel, streamedNumberStart: number, streamedNumberEnd: number): Promise<void> {
+    return new Promise((resolve, reject) => {
+      //receive multiple contexts in succession from intent-k
+      privChannel.addContextListener(ContextType.testContextZ, (context: IntentUtilityContext) => {
+        expect(context.number, "Unexpected context stream number received.").to.be.equal(streamedNumberStart);
+        expect(context.type).to.be.equal(ContextType.testContextZ);
+
+        if (streamedNumberStart === streamedNumberEnd) {
+          resolve();
+        }
 
-    await wrapper.promise;
-    return listener;
+        streamedNumberStart += 1;
+      }).then(listener => {
+        setTimeout(() => {
+          listener.unsubscribe()
+          if (streamedNumberStart < streamedNumberEnd) {
+            reject("Timeout: did not receive all 5 streamed contexts back from the mock app. onAddContextListener may not have been triggered");
+          }
+        }, constants.WaitTime);
+      })
+    })
   }
 
   unsubscribeListener(listener: Listener): void {