🌿 easier to understand test intent

vim-denops · Sep 18, 2024 · 5a22b02 · 5a22b02
1 parent 8a54da8
commit 5a22b02
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/tests/denops/runtime/functions/denops/interrupt_test.ts b/tests/denops/runtime/functions/denops/interrupt_test.ts
@@ -51,6 +51,7 @@ testHost({
 
         await host.call("denops#interrupt");
 
+        // It should passed because of delay(MIMIC_ABORT_DELAY) in dummy_interrupt_plugin.ts
         assertEquals(await host.call("eval", "g:__test_denops_events"), []);
       });
 
@@ -70,6 +71,7 @@ testHost({
         );
       });
 
+      // Reset interrupt event handler.
       await host.call("denops#request", "dummy", "reset", []);
 
       await t.step("sends signal to the plugin with reason", async () => {

diff --git a/tests/denops/runtime/functions/denops/notify_test.ts b/tests/denops/runtime/functions/denops/notify_test.ts
@@ -5,7 +5,6 @@ import { resolveTestDataPath } from "/denops-testdata/resolve.ts";
 import { testHost } from "/denops-testutil/host.ts";
 import { wait } from "/denops-testutil/wait.ts";
 
-const ASYNC_DELAY = 100;
 const MESSAGE_DELAY = 200;
 
 const scriptDispatcher = resolveTestDataPath("dummy_dispatcher_plugin.ts");
@@ -58,7 +57,7 @@ testHost({
       });
 
       await t.step("calls dispatcher method", async () => {
-        await delay(100 + ASYNC_DELAY);
+        await wait(() => host.call("eval", "len(g:__test_denops_events)"));
         assertEquals(await host.call("eval", "g:__test_denops_events"), [
           'DummyDispatcherPlugin:TestCalled:["foo"]',
         ]);

diff --git a/tests/denops/runtime/functions/denops/request_async_test.ts b/tests/denops/runtime/functions/denops/request_async_test.ts
@@ -3,14 +3,11 @@ import {
   assertEquals,
   assertObjectMatch,
 } from "jsr:@std/assert@^1.0.1";
-import { delay } from "jsr:@std/async@^1.0.1/delay";
 import { INVALID_PLUGIN_NAMES } from "/denops-testdata/invalid_plugin_names.ts";
 import { resolveTestDataPath } from "/denops-testdata/resolve.ts";
 import { testHost } from "/denops-testutil/host.ts";
 import { wait } from "/denops-testutil/wait.ts";
 
-const ASYNC_DELAY = 100;
-
 const scriptDispatcher = resolveTestDataPath("dummy_dispatcher_plugin.ts");
 
 testHost({
@@ -99,7 +96,7 @@ testHost({
       });
 
       await t.step("calls dispatcher method", async () => {
-        await delay(100 + ASYNC_DELAY);
+        await wait(() => host.call("eval", "len(g:__test_denops_events)"));
         assertArrayIncludes(
           await host.call("eval", "g:__test_denops_events") as unknown[],
           ['DummyDispatcherPlugin:TestCalled:["foo"]'],

diff --git a/tests/denops/testdata/dummy_dispatcher_plugin.ts b/tests/denops/testdata/dummy_dispatcher_plugin.ts
@@ -1,10 +1,12 @@
 import { delay } from "jsr:@std/async@^1.0.1/delay";
 import type { Entrypoint } from "jsr:@denops/core@^7.0.0";
 
+const MIMIC_DISPATCHER_METHOD_DELAY = 100;
+
 export const main: Entrypoint = (denops) => {
   denops.dispatcher = {
     test: async (...args) => {
-      await delay(100);
+      await delay(MIMIC_DISPATCHER_METHOD_DELAY);
       await denops.cmd(
         `doautocmd <nomodeline> User DummyDispatcherPlugin:TestCalled:${
           JSON.stringify(args).replaceAll(/[ \\"]/g, "\\$&")

diff --git a/tests/denops/testdata/dummy_interrupt_plugin.ts b/tests/denops/testdata/dummy_interrupt_plugin.ts
@@ -1,11 +1,14 @@
 import type { Entrypoint } from "jsr:@denops/core@^7.0.0";
 import { delay } from "jsr:@std/async@^1.0.1/delay";
 
+const MIMIC_ABORT_DELAY = 100;
+
 export const main: Entrypoint = (denops) => {
+  /** Reset interrupt event handler. */
   function reset(): void {
     const signal = denops.interrupted;
     signal?.addEventListener("abort", async () => {
-      await delay(100);
+      await delay(MIMIC_ABORT_DELAY);
       await denops.cmd(
         `doautocmd <nomodeline> User DummyInterruptPlugin:Interrupted:${
           String(signal.reason).replaceAll(/[ \\"]/g, "\\$&")