[#122] Minor fixes to tests

Ido-Barnea · Jan 9, 2024 · 2d5aecb · 2d5aecb
1 parent b6e2253
commit 2d5aecb
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 21 deletions.
diff --git a/development/src/logic/pieces/mocks.ts → development/src/logic/__mocks__/Logic.ts b/development/src/logic/pieces/mocks.ts → development/src/logic/__mocks__/Logic.ts
@@ -1,10 +1,10 @@
 import { Player, PlayerColors } from '../Players';
-import { Position } from './PiecesHelpers';
+import { Position } from '../pieces/PiecesHelpers';
 
 export const whitePlayer = new Player(PlayerColors.WHITE);
-export const blackPlayer = new Player(PlayerColors.BLACK);
+export const items = [];
 
-function comparePositions(
+export function comparePositions(
   firstPosition: Position,
   secondPosition: Position,
 ): boolean {
@@ -16,10 +16,13 @@ function comparePositions(
   return areBoardsEqual && arePositionsEqual;
 }
 
-export const mockedLogic = {
-  getCurrentPlayer: () => whitePlayer,
-  switchIsCastling: jest.fn(),
-  items: [],
-  comparePositions: comparePositions,
-  getPieceByPositionAndBoard: () => undefined,
+// eslint-disable-next-line @typescript-eslint/no-empty-function
+export function switchIsCastling() {}
+
+export function getPieceByPositionAndBoard() {
+  return undefined;
 };
+
+export function getCurrentPlayer() {
+  return whitePlayer;
+}
diff --git a/development/src/logic/pieces/Bishop.test.ts b/development/src/logic/pieces/Bishop.test.ts
@@ -1,9 +1,11 @@
 import { OVERWORLD_BOARD_ID } from '../Constants';
+import { Player, PlayerColors } from '../Players';
 import { Bishop } from './Bishop';
 import { Position } from './PiecesHelpers';
-import { mockedLogic, whitePlayer } from './mocks';
 
-jest.mock('../Logic.ts', () => mockedLogic);
+jest.mock('../Logic.ts');
+
+const whitePlayer = new Player(PlayerColors.WHITE);
 
 describe('Piece movements', () => {
   test('Validating Bishop movement', () => {

diff --git a/development/src/logic/pieces/King.test.ts b/development/src/logic/pieces/King.test.ts
@@ -1,9 +1,11 @@
 import { OVERWORLD_BOARD_ID } from '../Constants';
+import { Player, PlayerColors } from '../Players';
 import { King } from './King';
 import { Position } from './PiecesHelpers';
-import { mockedLogic, whitePlayer } from './mocks';
 
-jest.mock('../Logic', () => mockedLogic);
+jest.mock('../Logic');
+
+const whitePlayer = new Player(PlayerColors.WHITE);
 
 describe('Piece movements', () => {
   test('Validating King movement', () => {

diff --git a/development/src/logic/pieces/Knight.test.ts b/development/src/logic/pieces/Knight.test.ts
@@ -1,9 +1,11 @@
 import { OVERWORLD_BOARD_ID } from '../Constants';
+import { Player, PlayerColors } from '../Players';
 import { Knight } from './Knight';
 import { Position } from './PiecesHelpers';
-import { mockedLogic, whitePlayer } from './mocks';
 
-jest.mock('../Logic', () => mockedLogic);
+jest.mock('../Logic');
+
+const whitePlayer = new Player(PlayerColors.WHITE);
 
 describe('Piece movements', () => {
   test('Validating Knight movement', () => {

diff --git a/development/src/logic/pieces/Pawn.test.ts b/development/src/logic/pieces/Pawn.test.ts
@@ -1,9 +1,12 @@
 import { OVERWORLD_BOARD_ID } from '../Constants';
+import { Player, PlayerColors } from '../Players';
 import { Pawn } from './Pawn';
 import { Position } from './PiecesHelpers';
-import { mockedLogic, blackPlayer, whitePlayer } from './mocks';
 
-jest.mock('../Logic', () => mockedLogic);
+jest.mock('../Logic');
+
+const whitePlayer = new Player(PlayerColors.WHITE);
+const blackPlayer = new Player(PlayerColors.BLACK);
 
 describe('Piece movements', () => {
   test('Validating Pawn movement', () => {

diff --git a/development/src/logic/pieces/Queen.test.ts b/development/src/logic/pieces/Queen.test.ts
@@ -1,9 +1,11 @@
 import { OVERWORLD_BOARD_ID } from '../Constants';
+import { Player, PlayerColors } from '../Players';
 import { Position } from './PiecesHelpers';
 import { Queen } from './Queen';
-import { mockedLogic, whitePlayer } from './mocks';
 
-jest.mock('../Logic', () => mockedLogic);
+jest.mock('../Logic');
+
+const whitePlayer = new Player(PlayerColors.WHITE);
 
 describe('Piece movements', () => {
   test('Validating Queen movement', () => {

diff --git a/development/src/logic/pieces/Rook.test.ts b/development/src/logic/pieces/Rook.test.ts
@@ -1,9 +1,11 @@
 import { OVERWORLD_BOARD_ID } from '../Constants';
+import { Player, PlayerColors } from '../Players';
 import { Position } from './PiecesHelpers';
 import { Rook } from './Rook';
-import { mockedLogic, whitePlayer } from './mocks';
 
-jest.mock('../Logic', () => mockedLogic);
+jest.mock('../Logic');
+
+const whitePlayer = new Player(PlayerColors.WHITE);
 
 describe('Piece movements', () => {
   test('Validating Rook movement', () => {