2 files changed, 47 insertions, 1 deletions
diff --git a/src/schemas/order_schemas.ts b/src/schemas/order_schemas.ts
index 72012dc26..4999f3e9d 100644
--- a/src/schemas/order_schemas.ts
+++ b/src/schemas/order_schemas.ts
@@ -7,7 +7,7 @@ export const addressSchema = {
 export const numberSchema = {
     id: '/numberSchema',
     type: 'string',
-    format: '\d+(\.\d+)?',
+    pattern: '^\\d+(\\.\\d+)?$',
 };
 
 export const orderSchema = {
diff --git a/test/schema_test.ts b/test/schema_test.ts
new file mode 100644
index 000000000..133914e6d
--- /dev/null
+++ b/test/schema_test.ts
@@ -0,0 +1,46 @@
+import 'mocha';
+import * as _ from 'lodash';
+import * as chai from 'chai';
+import * as BigNumber from 'bignumber.js';
+import promisify = require('es6-promisify');
+import {numberSchema} from '../src/schemas/order_schemas';
+import {SchemaValidator} from '../src/utils/schema_validator';
+
+chai.config.includeStack = true;
+const expect = chai.expect;
+
+describe('Schema', () => {
+    const validator = new SchemaValidator();
+    describe('#numberSchema', () => {
+        describe('number regex', () => {
+            it('should validate valid numbers', () => {
+                const testCases = ['42', '0', '1.3', '0.2', '00.00'];
+                _.forEach(testCases, (testCase: string) => {
+                    expect(validator.validate(testCase as any, numberSchema).errors).to.be.lengthOf(0);
+                });
+            });
+            it('should fail for invalid numbers', () => {
+                const testCases = ['.3', '1.', 'abacaba', 'и', '1..0'];
+                _.forEach(testCases, (testCase: string) => {
+                    expect(validator.validate(testCase as any, numberSchema).errors).to.be.lengthOf(1);
+                });
+            });
+        });
+    });
+    describe('BigNumber serialization', () => {
+        it.only('should correctly serialize BigNumbers', () => {
+            const testCases = {
+                '42': '42',
+                '0': '0',
+                '1.3': '1.3',
+                '0.2': '0.2',
+                '00.00': '0',
+                '.3': '0.3',
+            };
+            _.forEach(testCases, (serialized: string, input: string) => {
+                expect(SchemaValidator.convertToJSONSchemaCompatibleObject(new BigNumber(input)))
+                    .to.be.equal(serialized);
+            });
+        });
+    });
+});