From a37557dd4b0864f0f82fd21c97cccb7d856d8028 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20N=C3=A9grier?= <d.negrier@thecodingmachine.com>
Date: Tue, 29 Sep 2020 16:27:41 +0200
Subject: [PATCH] Fixing tests

---
 back/tests/PositionNotifierTest.ts |  9 ++++----
 back/tests/WorldTest.ts            | 34 ++++++++++++++++++------------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/back/tests/PositionNotifierTest.ts b/back/tests/PositionNotifierTest.ts
index e65d025d..253283af 100644
--- a/back/tests/PositionNotifierTest.ts
+++ b/back/tests/PositionNotifierTest.ts
@@ -8,6 +8,7 @@ import {PointInterface} from "../src/Model/Websocket/PointInterface";
 import {Zone} from "_Model/Zone";
 import {Movable} from "_Model/Movable";
 import {PositionInterface} from "_Model/PositionInterface";
+import {ExSocketInterface} from "_Model/Websocket/ExSocketInterface";
 
 
 describe("PositionNotifier", () => {
@@ -29,14 +30,14 @@ describe("PositionNotifier", () => {
             y: 500,
             moving: false,
             direction: 'down'
-        }, false, positionNotifier);
+        }, false, positionNotifier, {} as ExSocketInterface);
 
         const user2 = new User(2, {
             x: -9999,
             y: -9999,
             moving: false,
             direction: 'down'
-        }, false, positionNotifier);
+        }, false, positionNotifier, {} as ExSocketInterface);
 
         positionNotifier.setViewport(user1, {
             left: 200,
@@ -107,14 +108,14 @@ describe("PositionNotifier", () => {
             y: 500,
             moving: false,
             direction: 'down'
-        }, false, positionNotifier);
+        }, false, positionNotifier, {} as ExSocketInterface);
 
         const user2 = new User(2, {
             x: 0,
             y: 0,
             moving: false,
             direction: 'down'
-        }, false, positionNotifier);
+        }, false, positionNotifier, {} as ExSocketInterface);
 
         let newUsers = positionNotifier.setViewport(user1, {
             left: 200,
diff --git a/back/tests/WorldTest.ts b/back/tests/WorldTest.ts
index 9afef228..8d3b1a2d 100644
--- a/back/tests/WorldTest.ts
+++ b/back/tests/WorldTest.ts
@@ -2,22 +2,30 @@ import "jasmine";
 import {World, ConnectCallback, DisconnectCallback } from "../src/Model/World";
 import {Point} from "../src/Model/Websocket/MessageUserPosition";
 import { Group } from "../src/Model/Group";
+import {ExSocketInterface} from "_Model/Websocket/ExSocketInterface";
+import {User} from "_Model/User";
+
+function createMockUser(userId: number): ExSocketInterface {
+    return {
+        userId
+    } as ExSocketInterface;
+}
 
 describe("World", () => {
     it("should connect user1 and user2", () => {
         let connectCalledNumber: number = 0;
-        const connect: ConnectCallback = (user: number, group: Group): void => {
+        const connect: ConnectCallback = (user: User, group: Group): void => {
             connectCalledNumber++;
         }
-        const disconnect: DisconnectCallback = (user: number, group: Group): void => {
+        const disconnect: DisconnectCallback = (user: User, group: Group): void => {
 
         }
 
         const world = new World(connect, disconnect, 160, 160, () => {}, () => {}, () => {});
 
-        world.join({ userId: 1 }, new Point(100, 100));
+        world.join(createMockUser(1), new Point(100, 100));
 
-        world.join({ userId: 2 }, new Point(500, 100));
+        world.join(createMockUser(2), new Point(500, 100));
 
         world.updatePosition({ userId: 2 }, new Point(261, 100));
 
@@ -33,24 +41,24 @@ describe("World", () => {
 
     it("should connect 3 users", () => {
         let connectCalled: boolean = false;
-        const connect: ConnectCallback = (user: number, group: Group): void => {
+        const connect: ConnectCallback = (user: User, group: Group): void => {
             connectCalled = true;
         }
-        const disconnect: DisconnectCallback = (user: number, group: Group): void => {
+        const disconnect: DisconnectCallback = (user: User, group: Group): void => {
 
         }
 
         const world = new World(connect, disconnect, 160, 160, () => {}, () => {}, () => {});
 
-        world.join({ userId: 1 }, new Point(100, 100));
+        world.join(createMockUser(1), new Point(100, 100));
 
-        world.join({ userId: 2 }, new Point(200, 100));
+        world.join(createMockUser(2), new Point(200, 100));
 
         expect(connectCalled).toBe(true);
         connectCalled = false;
 
         // baz joins at the outer limit of the group
-        world.join({ userId: 3 }, new Point(311, 100));
+        world.join(createMockUser(3), new Point(311, 100));
 
         expect(connectCalled).toBe(false);
 
@@ -62,18 +70,18 @@ describe("World", () => {
     it("should disconnect user1 and user2", () => {
         let connectCalled: boolean = false;
         let disconnectCallNumber: number = 0;
-        const connect: ConnectCallback = (user: number, group: Group): void => {
+        const connect: ConnectCallback = (user: User, group: Group): void => {
             connectCalled = true;
         }
-        const disconnect: DisconnectCallback = (user: number, group: Group): void => {
+        const disconnect: DisconnectCallback = (user: User, group: Group): void => {
             disconnectCallNumber++;
         }
 
         const world = new World(connect, disconnect, 160, 160, () => {}, () => {}, () => {});
 
-        world.join({ userId: 1 }, new Point(100, 100));
+        world.join(createMockUser(1), new Point(100, 100));
 
-        world.join({ userId: 2 }, new Point(259, 100));
+        world.join(createMockUser(2), new Point(259, 100));
 
         expect(connectCalled).toBe(true);
         expect(disconnectCallNumber).toBe(0);