02e6b50b16
This PR adds the display of a circle around groups. This is useful to view where you need to go to speak to someone but also to debug. Note: implementation is suboptimal, relying on a "graphics" object that is known to be slow. In the future, we need to use a circle as a sprite instead.
144 lines
4.0 KiB
TypeScript
144 lines
4.0 KiB
TypeScript
import "jasmine";
|
|
import {Message} from "../src/Model/Websocket/Message";
|
|
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";
|
|
|
|
describe("World", () => {
|
|
it("should connect user1 and user2", () => {
|
|
let connectCalledNumber: number = 0;
|
|
let connect = (user: string, group: Group): void => {
|
|
connectCalledNumber++;
|
|
}
|
|
let disconnect = (user: string, group: Group): void => {
|
|
|
|
}
|
|
|
|
let world = new World(connect, disconnect, 160, 160, () => {}, () => {});
|
|
|
|
world.join(new MessageUserPosition({
|
|
userId: "foo",
|
|
roomId: 1,
|
|
position: new Point(100, 100)
|
|
}));
|
|
|
|
world.join(new MessageUserPosition({
|
|
userId: "bar",
|
|
roomId: 1,
|
|
position: new Point(500, 100)
|
|
}));
|
|
|
|
world.updatePosition(new MessageUserPosition({
|
|
userId: "bar",
|
|
roomId: 1,
|
|
position: new Point(261, 100)
|
|
}));
|
|
|
|
expect(connectCalledNumber).toBe(0);
|
|
|
|
world.updatePosition(new MessageUserPosition({
|
|
userId: "bar",
|
|
roomId: 1,
|
|
position: new Point(101, 100)
|
|
}));
|
|
|
|
expect(connectCalledNumber).toBe(2);
|
|
|
|
world.updatePosition(new MessageUserPosition({
|
|
userId: "bar",
|
|
roomId: 1,
|
|
position: new Point(102, 100)
|
|
}));
|
|
expect(connectCalledNumber).toBe(2);
|
|
});
|
|
|
|
it("should connect 3 users", () => {
|
|
let connectCalled: boolean = false;
|
|
let connect = (user: string, group: Group): void => {
|
|
connectCalled = true;
|
|
}
|
|
let disconnect = (user: string, group: Group): void => {
|
|
|
|
}
|
|
|
|
let world = new World(connect, disconnect, 160, 160, () => {}, () => {});
|
|
|
|
world.join(new MessageUserPosition({
|
|
userId: "foo",
|
|
roomId: 1,
|
|
position: new Point(100, 100)
|
|
}));
|
|
|
|
world.join(new MessageUserPosition({
|
|
userId: "bar",
|
|
roomId: 1,
|
|
position: new Point(200, 100)
|
|
}));
|
|
|
|
expect(connectCalled).toBe(true);
|
|
connectCalled = false;
|
|
|
|
// baz joins at the outer limit of the group
|
|
world.join(new MessageUserPosition({
|
|
userId: "baz",
|
|
roomId: 1,
|
|
position: new Point(311, 100)
|
|
}));
|
|
|
|
expect(connectCalled).toBe(false);
|
|
|
|
world.updatePosition(new MessageUserPosition({
|
|
userId: "baz",
|
|
roomId: 1,
|
|
position: new Point(309, 100)
|
|
}));
|
|
|
|
expect(connectCalled).toBe(true);
|
|
});
|
|
|
|
it("should disconnect user1 and user2", () => {
|
|
let connectCalled: boolean = false;
|
|
let disconnectCallNumber: number = 0;
|
|
let connect = (user: string, group: Group): void => {
|
|
connectCalled = true;
|
|
}
|
|
let disconnect = (user: string, group: Group): void => {
|
|
disconnectCallNumber++;
|
|
}
|
|
|
|
let world = new World(connect, disconnect, 160, 160, () => {}, () => {});
|
|
|
|
world.join(new MessageUserPosition({
|
|
userId: "foo",
|
|
roomId: 1,
|
|
position: new Point(100, 100)
|
|
}));
|
|
|
|
world.join(new MessageUserPosition({
|
|
userId: "bar",
|
|
roomId: 1,
|
|
position: new Point(259, 100)
|
|
}));
|
|
|
|
expect(connectCalled).toBe(true);
|
|
expect(disconnectCallNumber).toBe(0);
|
|
|
|
world.updatePosition(new MessageUserPosition({
|
|
userId: "bar",
|
|
roomId: 1,
|
|
position: new Point(100+160+160+1, 100)
|
|
}));
|
|
|
|
expect(disconnectCallNumber).toBe(2);
|
|
|
|
world.updatePosition(new MessageUserPosition({
|
|
userId: "bar",
|
|
roomId: 1,
|
|
position: new Point(262, 100)
|
|
}));
|
|
expect(disconnectCallNumber).toBe(2);
|
|
});
|
|
|
|
})
|