From e85a55599bdb055b8b6c7e88da89d67e7b7dcf53 Mon Sep 17 00:00:00 2001 From: Geoff Gustafson Date: Fri, 2 Mar 2018 10:46:12 -0800 Subject: [PATCH 1/3] Add unit tests for debugger client JerryScript-DCO-1.0-Signed-off-by: Geoff Gustafson geoff@linux.intel.com --- .../src/lib/__tests__/debugger-client.test.ts | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 jerry-debugger/jerry-client-ts/src/lib/__tests__/debugger-client.test.ts diff --git a/jerry-debugger/jerry-client-ts/src/lib/__tests__/debugger-client.test.ts b/jerry-debugger/jerry-client-ts/src/lib/__tests__/debugger-client.test.ts new file mode 100644 index 0000000000..92d5e4df21 --- /dev/null +++ b/jerry-debugger/jerry-client-ts/src/lib/__tests__/debugger-client.test.ts @@ -0,0 +1,51 @@ +// Copyright JS Foundation and other contributors, http://js.foundation +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import { JerryDebuggerClient, DEFAULT_DEBUGGER_HOST, DEFAULT_DEBUGGER_PORT } from '../debugger-client'; +import WebSocket from 'ws'; + +jest.mock('ws'); + +describe('JerryDebugger constructor', () => { + it ('uses supplied option values', () => { + const delegate = {} as any; + const jd = new JerryDebuggerClient({ + delegate, + host: '10.10.10.10', + port: 4096, + }); + expect((jd as any).delegate).toEqual(delegate); + expect(jd.host).toEqual('10.10.10.10'); + expect(jd.port).toEqual(4096); + }); + + it('supplies option defaults when missing', () => { + const delegate = {} as any; + const jd = new JerryDebuggerClient({ delegate }); + expect(jd.host).toEqual(DEFAULT_DEBUGGER_HOST); + expect(jd.port).toEqual(DEFAULT_DEBUGGER_PORT); + }); +}); + +describe('JerryDebugger.connect', () => { + beforeEach(() => { + }); + + it('creates a websocket', () => { + const delegate = {} as any; + const jd = new JerryDebuggerClient({ delegate }); + jd.connect(); + expect(WebSocket).toHaveBeenCalledTimes(1); + }); +}); From 71ca03c32245a438fbcbf5c373928de7aa55cad8 Mon Sep 17 00:00:00 2001 From: Geoff Gustafson Date: Tue, 10 Apr 2018 16:10:05 -0700 Subject: [PATCH 2/3] fix lint issues but one remains - can't get the promise to resolve JerryScript-DCO-1.0-Signed-off-by: Geoff Gustafson geoff@linux.intel.com --- .../src/lib/__tests__/debugger-client.test.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/jerry-debugger/jerry-client-ts/src/lib/__tests__/debugger-client.test.ts b/jerry-debugger/jerry-client-ts/src/lib/__tests__/debugger-client.test.ts index 92d5e4df21..278818dd2d 100644 --- a/jerry-debugger/jerry-client-ts/src/lib/__tests__/debugger-client.test.ts +++ b/jerry-debugger/jerry-client-ts/src/lib/__tests__/debugger-client.test.ts @@ -18,7 +18,7 @@ import WebSocket from 'ws'; jest.mock('ws'); describe('JerryDebugger constructor', () => { - it ('uses supplied option values', () => { + it('uses supplied option values', () => { const delegate = {} as any; const jd = new JerryDebuggerClient({ delegate, @@ -39,9 +39,6 @@ describe('JerryDebugger constructor', () => { }); describe('JerryDebugger.connect', () => { - beforeEach(() => { - }); - it('creates a websocket', () => { const delegate = {} as any; const jd = new JerryDebuggerClient({ delegate }); From d6f4f295673dc9cf235f470f5cf2fa94449afadd Mon Sep 17 00:00:00 2001 From: Geoff Gustafson Date: Wed, 11 Apr 2018 13:22:00 -0700 Subject: [PATCH 3/3] fix from martijn JerryScript-DCO-1.0-Signed-off-by: Geoff Gustafson geoff@linux.intel.com --- .../jerry-client-ts/src/lib/__tests__/debugger-client.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jerry-debugger/jerry-client-ts/src/lib/__tests__/debugger-client.test.ts b/jerry-debugger/jerry-client-ts/src/lib/__tests__/debugger-client.test.ts index 278818dd2d..82cebeea4c 100644 --- a/jerry-debugger/jerry-client-ts/src/lib/__tests__/debugger-client.test.ts +++ b/jerry-debugger/jerry-client-ts/src/lib/__tests__/debugger-client.test.ts @@ -42,7 +42,7 @@ describe('JerryDebugger.connect', () => { it('creates a websocket', () => { const delegate = {} as any; const jd = new JerryDebuggerClient({ delegate }); - jd.connect(); + jd.connect().catch((e) => { throw e; }); expect(WebSocket).toHaveBeenCalledTimes(1); }); });