Bitmap size error added and license updated

Author: Musa Kaçmaz

__tests__/models/bitmap.test.ts renamed to __tests__/unit/models/bitmap.test.ts

@@ -1,5 +1,5 @@
-import { Bitmap } from '../../src/models/bitmap';
-import { Helper } from '../helper';
+import { Bitmap } from '../../../src/models/bitmap';
+import { Helper } from '../../helper';
 
 describe('Bitmap Class Tests', () => {
   const bitmap: Bitmap = Helper.seedBitmapData();

__tests__/models/pixel.test.ts renamed to __tests__/unit/models/pixel.test.ts

@@ -1,4 +1,4 @@
-import { Pixel } from '../../src/models/pixel';
+import { Pixel } from '../../../src/models/pixel';
 
 describe('Pixel Class Tests', () => {
   const pixel: Pixel = new Pixel(0, 1, 0);

__tests__/utilities/distanceCalculator.test.ts renamed to __tests__/unit/utilities/distanceCalculator.test.ts

@@ -1,7 +1,7 @@
-import { DistanceCalculator } from '../../src/utilities/distanceCalculator';
-import { Bitmap } from '../../src/models/bitmap';
-import { Pixel } from '../../src/models/pixel';
-import { Helper } from '../helper';
+import { DistanceCalculator } from '../../../src/utilities/distanceCalculator';
+import { Bitmap } from '../../../src/models/bitmap';
+import { Pixel } from '../../../src/models/pixel';
+import { Helper } from '../../helper';
 
 describe('DistanceCalculator Class Tests', () => {
   const bitmap: Bitmap = Helper.seedBitmapData();

__tests__/utilities/parser.test.ts renamed to __tests__/unit/utilities/parser.test.ts

@@ -1,6 +1,6 @@
-import { Parser } from '../../src/utilities/parser';
-import { invalidNumberOfTestCasesError } from '../../src/errors';
-import { Bitmap } from '../../src/models/bitmap';
+import { Parser } from '../../../src/utilities/parser';
+import { invalidNumberOfTestCasesError, invalidValueOfBitmapSize } from '../../../src/errors';
+import { Bitmap } from '../../../src/models/bitmap';
 
 describe('Parser Class Tests', () => {
   describe('evaluateLine', () => {
@@ -26,6 +26,18 @@ describe('Parser Class Tests', () => {
         expect(error.reason).toBe(invalidNumberOfTestCasesError().reason);
       }
     });
+    it('should throw err when an invalid value of bitmap size come from the input', () => {
+      const parser = new Parser();
+      parser.evaluateLine('1');
+      parser.evaluateLine('');
+      try {
+        parser.evaluateLine('3 183');
+      } catch (error) {
+        console.log('ERR: ', error);
+        expect(error.type).toEqual(invalidValueOfBitmapSize().type);
+        expect(error.reason).toBe(invalidValueOfBitmapSize().reason);
+      }
+    });
   });
 
   describe('createBitmaps', () => {

package.json

@@ -22,7 +22,7 @@
     "challenge"
   ],
   "author": "musa kaçmaz",
-  "license": "ISC",
+  "license": "MIT",
   "bugs": {
     "url": "https://github.com/musakacmaz/dott-assignment/issues"
   },

src/constants.ts

@@ -3,4 +3,6 @@ export abstract class Constants {
   static readonly NUMBER_OF_TEST_CASES_MAX_VALUE: number = 1000;
   static readonly PIXEL_COLORS_BLACK: number = 0;
   static readonly PIXEL_COLORS_WHITE: number = 1;
+  static readonly BITMAP_SIZE_MIN_VALUE: number = 1;
+  static readonly BITMAP_SIZE_MAX_VALUE: number = 182;
 }

src/errors.ts

@@ -1,5 +1,6 @@
 enum ErrorCode {
-  InvalidNumberOfTestCases
+  InvalidNumberOfTestCases,
+  InvalidValueOfBitmapSize
 }
 
 interface Failure<FailureType extends number> {
@@ -11,3 +12,8 @@ export const invalidNumberOfTestCasesError = (): Failure<ErrorCode.InvalidNumber
   type: ErrorCode.InvalidNumberOfTestCases,
   reason: 'Invalid number of test cases!'
 });
+
+export const invalidValueOfBitmapSize = (): Failure<ErrorCode.InvalidValueOfBitmapSize> => ({
+  type: ErrorCode.InvalidValueOfBitmapSize,
+  reason: 'Invalid value of bitmap size!'
+});

src/utilities/parser.ts

@@ -1,7 +1,7 @@
 import { Constants } from '../constants';
 import { Bitmap } from '../models/bitmap';
 import { Pixel } from '../models/pixel';
-import { invalidNumberOfTestCasesError } from '../errors';
+import { invalidNumberOfTestCasesError, invalidValueOfBitmapSize } from '../errors';
 
 /**
  * Interface for classes that describe a bitmap.
@@ -49,6 +49,12 @@ export class Parser {
 
     if (line.includes(' ')) {
       const [lineSize, columnSize] = line.split(' ');
+      if (
+        !(Number(lineSize) >= Constants.BITMAP_SIZE_MIN_VALUE && Number(lineSize) <= Constants.BITMAP_SIZE_MAX_VALUE) ||
+        !(Number(columnSize) >= Constants.BITMAP_SIZE_MIN_VALUE && Number(columnSize) <= Constants.BITMAP_SIZE_MAX_VALUE)
+      ) {
+        throw invalidValueOfBitmapSize();
+      }
       const newBitmapDescription: BitmapDescription = {
         lineSize: Number(lineSize),
         columnSize: Number(columnSize),