1 files changed, 33 insertions, 26 deletions

diff --git a/std/io/bufio_test.ts b/std/io/bufio_test.ts
index 7e737e60f..a4f03338d 100644
--- a/std/io/bufio_test.ts
+++ b/std/io/bufio_test.ts
@@ -5,12 +5,7 @@
 
 const { Buffer } = Deno;
 type Reader = Deno.Reader;
-import {
-  assert,
-  assertEquals,
-  fail,
-  assertNotEOF,
-} from "../testing/asserts.ts";
+import { assert, assertEquals, fail } from "../testing/asserts.ts";
 import {
   BufReader,
   BufWriter,
@@ -30,7 +25,7 @@ async function readBytes(buf: BufReader): Promise<string> {
   let nb = 0;
   while (true) {
     const c = await buf.readByte();
-    if (c === Deno.EOF) {
+    if (c === null) {
       break; // EOF
     }
     b[nb] = c;
@@ -69,7 +64,7 @@ async function reads(buf: BufReader, m: number): Promise<string> {
   let nb = 0;
   while (true) {
     const result = await buf.read(b.subarray(nb, nb + m));
-    if (result === Deno.EOF) {
+    if (result === null) {
       break;
     }
     nb += result;
@@ -152,7 +147,8 @@ Deno.test("bufioBufferFull", async function (): Promise<void> {
     assertEquals(decoder.decode(err.partial), "And now, hello, ");
   }
 
-  const line = assertNotEOF(await buf.readSlice(charCode("!")));
+  const line = await buf.readSlice(charCode("!"));
+  assert(line !== null);
   const actual = decoder.decode(line);
   assertEquals(actual, "world!");
 });
@@ -161,14 +157,16 @@ Deno.test("bufioReadString", async function (): Promise<void> {
   const string = "And now, hello world!";
   const buf = new BufReader(stringsReader(string), MIN_READ_BUFFER_SIZE);
 
-  const line = assertNotEOF(await buf.readString(","));
+  const line = await buf.readString(",");
+  assert(line !== null);
   assertEquals(line, "And now,");
   assertEquals(line.length, 8);
 
-  const line2 = assertNotEOF(await buf.readString(","));
+  const line2 = await buf.readString(",");
+  assert(line2 !== null);
   assertEquals(line2, " hello world!");
 
-  assertEquals(await buf.readString(","), Deno.EOF);
+  assertEquals(await buf.readString(","), null);
 
   try {
     await buf.readString("deno");
@@ -192,7 +190,7 @@ const testOutput = encoder.encode("0123456789abcdefghijklmnopqrstuvwxy");
 class TestReader implements Reader {
   constructor(private data: Uint8Array, private stride: number) {}
 
-  read(buf: Uint8Array): Promise<number | Deno.EOF> {
+  read(buf: Uint8Array): Promise<number | null> {
     let nread = this.stride;
     if (nread > this.data.byteLength) {
       nread = this.data.byteLength;
@@ -201,7 +199,7 @@ class TestReader implements Reader {
       nread = buf.byteLength;
     }
     if (nread === 0) {
-      return Promise.resolve(Deno.EOF);
+      return Promise.resolve(null);
     }
     copyBytes(buf as Uint8Array, this.data);
     this.data = this.data.subarray(nread);
@@ -216,7 +214,7 @@ async function testReadLine(input: Uint8Array): Promise<void> {
     const l = new BufReader(reader, input.byteLength + 1);
     while (true) {
       const r = await l.readLine();
-      if (r === Deno.EOF) {
+      if (r === null) {
         break;
       }
       const { line, more } = r;
@@ -253,10 +251,12 @@ Deno.test("bufioPeek", async function (): Promise<void> {
     MIN_READ_BUFFER_SIZE
   );
 
-  let actual = assertNotEOF(await buf.peek(1));
+  let actual = await buf.peek(1);
+  assert(actual !== null);
   assertEquals(decoder.decode(actual), "a");
 
-  actual = assertNotEOF(await buf.peek(4));
+  actual = await buf.peek(4);
+  assert(actual !== null);
   assertEquals(decoder.decode(actual), "abcd");
 
   try {
@@ -271,33 +271,39 @@ Deno.test("bufioPeek", async function (): Promise<void> {
   await buf.read(p.subarray(0, 3));
   assertEquals(decoder.decode(p.subarray(0, 3)), "abc");
 
-  actual = assertNotEOF(await buf.peek(1));
+  actual = await buf.peek(1);
+  assert(actual !== null);
   assertEquals(decoder.decode(actual), "d");
 
-  actual = assertNotEOF(await buf.peek(1));
+  actual = await buf.peek(1);
+  assert(actual !== null);
   assertEquals(decoder.decode(actual), "d");
 
-  actual = assertNotEOF(await buf.peek(1));
+  actual = await buf.peek(1);
+  assert(actual !== null);
   assertEquals(decoder.decode(actual), "d");
 
-  actual = assertNotEOF(await buf.peek(2));
+  actual = await buf.peek(2);
+  assert(actual !== null);
   assertEquals(decoder.decode(actual), "de");
 
   const res = await buf.read(p.subarray(0, 3));
   assertEquals(decoder.decode(p.subarray(0, 3)), "def");
-  assert(res !== Deno.EOF);
+  assert(res !== null);
 
-  actual = assertNotEOF(await buf.peek(4));
+  actual = await buf.peek(4);
+  assert(actual !== null);
   assertEquals(decoder.decode(actual), "ghij");
 
   await buf.read(p);
   assertEquals(decoder.decode(p), "ghijklmnop");
 
-  actual = assertNotEOF(await buf.peek(0));
+  actual = await buf.peek(0);
+  assert(actual !== null);
   assertEquals(decoder.decode(actual), "");
 
   const r = await buf.peek(1);
-  assert(r === Deno.EOF);
+  assert(r === null);
   /* TODO
 	Test for issue 3022, not exposing a reader's error on a successful Peek.
 	buf = NewReaderSize(dataAndEOFReader("abcd"), 32)
@@ -396,7 +402,8 @@ Deno.test("bufReaderReadFull", async function (): Promise<void> {
   const bufr = new BufReader(data, 3);
   {
     const buf = new Uint8Array(6);
-    const r = assertNotEOF(await bufr.readFull(buf));
+    const r = await bufr.readFull(buf);
+    assert(r !== null);
     assertEquals(r, buf);
     assertEquals(dec.decode(buf), "Hello ");
   }