From 9d25435105380b0013b4f2885c5ae6bacc0c1ef7 Mon Sep 17 00:00:00 2001 From: Marius Rackwitz Date: Wed, 13 Jul 2016 18:53:47 +0200 Subject: [PATCH] [Tests] Stop using Realm.Types --- tests/js/object-tests.js | 12 ++-- tests/js/query-tests.js | 6 +- tests/js/realm-tests.js | 2 +- tests/js/schemas.js | 122 +++++++++++++++++++-------------------- 4 files changed, 71 insertions(+), 71 deletions(-) diff --git a/tests/js/object-tests.js b/tests/js/object-tests.js index a446f8f7..8c5aa816 100644 --- a/tests/js/object-tests.js +++ b/tests/js/object-tests.js @@ -50,13 +50,13 @@ module.exports = { var prop = schemas.BasicTypes.properties[name]; var type = typeof prop == 'object' ? prop.type : prop; - if (type == Realm.Types.FLOAT || type == Realm.Types.DOUBLE) { + if (type == 'float' || type == 'double') { TestCase.assertEqualWithTolerance(object[name], basicTypesValues[name], 0.000001); } - else if (type == Realm.Types.DATA) { + else if (type == 'data') { TestCase.assertArraysEqual(new Uint8Array(object[name]), RANDOM_DATA); } - else if (type == Realm.Types.DATE) { + else if (type == 'date') { TestCase.assertEqual(object[name].getTime(), basicTypesValues[name].getTime()); } else { @@ -100,13 +100,13 @@ module.exports = { TestCase.assertEqual(nullObject[name], null); - if (type == Realm.Types.FLOAT || type == Realm.Types.DOUBLE) { + if (type == 'float' || type == 'double') { TestCase.assertEqualWithTolerance(object[name], basicTypesValues[name], 0.000001); } - else if (type == Realm.Types.DATA) { + else if (type == 'data') { TestCase.assertArraysEqual(new Uint8Array(object[name]), RANDOM_DATA); } - else if (type == Realm.Types.DATE) { + else if (type == 'date') { TestCase.assertEqual(object[name].getTime(), basicTypesValues[name].getTime()); } else { diff --git a/tests/js/query-tests.js b/tests/js/query-tests.js index 9dea5cea..dcc1a1ef 100644 --- a/tests/js/query-tests.js +++ b/tests/js/query-tests.js @@ -42,9 +42,9 @@ function convertValue(value, schema, type) { }); } -typeConverters[Realm.Types.DATE] = function(value) { return new Date(value); }; -typeConverters[Realm.Types.DATA] = function(value) { return new Uint8Array(value); }; -typeConverters[Realm.Types.OBJECT] = convertValue; +typeConverters['date'] = function(value) { return new Date(value); }; +typeConverters['data'] = function(value) { return new Uint8Array(value); }; +typeConverters['object'] = convertValue; function runQuerySuite(suite) { var realm = new Realm({schema: suite.schema}); diff --git a/tests/js/realm-tests.js b/tests/js/realm-tests.js index fe966347..a9fca21e 100644 --- a/tests/js/realm-tests.js +++ b/tests/js/realm-tests.js @@ -116,7 +116,7 @@ module.exports = { }, 'The schema should be an array of ObjectSchema objects'); TestCase.assertThrows(function() { - new Realm({schema: [{properties: {intCol: Realm.Types.INT}}]}); + new Realm({schema: [{properties: {intCol: 'int'}}]}); }, 'The schema should be an array of ObjectSchema objects'); }, diff --git a/tests/js/schemas.js b/tests/js/schemas.js index 76482b31..04f28ee1 100644 --- a/tests/js/schemas.js +++ b/tests/js/schemas.js @@ -23,7 +23,7 @@ var Realm = require('realm'); exports.TestObject = { name: 'TestObject', properties: { - doubleCol: Realm.Types.DOUBLE, + doubleCol: 'double', } }; @@ -31,9 +31,9 @@ function PersonObject() {} PersonObject.schema = { name: 'PersonObject', properties: { - name: Realm.Types.STRING, - age: Realm.Types.DOUBLE, - married: {type: Realm.Types.BOOL, default: false}, + name: 'string', + age: 'double', + married: {type: 'bool', default: false}, } }; PersonObject.prototype.description = function() { @@ -54,26 +54,26 @@ exports.PersonList = { exports.BasicTypes = { name: 'BasicTypesObject', properties: { - boolCol: Realm.Types.BOOL, - intCol: Realm.Types.INT, - floatCol: Realm.Types.FLOAT, - doubleCol: Realm.Types.DOUBLE, - stringCol: Realm.Types.STRING, - dateCol: Realm.Types.DATE, - dataCol: Realm.Types.DATA, + boolCol: 'bool', + intCol: 'int', + floatCol: 'float', + doubleCol: 'double', + stringCol: 'string', + dateCol: 'date', + dataCol: 'data', } }; exports.NullableBasicTypes = { name: 'NullableBasicTypesObject', properties: { - boolCol: {type: Realm.Types.BOOL, optional: true}, - intCol: {type: Realm.Types.INT, optional: true}, - floatCol: {type: Realm.Types.FLOAT, optional: true}, - doubleCol: {type: Realm.Types.DOUBLE, optional: true}, - stringCol: {type: Realm.Types.STRING, optional: true}, - dateCol: {type: Realm.Types.DATE, optional: true}, - dataCol: {type: Realm.Types.DATA, optional: true}, + boolCol: {type: 'bool', optional: true}, + intCol: {type: 'int', optional: true}, + floatCol: {type: 'float', optional: true}, + doubleCol: {type: 'double', optional: true}, + stringCol: {type: 'string', optional: true}, + dateCol: {type: 'date', optional: true}, + dataCol: {type: 'data', optional: true}, } }; @@ -92,8 +92,8 @@ exports.LinkTypes = { name: 'LinkTypesObject', properties: { objectCol: 'TestObject', - objectCol1: {type: Realm.Types.OBJECT, objectType: 'TestObject'}, - arrayCol: {type: Realm.Types.LIST, objectType: 'TestObject'}, + objectCol1: {type: 'object', objectType: 'TestObject'}, + arrayCol: {type: 'list', objectType: 'TestObject'}, } }; @@ -101,8 +101,8 @@ exports.IntPrimary = { name: 'IntPrimaryObject', primaryKey: 'primaryCol', properties: { - primaryCol: Realm.Types.INT, - valueCol: Realm.Types.STRING, + primaryCol: 'int', + valueCol: 'string', } }; @@ -110,8 +110,8 @@ exports.StringPrimary = { name: 'StringPrimaryObject', primaryKey: 'primaryCol', properties: { - primaryCol: Realm.Types.STRING, - valueCol: Realm.Types.INT, + primaryCol: 'string', + valueCol: 'int', } }; @@ -119,64 +119,64 @@ exports.AllTypes = { name: 'AllTypesObject', primaryKey: 'primaryCol', properties: { - primaryCol: Realm.Types.STRING, - boolCol: Realm.Types.BOOL, - intCol: Realm.Types.INT, - floatCol: Realm.Types.FLOAT, - doubleCol: Realm.Types.DOUBLE, - stringCol: Realm.Types.STRING, - dateCol: Realm.Types.DATE, - dataCol: Realm.Types.DATA, + primaryCol: 'string', + boolCol: 'bool', + intCol: 'int', + floatCol: 'float', + doubleCol: 'double', + stringCol: 'string', + dateCol: 'date', + dataCol: 'data', objectCol: 'TestObject', - arrayCol: {type: Realm.Types.LIST, objectType: 'TestObject'}, + arrayCol: {type: 'list', objectType: 'TestObject'}, } }; exports.DefaultValues = { name: 'DefaultValuesObject', properties: { - boolCol: {type: Realm.Types.BOOL, default: true}, - intCol: {type: Realm.Types.INT, default: -1}, - floatCol: {type: Realm.Types.FLOAT, default: -1.1}, - doubleCol: {type: Realm.Types.DOUBLE, default: -1.11}, - stringCol: {type: Realm.Types.STRING, default: 'defaultString'}, - dateCol: {type: Realm.Types.DATE, default: new Date(1.111)}, - dataCol: {type: Realm.Types.DATA, default: new ArrayBuffer(1)}, + boolCol: {type: 'bool', default: true}, + intCol: {type: 'int', default: -1}, + floatCol: {type: 'float', default: -1.1}, + doubleCol: {type: 'double', default: -1.11}, + stringCol: {type: 'string', default: 'defaultString'}, + dateCol: {type: 'date', default: new Date(1.111)}, + dataCol: {type: 'data', default: new ArrayBuffer(1)}, objectCol: {type: 'TestObject', default: {doubleCol: 1}}, nullObjectCol: {type: 'TestObject', default: null}, - arrayCol: {type: Realm.Types.LIST, objectType: 'TestObject', default: [{doubleCol: 2}]}, + arrayCol: {type: 'list', objectType: 'TestObject', default: [{doubleCol: 2}]}, } }; exports.QueryObject = { name: 'QueryObject', properties: [ - {name: 'bool1', type: Realm.Types.BOOL}, - {name: 'bool2', type: Realm.Types.BOOL}, - {name: 'int1', type: Realm.Types.INT}, - {name: 'int2', type: Realm.Types.INT}, - {name: 'float1', type: Realm.Types.FLOAT}, - {name: 'float2', type: Realm.Types.FLOAT}, - {name: 'double1', type: Realm.Types.DOUBLE}, - {name: 'double2', type: Realm.Types.DOUBLE}, - {name: 'string1', type: Realm.Types.STRING}, - {name: 'string2', type: Realm.Types.STRING}, + {name: 'bool1', type: 'bool'}, + {name: 'bool2', type: 'bool'}, + {name: 'int1', type: 'int'}, + {name: 'int2', type: 'int'}, + {name: 'float1', type: 'float'}, + {name: 'float2', type: 'float'}, + {name: 'double1', type: 'double'}, + {name: 'double2', type: 'double'}, + {name: 'string1', type: 'string'}, + {name: 'string2', type: 'string'}, ] }; exports.NullQueryObject = { name: 'NullQueryObject', properties: [ - {name: 'bool1', type: Realm.Types.BOOL}, - {name: 'bool2', type: Realm.Types.BOOL}, - {name: 'int1', type: Realm.Types.INT}, - {name: 'int2', type: Realm.Types.INT}, - {name: 'float1', type: Realm.Types.FLOAT}, - {name: 'float2', type: Realm.Types.FLOAT}, - {name: 'double1', type: Realm.Types.DOUBLE}, - {name: 'double2', type: Realm.Types.DOUBLE}, - {name: 'string1', type: Realm.Types.STRING}, - {name: 'string2', type: Realm.Types.STRING}, + {name: 'bool1', type: 'bool'}, + {name: 'bool2', type: 'bool'}, + {name: 'int1', type: 'int'}, + {name: 'int2', type: 'int'}, + {name: 'float1', type: 'float'}, + {name: 'float2', type: 'float'}, + {name: 'double1', type: 'double'}, + {name: 'double2', type: 'double'}, + {name: 'string1', type: 'string'}, + {name: 'string2', type: 'string'}, ] };