status-im
/
realm-js
mirror of https://github.com/status-im/realm-js.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'al-android-aar' of https://github.com/realm/realm-js into al-android-aar

This commit is contained in:
Nabil Hachicha 2016-01-12 10:27:16 +00:00
parent 2d8dddabee 211f0eddd5
commit 8c80b42748
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/android/platform.cpp
View File

@ -5,6 +5,7 @@
#include "../platform.hpp" #include "../platform.hpp"
#include "../js_init.h" #include "../js_init.h"
#include <string> #include <string>
#include <stdlib.h>
std::string s_default_realm_directory; std::string s_default_realm_directory;
@ -21,6 +22,9 @@ std::string default_realm_file_directory()
void ensure_directory_exists_for_file(const std::string &fileName) void ensure_directory_exists_for_file(const std::string &fileName)
{ {
std::string cmd = "rm " + s_default_realm_directory + "/*.realm " +
s_default_realm_directory + "/*.realm.lock";
system(cmd.c_str());
} }
void remove_realm_files_from_directory(const std::string &directory) void remove_realm_files_from_directory(const std::string &directory)

3
tests/lib/QueryTests.js
View File

@ -62,7 +62,8 @@ function runQuerySuite(suite) {
return args; return args;
} }
for (var test of suite.tests) { for (var index in suite.tests) {
var test = suite.tests[index];
if (test[0] == "QueryCount") { if (test[0] == "QueryCount") {
var length = realm.objects.apply(realm, getArgs(2)).length; var length = realm.objects.apply(realm, getArgs(2)).length;
TestCase.assertEqual(test[1], length, "Query '" + args[1] + "' on type '" + args[0] + "' expected " + test[1] + " results, got " + length); TestCase.assertEqual(test[1], length, "Query '" + args[1] + "' on type '" + args[0] + "' expected " + test[1] + " results, got " + length);

5
tests/lib/RealmTests.js
View File

@ -69,9 +69,8 @@ module.exports = BaseTest.extend({
var newPath = util.realmPathForFile('default2.realm'); var newPath = util.realmPathForFile('default2.realm');
Realm.defaultPath = newPath; Realm.defaultPath = newPath;
defaultRealm = new Realm({schema: []}); defaultRealm = new Realm({schema: []});
TestCase.assertEqual(defaultRealm.path, newPath); TestCase.assertEqual(defaultRealm.path, newPath, "should use updated default realm path");
TestCase.assertEqual(Realm.defaultPath, newPath); TestCase.assertEqual(Realm.defaultPath, newPath, "defaultPath should have been updated");
}, },
testRealmCreate: function() { testRealmCreate: function() {

1
tests/react-test-app/index.android.js
View File

@ -18,7 +18,6 @@ var Realm = require('realm');
var RealmTests = require('realm-tests'); var RealmTests = require('realm-tests');
function runTests() { function runTests() {
RealmTests.ObjectTests.testNullableBasicTypesPropertySetters();
let testNames = RealmTests.getTestNames(); let testNames = RealmTests.getTestNames();
for (let suiteName in testNames) { for (let suiteName in testNames) {