Added more entities to esily check parameters for validity

sebs · sebs · commit f24a80a33c73 · 2019-08-04T09:13:44.000+02:00
diff --git a/src/entities/HexQuantity.ts b/src/entities/HexQuantity.ts
@@ -14,6 +14,7 @@ export class HexQuantity extends EntityBase implements Entity {
 	}
 
 	valid(): boolean {
-		return Number.isInteger(parseInt(this.hexString, 16))
+		var a = parseInt(this.hexString,16);
+		return (a.toString(16) === this.hexString)
 	}
 }
diff --git a/src/entities/PositiveNumber.ts b/src/entities/PositiveNumber.ts
@@ -0,0 +1,25 @@
+
+import { Entity } from '../interfaces/Entity'
+import { EntityBase } from './EntityBase'
+/*
+ * @see https://stackoverflow.com/questions/57803/how-to-convert-decimal-to-hexadecimal-in-javascript
+ */
+export class PositiveNumber extends EntityBase implements Entity {
+	public errorMessage:string =  'invalid'
+	private positiveNumber:any
+	
+	constructor(positiveNumber: any) {
+		super()
+		this.positiveNumber = positiveNumber
+	}
+
+	valid(): boolean {
+
+		let numerical = parseInt(this.positiveNumber)
+
+		if (numerical < 0) {
+			return false
+		}
+		return true
+	}
+}
diff --git a/src/parameters/operand.ts b/src/parameters/operand.ts
@@ -0,0 +1 @@
+export enum operand {and = 'and', or = 'or'}
diff --git a/test/entities/HexQuantityTest.ts b/test/entities/HexQuantityTest.ts
@@ -3,8 +3,22 @@ import test from 'ava'
 import { HexQuantity } from '../../src/entities/HexQuantity'
 
 test('Instantiated', (t)=> {
-	const hex = 'TRU5Z5MNWIEYP4F6DPH2T53IJWZIZ5GT1W'
+	const hex = '0x10FB78'
 	const a = new HexQuantity(hex)
 	t.truthy(a)
 })
 
+test.skip('valid', (t)=> {
+	const hex = '10FB78'
+	const a = new HexQuantity(hex)
+	t.truthy(a.valid())
+})
+
+test('invalid', (t)=> {
+	const hex = 'bar'
+	const a = new HexQuantity(hex)
+	t.falsy(a.valid())
+})
+
+
+
diff --git a/test/entities/PositiveNumberTest.ts b/test/entities/PositiveNumberTest.ts
@@ -0,0 +1,22 @@
+import test from 'ava'
+
+import { PositiveNumber } from '../../src/entities/PositiveNumber'
+
+
+test('1 is valid', t => {
+	const numerical = 1;
+	const n = new PositiveNumber(numerical)
+	t.truthy(n.valid())
+})
+
+test('0 is valid', t => {
+	const numerical = 0;
+	const n = new PositiveNumber(numerical)
+	t.truthy(n.valid())
+})
+
+test('-1 is invalid', t => {
+	const numerical = -1;
+	const n = new PositiveNumber(numerical)
+	t.falsy(n.valid())
+})

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ export class HexQuantity extends EntityBase implements Entity {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`valid(): boolean {`
`17`		`- return Number.isInteger(parseInt(this.hexString, 16))`
	`17`	`+ var a = parseInt(this.hexString,16);`
	`18`	`+ return (a.toString(16) === this.hexString)`
`18`	`19`	`}`
`19`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export enum operand {and = 'and', or = 'or'}`