From 0bc57eebcb87390c490391a9bbd682b334e2bfaf Mon Sep 17 00:00:00 2001 From: Don Isaac Date: Tue, 10 Dec 2024 22:05:46 -0800 Subject: [PATCH] =?UTF-8?q?test(deno):=20use=20`expect.toBeGreaterThanorEq?= =?UTF-8?q?ual`=20on=20failing=20deno=20perf=20=E2=80=A6=20(#15700)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Don Isaac --- test/js/deno/harness.ts | 20 ++++++++++++++++++++ test/js/deno/performance/performance.test.ts | 5 +++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/test/js/deno/harness.ts b/test/js/deno/harness.ts index d3a0439e2a..64b6f2b7d7 100644 --- a/test/js/deno/harness.ts +++ b/test/js/deno/harness.ts @@ -130,6 +130,22 @@ export function createDenoTest(path: string, defaultTimeout = 5000) { } }; + const assertGreaterThan = (actual: number, expected: number, message?: string) => { + expect(actual).toBeGreaterThan(expected); + } + + const assertGreaterThanOrEqual = (actual: number, expected: number, message?: string) => { + expect(actual).toBeGreaterThanOrEqual(expected); + } + + const assertLessThan = (actual: number, expected: number, message?: string) => { + expect(actual).toBeLessThan(expected); + } + + const assertLessThanOrEqual = (actual: number, expected: number, message?: string) => { + expect(actual).toBeLessThanOrEqual(expected); + } + const assertInstanceOf = (actual: unknown, expected: unknown, message?: string) => { expect(actual).toBeInstanceOf(expected); }; @@ -328,6 +344,10 @@ export function createDenoTest(path: string, defaultTimeout = 5000) { assertStrictEquals, assertNotStrictEquals, assertAlmostEquals, + assertGreaterThan, + assertGreaterThanOrEqual, + assertLessThan, + assertLessThanOrEqual, assertInstanceOf, assertNotInstanceOf, assertStringIncludes, diff --git a/test/js/deno/performance/performance.test.ts b/test/js/deno/performance/performance.test.ts index 8753b774f8..5dba6df82a 100644 --- a/test/js/deno/performance/performance.test.ts +++ b/test/js/deno/performance/performance.test.ts @@ -1,6 +1,6 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. import { createDenoTest } from "deno:harness"; -const { test, assert, assertEquals, assertThrows } = createDenoTest(import.meta.path); +const { test, assert, assertEquals, assertGreaterThanOrEqual, assertThrows } = createDenoTest(import.meta.path); test({ permissions: { hrtime: false } }, async function performanceNow() { const { promise, resolve } = Promise.withResolvers(); @@ -90,7 +90,8 @@ test(function performanceMeasure() { assertEquals(measure2.startTime, 0); assertEquals(mark1.startTime, measure1.startTime); assertEquals(mark1.startTime, measure2.duration); - assert(measure1.duration >= 100, `duration below 100ms: ${measure1.duration}`); + // assert(measure1.duration >= 100, `duration below 100ms: ${measure1.duration}`); + assertGreaterThanOrEqual(measure1.duration, 100, `duration below 100ms: ${measure1.duration}`); assert( measure1.duration < (later - now) * 1.5, `duration exceeds 150% of wallclock time: ${measure1.duration}ms vs ${later - now}ms`,