From 23e67eb5153bd26dbae471b27dc6a21a6d283b0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Sat, 18 Jan 2020 21:49:55 +0100 Subject: stabilize net Addr (#3709) Co-authored-by: xiaoxintang <15707971810@163.com> --- std/http/server_test.ts | 57 ++++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 31 deletions(-) (limited to 'std') diff --git a/std/http/server_test.ts b/std/http/server_test.ts index aee9db0ff..a4bc58ad1 100644 --- a/std/http/server_test.ts +++ b/std/http/server_test.ts @@ -41,6 +41,29 @@ const dec = new TextDecoder(); type Handler = () => void; +const mockConn = { + localAddr: { + transport: "tcp", + hostname: "", + port: 0 + }, + remoteAddr: { + transport: "tcp", + hostname: "", + port: 0 + }, + rid: -1, + closeRead: (): void => {}, + closeWrite: (): void => {}, + read: async (): Promise => { + return 0; + }, + write: async (): Promise => { + return -1; + }, + close: (): void => {} +}; + const responseTests: ResponseTest[] = [ // Default response { @@ -75,20 +98,7 @@ test(async function responseWrite(): Promise { const request = new ServerRequest(); request.w = bufw; - request.conn = { - localAddr: "", - remoteAddr: "", - rid: -1, - closeRead: (): void => {}, - closeWrite: (): void => {}, - read: async (): Promise => { - return 0; - }, - write: async (): Promise => { - return -1; - }, - close: (): void => {} - }; + request.conn = mockConn as Deno.Conn; await request.respond(testCase.response); assertEquals(buf.toString(), testCase.raw); @@ -416,21 +426,6 @@ test(async function writeStringReaderResponse(): Promise { assertEquals(r.more, false); }); -const mockConn = { - localAddr: "", - remoteAddr: "", - rid: -1, - closeRead: (): void => {}, - closeWrite: (): void => {}, - read: async (): Promise => { - return 0; - }, - write: async (): Promise => { - return -1; - }, - close: (): void => {} -}; - test(async function readRequestError(): Promise { const input = `GET / HTTP/1.1 malformedHeader @@ -438,7 +433,7 @@ malformedHeader const reader = new BufReader(new StringReader(input)); let err; try { - await readRequest(mockConn, reader); + await readRequest(mockConn as Deno.Conn, reader); } catch (e) { err = e; } @@ -517,7 +512,7 @@ test(async function testReadRequestError(): Promise { // eslint-disable-next-line @typescript-eslint/no-explicit-any let req: any; try { - req = await readRequest(mockConn, reader); + req = await readRequest(mockConn as Deno.Conn, reader); } catch (e) { err = e; } -- cgit v1.2.3