Merge pull request #451 from realm/sk-test-improvements

Improve JS tests

package.json

@@ -55,9 +55,9 @@
     "xcode": "0.8.4"
   },
   "devDependencies": {
-    "babel-eslint": "^6.0.0-beta.6",
-    "eslint": "^2.4.0",
-    "eslint-plugin-react": "^4.2.3",
+    "babel-eslint": "^6.0.4",
+    "eslint": "^2.10.2",
+    "eslint-plugin-react": "^5.1.1",
     "jsdoc": "^3.4.0",
     "semver": "^5.1.0"
   },

src/rpc.cpp

@@ -182,15 +182,18 @@ RPCServer::RPCServer() {
         return json::object();
     };
     m_requests["/clear_test_state"] = [this](const json dict) {
-        for (auto object : m_objects) {
-            // The session ID points to the Realm constructor object, which should remain.
-            if (object.first != m_session_id) {
-                m_objects.erase(object.first);
-            }
+        // The session ID points to the Realm constructor object, which should remain.
+        auto realm_constructor = m_objects[m_session_id];
+        m_objects.clear();
+
+        if (realm_constructor) {
+            m_objects.emplace(m_session_id, realm_constructor);
         }
+
         m_callbacks.clear();
         JSGarbageCollect(m_context);
         js::delete_all_realms();
+
         return json::object();
     };
 }

tests/js/.eslintrc.json

@@ -14,8 +14,5 @@
     "Uint32Array": false,
     "Uint8Array": false,
     "Uint8ClampedArray": false
-  },
-  "rules": {
-    "no-redeclare": 1
   }
 }

tests/js/base-test.js

@@ -1,36 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2016 Realm Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////
-
-'use strict';
-
-var Realm = require('realm');
-
-var prototype = exports.prototype = {};
-
-exports.extend = function(object) {
-    object.__proto__ = prototype;
-    return object;
-};
-
-Object.defineProperties(prototype, {
-    afterEach: {
-        value: function() {
-            Realm.clearTestState();
-        }
-    }
-});

tests/js/encryption-tests.js

@@ -19,11 +19,10 @@
 'use strict';
 
 var Realm = require('realm');
-var BaseTest = require('./base-test');
 var TestCase = require('./asserts');
 var Schemas = require('./schemas');
 
-module.exports = BaseTest.extend({
+module.exports = {
     testEncryptedInvalidKeys: function() {
         // test failure with invalid keys
         TestCase.assertThrows(function() {
@@ -54,7 +53,7 @@ module.exports = BaseTest.extend({
         });
 
         // test can reopen with original key
-        var realm = new Realm({schema: [Schemas.TestObject], encryptionKey: key});
+        realm = new Realm({schema: [Schemas.TestObject], encryptionKey: key});
         TestCase.assertEqual(realm.objects('TestObject').length, 1);
     },
-});
+};

tests/js/index.js

@@ -18,6 +18,8 @@
 
 'use strict';
 
+var Realm = require('realm');
+
 var TESTS = {
     ListTests: require('./list-tests'),
     ObjectTests: require('./object-tests'),
@@ -58,7 +60,14 @@ exports.runTest = function(suiteName, testName) {
     var testMethod = testSuite && testSuite[testName];
 
     if (testMethod) {
-        testMethod.call(testSuite);
+        // Start fresh in case of a crash in a previous run.
+        Realm.clearTestState();
+
+        try {
+            testMethod.call(testSuite);
+        } finally {
+            Realm.clearTestState();
+        }
     } else if (!testSuite || !(testName in SPECIAL_METHODS)) {
         throw new Error('Missing test: ' + suiteName + '.' + testName);
     }

tests/js/list-tests.js

@@ -19,11 +19,10 @@
 'use strict';
 
 var Realm = require('realm');
-var BaseTest = require('./base-test');
 var TestCase = require('./asserts');
 var schemas = require('./schemas');
 
-module.exports = BaseTest.extend({
+module.exports = {
     testListConstructor: function() {
         var realm = new Realm({schema: [schemas.PersonObject, schemas.PersonList]});
 
@@ -527,7 +526,7 @@ module.exports = BaseTest.extend({
             list = object.list;
         });
 
-        var names = function(results, prop) {
+        var names = function(results) {
             return results.map(function(object) {
                 return object.name;
             });
@@ -653,4 +652,4 @@ module.exports = BaseTest.extend({
             list.length;
         });
     },
-});
+};

tests/js/migration-tests.js

@@ -19,11 +19,10 @@
 'use strict';
 
 var Realm = require('realm');
-var BaseTest = require('./base-test');
 var TestCase = require('./asserts');
 var Schemas = require('./schemas');
 
-module.exports = BaseTest.extend({
+module.exports = {
     testMigrationFunction: function() {
         var count = 0;
         function migrationFunction(oldRealm, newRealm) {
@@ -82,7 +81,7 @@ module.exports = BaseTest.extend({
         });
         realm.close();
 
-        var realm = new Realm({
+        realm = new Realm({
             schema: [{
                 name: 'TestObject',
                 properties: {
@@ -130,7 +129,7 @@ module.exports = BaseTest.extend({
         }]});
         realm.close();
 
-        var realm = new Realm({
+        realm = new Realm({
             schema: [{
                 name: 'TestObject',
                 properties: {
@@ -159,4 +158,4 @@ module.exports = BaseTest.extend({
             }
         });
     },
-});
+};

tests/js/object-tests.js

@@ -19,7 +19,6 @@
 'use strict';
 
 var Realm = require('realm');
-var BaseTest = require('./base-test');
 var TestCase = require('./asserts');
 var schemas = require('./schemas');
 
@@ -28,7 +27,7 @@ var RANDOM_DATA = new Uint8Array([
     0x67, 0x1e, 0x40, 0xa7, 0x6d, 0x52, 0x83, 0xda, 0x07, 0x29, 0x9c, 0x70, 0x38, 0x48, 0x4e, 0xff,
 ]);
 
-module.exports = BaseTest.extend({
+module.exports = {
     testBasicTypesPropertyGetters: function() {
         var realm = new Realm({schema: [schemas.BasicTypes]});
         var object;
@@ -506,4 +505,4 @@ module.exports = BaseTest.extend({
         TestCase.assertEqual(realm.objects('Date')[2].currentDate.getTime(), 1000000000000);
         TestCase.assertEqual(realm.objects('Date')[3].currentDate.getTime(), -1000000000000);
     }
-});
+};

tests/js/realm-tests.js

@@ -19,11 +19,10 @@
 'use strict';
 
 var Realm = require('realm');
-var BaseTest = require('./base-test');
 var TestCase = require('./asserts');
 var schemas = require('./schemas');
 
-module.exports = BaseTest.extend({
+module.exports = {
     testRealmConstructor: function() {
         var realm = new Realm({schema: []});
         TestCase.assertTrue(realm instanceof Realm);
@@ -160,13 +159,16 @@ module.exports = BaseTest.extend({
         TestCase.assertEqual(Realm.schemaVersion(Realm.defaultPath), -1);
         
         var realm = new Realm({schema: []});
+        TestCase.assertEqual(realm.schemaVersion, 0);
         TestCase.assertEqual(Realm.schemaVersion(Realm.defaultPath), 0);
 
         realm = new Realm({schema: [], schemaVersion: 2, path: 'another.realm'});
+        TestCase.assertEqual(realm.schemaVersion, 2);
         TestCase.assertEqual(Realm.schemaVersion('another.realm'), 2);
 
         var encryptionKey = new Int8Array(64);
         realm = new Realm({schema: [], schemaVersion: 3, path: 'encrypted.realm', encryptionKey: encryptionKey});
+        TestCase.assertEqual(realm.schemaVersion, 3);
         TestCase.assertEqual(Realm.schemaVersion('encrypted.realm', encryptionKey), 3);
 
         TestCase.assertThrows(function() {
@@ -652,7 +654,7 @@ module.exports = BaseTest.extend({
         TestCase.assertEqual(notificationName, 'change');
 
         var secondNotificationCount = 0;
-        function secondNotification(realm, name) {
+        function secondNotification() {
             secondNotificationCount++;
         }
 
@@ -750,7 +752,7 @@ module.exports = BaseTest.extend({
 
         // copy should not overwrite existing files
         Realm.copyBundledRealmFiles();
-        var realm = new Realm({path: 'dates-v5.realm', schema: [schemas.DateObject]});
+        realm = new Realm({path: 'dates-v5.realm', schema: [schemas.DateObject]});
         TestCase.assertEqual(realm.objects('Date')[0].currentDate.getTime(), 1);
     },
-});
+};

tests/js/results-tests.js

@@ -19,11 +19,10 @@
 'use strict';
 
 var Realm = require('realm');
-var BaseTest = require('./base-test');
 var TestCase = require('./asserts');
 var schemas = require('./schemas');
 
-module.exports = BaseTest.extend({
+module.exports = {
     testResultsConstructor: function() {
         var realm = new Realm({schema: [schemas.TestObject]});
         var objects = realm.objects('TestObject');
@@ -100,15 +99,16 @@ module.exports = BaseTest.extend({
     testResultsInvalidObjectType: function() {
         var realm = new Realm({schema: [schemas.TestObject]});
         TestCase.assertThrows(function() {
-            var objects = realm.objects('NotTestObject');
+            realm.objects('NotTestObject');
         });
     },
 
     testResultsEnumerate: function() {
         var realm = new Realm({schema: [schemas.TestObject]});
         var objects = realm.objects('TestObject');
+        var index;
 
-        for (var index in objects) {
+        for (index in objects) {
             TestCase.assertTrue(false, "No objects should have been enumerated");
         }
 
@@ -119,7 +119,7 @@ module.exports = BaseTest.extend({
 
         var count = 0;
         var keys = Object.keys(objects);
-        for (var index in objects) {
+        for (index in objects) {
             TestCase.assertEqual(count++, +index);
             TestCase.assertEqual(keys[index], index);
         }
@@ -185,7 +185,7 @@ module.exports = BaseTest.extend({
             realm.create('IntPrimaryObject', {primaryCol: 0, valueCol: 'c'});
         });
 
-        var primaries = function(results, prop) {
+        var primaries = function(results) {
             return results.map(function(object) {
                 return object.primaryCol;
             });
@@ -368,4 +368,4 @@ module.exports = BaseTest.extend({
             TestCase.assertEqual(snapshot.length, 0);
         });
     }
-});
+};

tests/react-test-app/.eslintrc.json

@@ -18,7 +18,6 @@
   "parser": "babel-eslint",
   "parserOptions": {
     "ecmaFeatures": {
-      "forOf": false,
       "jsx": true
     }
   },

tests/react-test-app/index.android.js

@@ -17,60 +17,44 @@
 ////////////////////////////////////////////////////////////////////////////
 'use strict';
 
-const React = require('react');
-const Realm = require('realm');
-const RealmTests = require('realm-tests');
-const builder = require('xmlbuilder');
-const RNFS = require('react-native-fs');
-
-const {
+import {
     AppRegistry,
     StyleSheet,
     Image,
     Text,
     View,
-    TouchableNativeFeedback,
-} = require('react-native');
+} from 'react-native';
 
-RealmTests.registerTests({
-    ListViewTest: require('./tests/listview-test'),
-});
+import builder from 'xmlbuilder';
+import React from 'react';
+import RNFS from 'react-native-fs';
+import { getTestNames, runTest } from './tests';
 
-function runTests() {
+async function runTests() {
+    let testNames = getTestNames();
     let rootXml = builder.create('testsuites');
-    let testNames = RealmTests.getTestNames();
 
     for (let suiteName in testNames) {
         let itemTestsuite = rootXml.ele('testsuite');
         let nbrTests = 0;
         let nbrFailures = 0;
 
-        console.log('Starting suite ' + suiteName);
+        console.log('Starting ' + suiteName);
 
-        testNames[suiteName].forEach((testName) => {
+        for (let testName of testNames[suiteName]) {
             nbrTests++;
 
             let itemTest = itemTestsuite.ele('testcase');
             itemTest.att('name', testName);
 
-            console.log('Starting ' + testName);
-            RealmTests.runTest(suiteName, 'beforeEach');
-
             try {
-                RealmTests.runTest(suiteName, testName);
-                console.log('+ ' + testName);
+                runTest(suiteName, testName);
             }
             catch (e) {
-                console.log('- ' + testName);
-                console.warn(e.message);
-
                 itemTest.ele('error', {'message': ''}, e.message);
                 nbrFailures++;
             }
-            finally {
-                RealmTests.runTest(suiteName, 'afterEach');
-            }
-        });
+        }
 
         // update Junit XML report
         itemTestsuite.att('name', suiteName);
@@ -80,55 +64,57 @@ function runTests() {
 
     }
     // export unit tests results
-    var xmlString = rootXml.end({ pretty: true, indent: '  ', newline: '\n' });
-    var path = '/sdcard/tests.xml';
+    let xmlString = rootXml.end({
+        pretty: true,
+        indent: '  ',
+        newline: '\n',
+    });
 
     // write the unit tests reports
-    RNFS.writeFile(path, xmlString , 'utf8')
-      .then((success) => {
+    try {
+        await RNFS.writeFile('/sdcard/tests.xml', xmlString, 'utf8');
         console.log('__REALM_REACT_ANDROID_TESTS_COMPLETED__');
-      })
-      .catch((err) => {
-        console.log(err.message);
-      });
-
+    }
+    catch (e) {
+        console.error(e);
+    }
 }
 
 class ReactTests extends React.Component {
-  render() {
-    return (
-      <View style={styles.container}>
-          <Text style={styles.button} onPress={runTests}>
-              Running Tests...
-          </Text>
+    render() {
+        return (
+            <View style={styles.container}>
+                <Text style={styles.button} onPress={runTests}>
+                    Running Tests...
+                </Text>
 
-          <Image
-            style={styles.icon}
-            source={require('image!ic_launcher')}
-            onLoad={() => runTests()}
-          />
-      </View>
-    );
-  }
+                <Image
+                    style={styles.icon}
+                    source={require('image!ic_launcher')}
+                    onLoad={() => runTests()}
+                />
+            </View>
+        );
+    }
 }
 
-var styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    justifyContent: 'center',
-    alignItems: 'center',
-    backgroundColor: '#F5FCFF',
-  },
-  welcome: {
-    fontSize: 20,
-    textAlign: 'center',
-    margin: 10,
-  },
-  instructions: {
-    textAlign: 'center',
-    color: '#333333',
-    marginBottom: 5,
-  },
+const styles = StyleSheet.create({
+    container: {
+        flex: 1,
+        justifyContent: 'center',
+        alignItems: 'center',
+        backgroundColor: '#F5FCFF',
+    },
+    welcome: {
+        fontSize: 20,
+        textAlign: 'center',
+        margin: 10,
+    },
+    instructions: {
+        textAlign: 'center',
+        color: '#333333',
+        marginBottom: 5,
+    },
 });
 
 AppRegistry.registerComponent('ReactTests', () => ReactTests);

tests/react-test-app/index.ios.js

@@ -18,23 +18,21 @@
 
 'use strict';
 
-const React = require('react');
-const Realm = require('realm');
-const tests = require('./tests');
-
-const {
+import {
     AppRegistry,
     StyleSheet,
     Text,
-    TouchableHighlight,
     View,
-} = require('react-native');
+} from 'react-native';
+
+import React from 'react';
+import { runTests } from './tests';
 
 class ReactTests extends React.Component {
     render() {
         return (
             <View style={styles.container}>
-                <Text style={styles.button} onPress={tests.runTests}>
+                <Text style={styles.button} onPress={runTests}>
                     Tap to Run Tests
                 </Text>
                 <Text style={styles.instructions}>
@@ -46,7 +44,7 @@ class ReactTests extends React.Component {
     }
 }
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
     container: {
         flex: 1,
         justifyContent: 'center',

tests/react-test-app/tests/index.js

@@ -18,22 +18,14 @@
 
 'use strict';
 
-const React = require('react-native');
-const RealmTests = require('realm-tests');
+import { NativeAppEventEmitter, NativeModules } from 'react-native';
+import * as RealmTests from 'realm-tests';
+import ListViewTest from './listview-test';
 
 RealmTests.registerTests({
-    ListViewTest: require('./listview-test'),
+    ListViewTest,
 });
 
-const {
-    NativeAppEventEmitter,
-    NativeModules,
-} = React;
-
-module.exports = {
-    runTests,
-};
-
 // Listen for event to run a particular test.
 NativeAppEventEmitter.addListener('realm-run-test', (test) => {
     let error;
@@ -48,29 +40,41 @@ NativeAppEventEmitter.addListener('realm-run-test', (test) => {
 
 // Inform the native test harness about the test suite once it's ready.
 setTimeout(() => {
-    NativeModules.Realm.emit('realm-test-names', RealmTests.getTestNames());
+    // The emit() method only exists on iOS, for now.
+    if (NativeModules.Realm.emit) {
+        NativeModules.Realm.emit('realm-test-names', getTestNames());
+    }
 }, 0);
 
-function runTests() {
-    let testNames = RealmTests.getTestNames();
+export function getTestNames() {
+    return RealmTests.getTestNames();
+}
+
+export function runTests() {
+    let testNames = getTestNames();
 
     for (let suiteName in testNames) {
         console.log('Starting ' + suiteName);
 
         for (let testName of testNames[suiteName]) {
-            RealmTests.runTest(suiteName, 'beforeEach');
-
-            try {
-                RealmTests.runTest(suiteName, testName);
-                console.log('+ ' + testName);
-            }
-            catch (e) {
-                console.warn('- ' + testName);
-                console.warn(e.message);
-            }
-            finally {
-                RealmTests.runTest(suiteName, 'afterEach');
-            }
+            runTest(suiteName, testName);
         }
     }
 }
+
+export function runTest(suiteName, testName) {
+    RealmTests.runTest(suiteName, 'beforeEach');
+
+    try {
+        RealmTests.runTest(suiteName, testName);
+        console.log('+ ' + testName);
+    }
+    catch (e) {
+        console.warn('- ' + testName);
+        console.warn(e.message || e);
+        throw e;
+    }
+    finally {
+        RealmTests.runTest(suiteName, 'afterEach');
+    }
+}

tests/react-test-app/tests/listview-test.js

@@ -18,9 +18,9 @@
 
 'use strict';
 
-const Realm = require('realm');
-const { ListView } = require('realm/react-native');
-const { assertEqual, assertTrue } = require('realm-tests/asserts');
+import Realm from 'realm';
+import { ListView } from 'realm/react-native';
+import { assertEqual, assertTrue } from 'realm-tests/asserts';
 
 const OBJECT_SCHEMA = {
     name: 'UniqueObject',
@@ -48,11 +48,7 @@ function createDataSource() {
     });
 }
 
-module.exports = {
-    afterEach() {
-        Realm.clearTestState();
-    },
-
+export default {
     testDataSource() {
         let realm = createRealm();
         let objects = realm.objects('UniqueObject').sorted('id');