Refactor operations functions (return null when cannot apply)

AlexandreKavalerski · Jul 3, 2020 · f5ad483 · f5ad483
1 parent 2811d14
commit f5ad483
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/src/functions/operations.ts b/src/functions/operations.ts
@@ -26,6 +26,7 @@ function moveUpOperation(state: State){
         const newPosition = new StateItemPosition(newLinePosition, nullPosition.col);
         return changePositions(nullPosition, newPosition, state);        
     }
+    return null;
 }
 
 function moveRightOperation(state: State){
@@ -36,6 +37,7 @@ function moveRightOperation(state: State){
         const newPosition = new StateItemPosition(nullPosition.line, newColPosition);
         return changePositions(nullPosition, newPosition, state);
     }
+    return null;
 }
 
 function moveDownOperation(state: State){
@@ -45,6 +47,7 @@ function moveDownOperation(state: State){
         const newPosition = new StateItemPosition(newLinePosition, nullPosition.col);
         return changePositions(nullPosition, newPosition, state);        
     }
+    return null;
 }
 
 function moveLeftOperation(state: State){
@@ -55,6 +58,7 @@ function moveLeftOperation(state: State){
         const newPosition = new StateItemPosition(nullPosition.line, newColPosition);
         return changePositions(nullPosition, newPosition, state);
     }
+    return null;
 }
 
 

diff --git a/tests/operations.spec.ts b/tests/operations.spec.ts
@@ -105,5 +105,31 @@ describe('Testing returns of applyOperation function', () => {
         const goalState: State = [[5,null,8], [4,1,6], [7, 2, 3]];
         expect(applyOperation(actualState, operations.left)).to.eql(goalState);
     });
+});
+
+describe('Testing returns of applyOperation function when operation cannot be applied', () => {  
+
+    it('should return null when call applyOperation function using movUp operation', () => {
+        const actualState: State = [[null,5,8], [4,1,6], [7, 2, 3]];
+
+        expect(applyOperation(actualState, operations.up)).to.eql(null);
+    });
+
+    it('should return null when call applyOperation function using movRight operation', () => {
+        const actualState: State = [[5,8,6], [4,1,null], [7, 2, 3]];
 
+        expect(applyOperation(actualState, operations.right)).to.eql(null);
+    });
+
+    it('should return null when call applyOperation function using movDown operation', () => {
+        const actualState: State = [[5,8,6], [4,1,3], [7, null, 2]];
+
+        expect(applyOperation(actualState, operations.down)).to.eql(null);
+    });
+
+    it('should return null when call applyOperation function using movLeft operation', () => {
+        const actualState: State = [[5,8,6], [null,4,1], [7, 3, 2]];
+
+        expect(applyOperation(actualState, operations.left)).to.eql(null);
+    });
 });