src/app/converter-registry.service.ts

@@ -4,7 +4,7 @@ import {BinToDecConverter} from './converter/bin-to-dec-converter';
 import {Converter} from './converter/converter';
 import {DecToBinConverter} from './converter/dec-to-bin-converter';
 import {DecToHexConverter} from './converter/dec-to-hex-converter';
-import {HexToDecConverter} from './converter/hextodecconverter';
+import {HexToDecConverter} from './converter/hex-to-dec-converter';
 import {HTMLEntitiesDecoder} from './converter/htmlentitiesdecoder';
 import {HTMLEntitiesEncoder} from './converter/htmlentitiesencoder';
 import {Injectable} from '@angular/core';

src/app/converter/bin-to-dec-converter.spec.ts

@@ -11,6 +11,6 @@ describe('BinToDecConverter', () => {
     expect(new BinToDecConverter().convert('11011')).toEqual('27');
   });
   it('should raise an exception on invalid input', () => {
-    expect(() => new BinToDecConverter().convert('foo bar')).toThrowError('The input seems not to be a valid binary number.');
+    expect(() => new BinToDecConverter().convert('1foo bar')).toThrowError('The input seems not to be a valid binary number.');
   });
 });

src/app/converter/bin-to-dec-converter.ts

@@ -11,7 +11,7 @@ export class BinToDecConverter implements Converter {
 
   convert(input: string): string {
     const n: number = parseInt(input, 2);
-    if (isNaN(n)) {
+    if (isNaN(n) || !input.trim().match(/^([01]+)$/)) {
       throw new Error('The input seems not to be a valid binary number.');
     }
     return n.toString(10);

src/app/converter/hex-to-dec-converter.spec.ts

@@ -0,0 +1,16 @@
+import {HexToDecConverter} from './hex-to-dec-converter';
+
+describe('HexToDecConverter', () => {
+  it('should create an instance', () => {
+    expect(new HexToDecConverter()).toBeTruthy();
+  });
+  it('should have the id "hextodec"', () => {
+    expect(new HexToDecConverter().getId()).toEqual('hextodec');
+  });
+  it('should convert "ab" to "171"', () => {
+    expect(new HexToDecConverter().convert('ab')).toEqual('171');
+  });
+  it('should raise an exception on invalid input', () => {
+    expect(() => new HexToDecConverter().convert('foo bar')).toThrowError('The input seems not to be a valid hexadecimal number.');
+  });
+});

src/app/converter/hex-to-dec-converter.ts

@@ -11,7 +11,7 @@ export class HexToDecConverter implements Converter {
 
   convert(input: string): string {
     const n: number = parseInt(input, 16);
-    if (isNaN(n)) {
+    if (isNaN(n) || !input.trim().match(/^((0x|0X)?[0-9a-fA-F]+)$/)) {
       throw new Error('The input seems not to be a valid hexadecimal number.');
     }
     return n.toString(10);