Fix tests for changes from master

test/webkit/webKitDebugAdapter.test.ts

@@ -42,6 +42,7 @@ suite('WebKitDebugAdapter', () => {
     });
 
     teardown(() => {
+        DefaultMockWebKitConnection.EE.removeAllListeners();
         testUtils.removeUnhandledRejectionListener();
         mockery.deregisterAll();
         mockery.disable();
@@ -111,7 +112,7 @@ suite('WebKitDebugAdapter', () => {
             // Set up connection mock
             mockWebKitConnection.expects('debugger_setBreakpoint')
                 .once()
-                .withArgs(<WebKitProtocol.Debugger.Location>{ scriptId: 'id', lineNumber: 5 })
+                .withArgs(<WebKitProtocol.Debugger.Location>{ scriptId: 'id', lineNumber: 5, columnNumber: 0 })
                 .returns(<WebKitProtocol.Debugger.SetBreakpointResponse>{ id: 0, result: { breakpointId: 'bpId', actualLocation: { scriptId: 'id', lineNumber: 5, columnNumber: 0 } } });
 
             const wkda = instantiateWKDA();

webkit/webKitDebugAdapter.ts

@@ -207,7 +207,7 @@ export class WebKitDebugAdapter implements IDebugAdapter {
         const clientUrl = this.webkitUrlToClientUrl(script.url);
         this._scriptsByUrl.set(clientUrl, script);
         this._scriptsById.set(script.scriptId, script);
-        this._eventHandler(new Event('scriptParsed', { scriptUrl: clientUrl }));
+        this.fireEvent(new Event('scriptParsed', { scriptUrl: clientUrl }));
 
         if (this._pendingBreakpointsByUrl.has(clientUrl)) {
             const pendingBreakpoint = this._pendingBreakpointsByUrl.get(clientUrl);