This commit is contained in:
David Négrier 2020-05-03 17:47:54 +02:00
commit 9c32c930a0
12 changed files with 374 additions and 343 deletions

View file

@ -1,6 +1,6 @@
import "jasmine";
import {Message} from "../src/Model/Websocket/Message";
import {World} from "../src/Model/World";
import {World, ConnectCallback, DisconnectCallback } from "../src/Model/World";
import {MessageUserPosition, Point} from "../src/Model/Websocket/MessageUserPosition";
import { Group } from "../src/Model/Group";
import {Distance} from "../src/Model//Distance";
@ -8,10 +8,10 @@ import {Distance} from "../src/Model//Distance";
describe("World", () => {
it("should connect user1 and user2", () => {
let connectCalled: boolean = false;
let connect = (user1: string, user2: string): void => {
let connect = (user: string, group: Group): void => {
connectCalled = true;
}
let disconnect = (user1: string, user2: string): void => {
let disconnect = (user: string, group: Group): void => {
}
@ -56,10 +56,10 @@ describe("World", () => {
it("should connect 3 users", () => {
let connectCalled: boolean = false;
let connect = (user1: string, user2: string): void => {
let connect = (user: string, group: Group): void => {
connectCalled = true;
}
let disconnect = (user1: string, user2: string): void => {
let disconnect = (user: string, group: Group): void => {
}
@ -101,10 +101,10 @@ describe("World", () => {
it("should disconnect user1 and user2", () => {
let connectCalled: boolean = false;
let disconnectCalled: boolean = false;
let connect = (user1: string, user2: string): void => {
let connect = (user: string, group: Group): void => {
connectCalled = true;
}
let disconnect = (user1: string, user2: string): void => {
let disconnect = (user: string, group: Group): void => {
disconnectCalled = true;
}
@ -142,51 +142,4 @@ describe("World", () => {
expect(disconnectCalled).toBe(false);
});
/**
it('Should return the distances between all users', () => {
let connectCalled: boolean = false;
let connect = (user1: string, user2: string): void => {
connectCalled = true;
}
let disconnect = (user1: string, user2: string): void => {
}
let world = new World(connect, disconnect);
let user1 = new MessageUserPosition({
userId: "foo",
roomId: 1,
position: new Point(100, 100)
});
world.join(user1);
let user2 = new MessageUserPosition({
userId: "bar",
roomId: 1,
position: new Point(500, 100)
});
world.join(user2);
let user3 = new MessageUserPosition({
userId: "baz",
roomId: 1,
position: new Point(101, 100)
});
let user4 = new MessageUserPosition({
userId: "buz",
roomId: 1,
position: new Point(105, 100)
})
let group = new Group([user1, user2, user3, user4]);
let distances = world.getDistancesBetweenGroupUsers(group)
console.log(distances);
//expect(distances).toBe([]);
})
**/
})