Use jsr:@std for testing.

dajiaji · Aug 9, 2024 · 4730cf7 · 4730cf7
1 parent 2803aef
commit 4730cf7
Show file tree

Hide file tree

Showing 51 changed files with 216 additions and 349 deletions.
diff --git a/core/deno.json b/core/deno.json
@@ -1,7 +1,8 @@
 {
   "imports": {
     "@deno/dnt": "jsr:@deno/dnt@^0.41.2",
-    "testing/": "https://deno.land/std@0.224.0/testing/"
+    "@std/assert": "jsr:@std/assert@1.0.0",
+    "@std/testing": "jsr:@std/testing@^1.0.0"
   },
   "fmt": {
     "include": [

diff --git a/core/deno.lock b/core/deno.lock
diff --git a/core/test/cipherSuite.test.ts b/core/test/cipherSuite.test.ts
@@ -1,5 +1,5 @@
-import { assertEquals, assertRejects, assertThrows } from "testing/asserts.ts";
-import { describe, it } from "testing/bdd.ts";
+import { assertEquals, assertRejects, assertThrows } from "@std/assert";
+import { describe, it } from "@std/testing/bdd";
 
 import {
   AeadId,

diff --git a/core/test/runtimes/bun/core.spec.ts b/core/test/runtimes/bun/core.spec.ts
@@ -1,5 +1,5 @@
-import { assertEquals } from "testing/asserts.ts";
-import { describe, it } from "testing/bdd.ts";
+import { assertEquals } from "@std/assert";
+import { describe, it } from "@std/testing/bdd";
 
 describe("Bun", () => {
   describe("GET /test?kem=0x0010", () => {

diff --git a/core/test/runtimes/cloudflare/core.spec.ts b/core/test/runtimes/cloudflare/core.spec.ts
@@ -1,5 +1,5 @@
-import { assertEquals } from "testing/asserts.ts";
-import { describe, it } from "testing/bdd.ts";
+import { assertEquals } from "@std/assert";
+import { describe, it } from "@std/testing/bdd";
 
 describe("Cloudflare Workers", () => {
   describe("GET /test?kem=0x0010", () => {

diff --git a/deno.json b/deno.json
@@ -1,7 +1,8 @@
 {
   "imports": {
     "@deno/dnt": "jsr:@deno/dnt@^0.41.2",
-    "testing/": "https://deno.land/std@0.224.0/testing/"
+    "@std/assert": "jsr:@std/assert@1.0.0",
+    "@std/testing": "jsr:@std/testing@^1.0.0"
   },
   "fmt": {
     "include": [

diff --git a/deno.lock b/deno.lock
diff --git a/test/bignum.test.ts b/test/bignum.test.ts
@@ -1,6 +1,6 @@
-import { assertEquals, assertThrows } from "testing/asserts.ts";
+import { assertEquals, assertThrows } from "@std/assert";
 
-import { describe, it } from "testing/bdd.ts";
+import { describe, it } from "@std/testing/bdd";
 
 import { Bignum } from "../src/utils/bignum.ts";
 

diff --git a/test/cipherSuite.test.ts b/test/cipherSuite.test.ts
@@ -1,5 +1,5 @@
-import { assertEquals, assertRejects, assertThrows } from "testing/asserts.ts";
-import { describe, it } from "testing/bdd.ts";
+import { assertEquals, assertRejects, assertThrows } from "@std/assert";
+import { describe, it } from "@std/testing/bdd";
 
 import * as errors from "../src/errors.ts";
 import { AeadId, KdfId, KemId } from "../src/identifiers.ts";

diff --git a/test/cipherSuiteBackwardCompat.test.ts b/test/cipherSuiteBackwardCompat.test.ts
@@ -1,6 +1,6 @@
-import { assertEquals, assertRejects, assertThrows } from "testing/asserts.ts";
+import { assertEquals, assertRejects, assertThrows } from "@std/assert";
 
-import { describe, it } from "testing/bdd.ts";
+import { describe, it } from "@std/testing/bdd";
 
 import { Aead, Kdf, Kem } from "../src/identifiers.ts"; // deprecated identifiers as the test target.
 import { CipherSuite } from "../src/cipherSuite.ts";

diff --git a/test/cipherSuiteNative.test.ts b/test/cipherSuiteNative.test.ts
@@ -1,5 +1,5 @@
-import { assertEquals, assertRejects, assertThrows } from "testing/asserts.ts";
-import { describe, it } from "testing/bdd.ts";
+import { assertEquals, assertRejects, assertThrows } from "@std/assert";
+import { describe, it } from "@std/testing/bdd";
 
 import {
   AeadId,

diff --git a/test/conformance.test.ts b/test/conformance.test.ts
@@ -1,4 +1,4 @@
-import { afterAll, beforeAll, describe, it } from "testing/bdd.ts";
+import { afterAll, beforeAll, describe, it } from "@std/testing/bdd";
 
 import type { ConformanceTester } from "./conformanceTester.ts";
 import type { TestVector } from "./testVector.ts";

diff --git a/test/conformanceTester.ts b/test/conformanceTester.ts
@@ -1,4 +1,4 @@
-import { assertEquals, assertRejects } from "testing/asserts.ts";
+import { assertEquals, assertRejects } from "@std/assert";
 
 import type { PreSharedKey } from "../src/interfaces/preSharedKey.ts";
 import type { XCryptoKey } from "../src/xCryptoKey.ts";

diff --git a/test/dhkemPrimitives.test.ts b/test/dhkemPrimitives.test.ts
@@ -1,5 +1,5 @@
-import { assertEquals, assertRejects } from "testing/asserts.ts";
-import { describe, it } from "testing/bdd.ts";
+import { assertEquals, assertRejects } from "@std/assert";
+import { describe, it } from "@std/testing/bdd";
 
 import * as errors from "../src/errors.ts";
 import { KemId } from "../src/identifiers.ts";

diff --git a/test/encryptionContext.test.ts b/test/encryptionContext.test.ts
@@ -1,5 +1,5 @@
-import { assertEquals, assertRejects, assertThrows } from "testing/asserts.ts";
-import { describe, it } from "testing/bdd.ts";
+import { assertEquals, assertRejects, assertThrows } from "@std/assert";
+import { describe, it } from "@std/testing/bdd";
 
 import { Aes128Gcm } from "../src/aeads/aesGcm.ts";
 import { ExportOnly } from "../src/aeads/exportOnly.ts";

diff --git a/test/errors.test.ts b/test/errors.test.ts
@@ -1,6 +1,6 @@
-import { assertEquals } from "testing/asserts.ts";
+import { assertEquals } from "@std/assert";
 
-import { describe, it } from "testing/bdd.ts";
+import { describe, it } from "@std/testing/bdd";
 
 import * as errors from "../src/errors.ts";
 

diff --git a/test/kdfContext.test.ts b/test/kdfContext.test.ts
@@ -1,6 +1,6 @@
-import { assertEquals, assertRejects } from "testing/asserts.ts";
+import { assertEquals, assertRejects } from "@std/assert";
 
-import { describe, it } from "testing/bdd.ts";
+import { describe, it } from "@std/testing/bdd";
 
 import { HkdfSha256 } from "../src/kdfs/hkdfSha256.ts";
 import { HkdfSha384 } from "../src/kdfs/hkdfSha384.ts";

diff --git a/test/kemContext.test.ts b/test/kemContext.test.ts
@@ -1,5 +1,5 @@
-import { assertEquals, assertRejects } from "testing/asserts.ts";
-import { describe, it } from "testing/bdd.ts";
+import { assertEquals, assertRejects } from "@std/assert";
+import { describe, it } from "@std/testing/bdd";
 
 import * as errors from "../src/errors.ts";
 import { KemId } from "../src/identifiers.ts";

diff --git a/test/keyValidationEc.test.ts b/test/keyValidationEc.test.ts
@@ -1,4 +1,4 @@
-import { afterAll, beforeAll, describe, it } from "testing/bdd.ts";
+import { afterAll, beforeAll, describe, it } from "@std/testing/bdd";
 
 import type { ConformanceTester } from "./conformanceTester.ts";
 import type { WycheproofTestVector } from "./testVector.ts";

diff --git a/test/keyValidationX25519.test.ts b/test/keyValidationX25519.test.ts
@@ -1,4 +1,4 @@
-import { afterAll, beforeAll, describe, it } from "testing/bdd.ts";
+import { afterAll, beforeAll, describe, it } from "@std/testing/bdd";
 
 import type { ConformanceTester } from "./conformanceTester.ts";
 import type { WycheproofTestVector } from "./testVector.ts";

diff --git a/test/keyValidationX448.test.ts b/test/keyValidationX448.test.ts
@@ -1,4 +1,4 @@
-import { afterAll, beforeAll, describe, it } from "testing/bdd.ts";
+import { afterAll, beforeAll, describe, it } from "@std/testing/bdd";
 
 import type { ConformanceTester } from "./conformanceTester.ts";
 import type { WycheproofTestVector } from "./testVector.ts";

diff --git a/test/misc.test.ts b/test/misc.test.ts
@@ -1,5 +1,5 @@
-import { assertEquals, assertThrows } from "testing/asserts.ts";
-import { describe, it } from "testing/bdd.ts";
+import { assertEquals, assertThrows } from "@std/assert";
+import { describe, it } from "@std/testing/bdd";
 
 import { xor } from "../src/encryptionContext.ts";
 import { i2Osp } from "../src/utils/misc.ts";

diff --git a/test/runtimes/bun/hpke.spec.ts b/test/runtimes/bun/hpke.spec.ts
@@ -1,5 +1,5 @@
-import { assertEquals } from "testing/asserts.ts";
-import { describe, it } from "testing/bdd.ts";
+import { assertEquals } from "@std/assert";
+import { describe, it } from "@std/testing/bdd";
 
 describe("Cloudflare Workers", () => {
   describe("GET /test?kem=0x0010", () => {