1
0
Fork 0

Bug fix/convert arangosearch tests to common (#5772)

* Create shell_client_aql test alias and move aql-view-arangosearch-noncluster to it

*  Changes to be committed:
	modified:   js/client/modules/@arangodb/testsuites/aql.js

* Move remained AS AQL tests (aql-view-arangosearch-cluster, aql-view-arangosearch-ddl-noncluster, aql-view-arangosearch-ddl-cluster, aql-view-arangosearch-feature) to common and fix aql.js to really use arangosh in client execution

* Update aql.js of client modules

* 	modified:   aql-view-arangosearch-noncluster.js

* Remove toString() from assertions

* Minor typo fixes and changes to aql-view-arangosearch-noncluster tests from devel

* Added lost assertion for testInTokensFilterSortTFIDF

* Fix typos.

* Restored modified in devel tests to be common.

* Fix db._query() typo.

* Remove unsupported AQL query and shell_*_aql from shell_* groups of
tests.

* Fix conflict.

* Fix conflict.

* Remove moved tests.

* Revert "Remove moved tests."

This reverts commit bcdbde4baed610df2ae2ab4768a8c17b79ed3f64.

* test
This commit is contained in:
KVS85 2018-07-04 21:16:00 +03:00 committed by Andrey Abramov
parent 5ed2ca5a56
commit e2d1d1e898
6 changed files with 173 additions and 142 deletions

View File

@ -28,6 +28,7 @@
const functionsDocumentation = {
'shell_client': 'shell client tests',
'shell_server': 'shell server tests',
'shell_client_aql': 'AQL tests in the client',
'shell_server_aql': 'AQL tests in the server',
'shell_server_only': 'server specific tests'
};
@ -43,7 +44,8 @@ const testPaths = {
'shell_client': [ 'js/common/tests/shell', 'js/client/tests/http', 'js/client/tests/shell' ],
'shell_server': [ 'js/common/tests/shell', 'js/server/tests/shell' ],
'shell_server_only': [ 'js/server/tests/shell' ],
'shell_server_aql': [ 'js/server/tests/aql' ]
'shell_server_aql': [ 'js/server/tests/aql', 'js/common/tests/aql' ],
'shell_client_aql': [ 'js/client/tests/aql', 'js/common/tests/aql' ]
};
// //////////////////////////////////////////////////////////////////////////////
@ -107,15 +109,46 @@ function shellServerAql (options) {
};
}
// //////////////////////////////////////////////////////////////////////////////
// / @brief TEST: shell_client_aql
// //////////////////////////////////////////////////////////////////////////////
function shellClientAql (options) {
let testCases;
let name = 'shell_client_aql';
if (!options.skipAql) {
testCases = tu.scanTestPaths(testPaths.shell_client_aql);
if (options.skipRanges) {
testCases = _.filter(testCases,
function (p) { return p.indexOf('ranges-combined') === -1; });
name = 'shell_client_aql_skipranges';
}
testCases = tu.splitBuckets(options, testCases);
return tu.performTests(options, testCases, name, tu.runInArangosh);
}
return {
shell_client_aql: {
status: true,
skipped: true
}
};
}
exports.setup = function (testFns, defaultFns, opts, fnDocs, optionsDoc, allTestPaths) {
Object.assign(allTestPaths, testPaths);
testFns['shell_client'] = shellClient;
testFns['shell_server'] = shellServer;
testFns['shell_client_aql'] = shellClientAql;
testFns['shell_server_aql'] = shellServerAql;
testFns['shell_server_only'] = shellServerOnly;
defaultFns.push('shell_client');
defaultFns.push('shell_server');
defaultFns.push('shell_client_aql');
defaultFns.push('shell_server_aql');
opts['skipAql'] = false;

View File

@ -1,5 +1,5 @@
/*jshint globalstrict:false, strict:false, maxlen: 500 */
/*global assertUndefined, assertEqual, assertTrue, assertFalse, AQL_EXECUTE */
/*global assertUndefined, assertEqual, assertTrue, assertFalse*/
////////////////////////////////////////////////////////////////////////////////
/// @brief tests for iresearch usage
@ -98,7 +98,7 @@ function IResearchAqlTestSuite(numberOfShards, replicationFactor) {
},
testAttributeEqualityFilter : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER doc.a == 'foo' RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER doc.a == 'foo' RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 10);
result.forEach(function(res) {
@ -107,7 +107,7 @@ function IResearchAqlTestSuite(numberOfShards, replicationFactor) {
},
testMultipleAttributeEqualityFilter : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER doc.a == 'foo' && doc.b == 'bar' RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER doc.a == 'foo' && doc.b == 'bar' RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 5);
result.forEach(function(res) {
@ -117,7 +117,7 @@ function IResearchAqlTestSuite(numberOfShards, replicationFactor) {
},
testMultipleAttributeEqualityFilterSortAttribute : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER doc.a == 'foo' && doc.b == 'bar' SORT doc.c RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER doc.a == 'foo' && doc.b == 'bar' SORT doc.c RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 5);
var last = -1;
@ -130,7 +130,7 @@ function IResearchAqlTestSuite(numberOfShards, replicationFactor) {
},
testMultipleAttributeEqualityFilterSortAttributeDesc : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER doc.a == 'foo' AND doc.b == 'bar' SORT doc.c DESC RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER doc.a == 'foo' AND doc.b == 'bar' SORT doc.c DESC RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 5);
var last = 5;
@ -143,7 +143,7 @@ function IResearchAqlTestSuite(numberOfShards, replicationFactor) {
},
testAttributeLessFilter : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER doc.c < 2 RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER doc.c < 2 RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 8);
result.forEach(function(res) {
@ -152,7 +152,7 @@ function IResearchAqlTestSuite(numberOfShards, replicationFactor) {
},
testAttributeLeqFilter : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER doc.c <= 2 RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER doc.c <= 2 RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 12);
result.forEach(function(res) {
@ -161,7 +161,7 @@ function IResearchAqlTestSuite(numberOfShards, replicationFactor) {
},
testAttributeGeqFilter : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER doc.c >= 2 RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER doc.c >= 2 RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 12);
result.forEach(function(res) {
@ -170,7 +170,7 @@ function IResearchAqlTestSuite(numberOfShards, replicationFactor) {
},
testAttributeGreaterFilter : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER doc.c > 2 RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER doc.c > 2 RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 8);
result.forEach(function(res) {
@ -179,7 +179,7 @@ function IResearchAqlTestSuite(numberOfShards, replicationFactor) {
},
testAttributeOpenIntervalFilter : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER doc.c > 1 AND doc.c < 3 RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER doc.c > 1 AND doc.c < 3 RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 4);
result.forEach(function(res) {
@ -188,7 +188,7 @@ function IResearchAqlTestSuite(numberOfShards, replicationFactor) {
},
testAttributeClosedIntervalFilter : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER doc.c >= 1 AND doc.c <= 3 RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER doc.c >= 1 AND doc.c <= 3 RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 12);
result.forEach(function(res) {
@ -197,7 +197,7 @@ function IResearchAqlTestSuite(numberOfShards, replicationFactor) {
},
testAttributeIntervalExclusionFilter : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER doc.c < 1 OR doc.c > 3 RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER doc.c < 1 OR doc.c > 3 RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 8);
result.forEach(function(res) {
@ -206,7 +206,7 @@ function IResearchAqlTestSuite(numberOfShards, replicationFactor) {
},
testAttributeNeqFilter : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER doc.a != 'foo' RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER doc.a != 'foo' RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 18); // include documents without attribute 'a'
result.forEach(function(res) {
@ -215,7 +215,7 @@ function IResearchAqlTestSuite(numberOfShards, replicationFactor) {
},
testStartsWithFilter : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER STARTS_WITH(doc.a, 'fo') RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER STARTS_WITH(doc.a, 'fo') RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 10);
result.forEach(function(res) {
@ -224,7 +224,7 @@ function IResearchAqlTestSuite(numberOfShards, replicationFactor) {
},
testStartsWithFilter2 : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER STARTS_WITH(doc.b, 'ba') RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER STARTS_WITH(doc.b, 'ba') RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 10);
result.forEach(function(res) {
@ -233,7 +233,7 @@ function IResearchAqlTestSuite(numberOfShards, replicationFactor) {
},
testStartsWithFilterSort : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER STARTS_WITH(doc.b, 'ba') && doc.c == 0 SORT doc.b RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER STARTS_WITH(doc.b, 'ba') && doc.c == 0 SORT doc.b RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 2);
assertEqual(result[0].b, 'bar');
@ -243,7 +243,7 @@ function IResearchAqlTestSuite(numberOfShards, replicationFactor) {
},
testInTokensFilterSortTFIDF : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER ANALYZER(doc.text IN TOKENS('the quick brown', 'text_en'), 'text_en') SORT TFIDF(doc) LIMIT 4 RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER ANALYZER(doc.text IN TOKENS('the quick brown', 'text_en'), 'text_en') SORT TFIDF(doc) LIMIT 4 RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 4);
assertEqual(result[0].name, 'other half');
@ -253,22 +253,22 @@ function IResearchAqlTestSuite(numberOfShards, replicationFactor) {
},
testPhraseFilter : function () {
var result0 = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER PHRASE(doc.text, 'quick brown fox jumps', 'text_en') RETURN doc", null, { waitForSync: true }).json;
var result0 = db._query("FOR doc IN VIEW UnitTestsView FILTER PHRASE(doc.text, 'quick brown fox jumps', 'text_en') RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result0.length, 1);
assertEqual(result0[0].name, 'full');
var result1 = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER PHRASE(doc.text, [ 'quick brown fox jumps' ], 'text_en') RETURN doc", null, { waitForSync: true }).json;
var result1 = db._query("FOR doc IN VIEW UnitTestsView FILTER PHRASE(doc.text, [ 'quick brown fox jumps' ], 'text_en') RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result1.length, 1);
assertEqual(result1[0].name, 'full');
var result2 = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER ANALYZER(PHRASE(doc.text, 'quick brown fox jumps'), 'text_en') RETURN doc", null, { waitForSync: true }).json;
var result2 = db._query("FOR doc IN VIEW UnitTestsView FILTER ANALYZER(PHRASE(doc.text, 'quick brown fox jumps'), 'text_en') RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result2.length, 1);
assertEqual(result2[0].name, 'full');
var result3 = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER ANALYZER(PHRASE(doc.text, [ 'quick brown fox jumps' ]), 'text_en') RETURN doc", null, { waitForSync: true }).json;
var result3 = db._query("FOR doc IN VIEW UnitTestsView FILTER ANALYZER(PHRASE(doc.text, [ 'quick brown fox jumps' ]), 'text_en') RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result3.length, 1);
assertEqual(result3[0].name, 'full');
@ -281,7 +281,7 @@ function IResearchAqlTestSuite(numberOfShards, replicationFactor) {
expected.add("other half");
expected.add("quarter");
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER EXISTS(doc.text) RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER EXISTS(doc.text) RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, expected.size);
result.forEach(function(res) {
@ -297,7 +297,7 @@ function IResearchAqlTestSuite(numberOfShards, replicationFactor) {
expected.add("other half");
expected.add("quarter");
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER EXISTS(doc.text, 'analyzer', 'text_en') RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER EXISTS(doc.text, 'analyzer', 'text_en') RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, expected.size);
result.forEach(function(res) {
@ -307,7 +307,7 @@ function IResearchAqlTestSuite(numberOfShards, replicationFactor) {
},
testExistsFilterByIdentityAnalyzer: function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER EXISTS(doc.text, 'analyzer') RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER EXISTS(doc.text, 'analyzer') RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(0, result.length);
},
@ -319,7 +319,7 @@ function IResearchAqlTestSuite(numberOfShards, replicationFactor) {
expected.add("other half");
expected.add("quarter");
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER ANALYZER(EXISTS(doc.text, 'analyzer'), 'text_en') RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER ANALYZER(EXISTS(doc.text, 'analyzer'), 'text_en') RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, expected.size);
result.forEach(function(res) {
@ -335,7 +335,7 @@ function IResearchAqlTestSuite(numberOfShards, replicationFactor) {
expected.add("other half");
expected.add("quarter");
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER EXISTS(doc.text, 'string') RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER EXISTS(doc.text, 'string') RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, expected.size);
result.forEach(function(res) {
@ -345,7 +345,7 @@ function IResearchAqlTestSuite(numberOfShards, replicationFactor) {
},
testExistsFilterByType : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER EXISTS(doc.text, 'type') RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER EXISTS(doc.text, 'type') RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 0);
},
@ -354,7 +354,7 @@ function IResearchAqlTestSuite(numberOfShards, replicationFactor) {
var expected = new Set();
expected.add("null");
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER EXISTS(doc.anotherNullField, 'null') RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER EXISTS(doc.anotherNullField, 'null') RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, expected.size);
result.forEach(function(res) {
@ -367,7 +367,7 @@ function IResearchAqlTestSuite(numberOfShards, replicationFactor) {
var expected = new Set();
expected.add("bool");
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER EXISTS(doc['anotherBoolField'], 'bool') RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER EXISTS(doc['anotherBoolField'], 'bool') RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, expected.size);
result.forEach(function(res) {
@ -380,7 +380,7 @@ function IResearchAqlTestSuite(numberOfShards, replicationFactor) {
var expected = new Set();
expected.add("numeric");
var result = AQL_EXECUTE("LET suffix='NumericField' LET fieldName = CONCAT('another', suffix) FOR doc IN VIEW UnitTestsView FILTER EXISTS(doc[fieldName], 'numeric') RETURN doc", null, { waitForSync: true }).json;
var result = db._query("LET suffix='NumericField' LET fieldName = CONCAT('another', suffix) FOR doc IN VIEW UnitTestsView FILTER EXISTS(doc[fieldName], 'numeric') RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, expected.size);
result.forEach(function(res) {
@ -396,11 +396,11 @@ function IResearchAqlTestSuite(numberOfShards, replicationFactor) {
expected.add(JSON.stringify({ a: "bar", b: "foo", c: 1 }));
expected.add(JSON.stringify({ a: "baz", b: "foo", c: 1 }));
var result = AQL_EXECUTE(
var result = db._query(
"FOR adoc IN AnotherUnitTestsCollection" +
" FOR doc IN VIEW UnitTestsView FILTER adoc.id == doc.c && STARTS_WITH(doc['a'], adoc.a) " +
"RETURN doc"
, null, { waitForSync: true }).json;
, null, { waitForSync: true }).toArray();
assertEqual(result.length, expected.size);
@ -415,11 +415,11 @@ function IResearchAqlTestSuite(numberOfShards, replicationFactor) {
expected.add(JSON.stringify({ a: "foo", b: "bar", c: 0 }));
expected.add(JSON.stringify({ a: "foo", b: "baz", c: 0 }));
var result = AQL_EXECUTE(
var result = db._query(
"FOR adoc IN AnotherUnitTestsCollection FILTER adoc.id < 1" +
" FOR doc IN VIEW UnitTestsView FILTER adoc.id == doc.c && STARTS_WITH(doc['a'], adoc.a) " +
"RETURN doc"
, null, { waitForSync: true }).json;
, null, { waitForSync: true }).toArray();
assertEqual(result.length, expected.size);
@ -436,12 +436,12 @@ function IResearchAqlTestSuite(numberOfShards, replicationFactor) {
expected.push({ a: "foo", b: "bar", c: 0 });
expected.push({ a: "foo", b: "baz", c: 0 });
var result = AQL_EXECUTE(
var result = db._query(
"FOR adoc IN AnotherUnitTestsCollection" +
" FOR doc IN VIEW UnitTestsView FILTER adoc.id == doc.c && STARTS_WITH(doc['a'], adoc.a) " +
"SORT doc.c DESC, doc.a, doc.b " +
"RETURN doc"
, null, { waitForSync: true }).json;
, null, { waitForSync: true }).toArray();
assertEqual(result.length, expected.length);
var i = 0;
@ -460,12 +460,12 @@ function IResearchAqlTestSuite(numberOfShards, replicationFactor) {
expected.push({ a: "foo", b: "bar", c: 0 });
expected.push({ a: "foo", b: "baz", c: 0 });
var result = AQL_EXECUTE(
var result = db._query(
"FOR adoc IN AnotherUnitTestsCollection" +
" FOR doc IN VIEW UnitTestsView FILTER adoc.id == doc.c && STARTS_WITH(doc['a'], adoc.a) " +
"SORT TFIDF(doc) DESC, BM25(doc) DESC, doc.a DESC, doc.b " +
"RETURN doc"
, null, { waitForSync: true }).json;
, null, { waitForSync: true }).toArray();
assertEqual(result.length, expected.length);
var i = 0;

View File

@ -1,5 +1,5 @@
/*jshint globalstrict:false, strict:false, maxlen: 500 */
/*global assertUndefined, assertNotEqual, assertEqual, assertTrue, assertFalse, AQL_EXECUTE */
/*global assertUndefined, assertNotEqual, assertEqual, assertTrue, assertFalse*/
////////////////////////////////////////////////////////////////////////////////
/// DISCLAIMER
@ -394,11 +394,11 @@ function IResearchFeatureDDLTestSuite () {
var meta = { links: { "TestCollection0": { includeAllFields: true } } };
view.properties(meta, true); // partial update
var result = AQL_EXECUTE("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(0, result.length);
col0.save({ name: "quarter", text: "quick over" });
result = AQL_EXECUTE("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).json;
result = db._query("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(1, result.length);
assertEqual("quarter", result[0].name);
@ -416,7 +416,7 @@ function IResearchFeatureDDLTestSuite () {
meta = { links: { "TestCollection0": { includeAllFields: true } } };
view.properties(meta, true); // partial update
result = AQL_EXECUTE("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).json;
result = db._query("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(4, result.length);
assertEqual("full", result[0].name);
assertEqual("half", result[1].name);
@ -442,7 +442,7 @@ function IResearchFeatureDDLTestSuite () {
} };
view.properties(meta, true); // partial update
result = AQL_EXECUTE("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).json;
result = db._query("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(4, result.length);
assertEqual("full", result[0].name);
assertEqual("half", result[1].name);
@ -471,7 +471,7 @@ function IResearchFeatureDDLTestSuite () {
} };
view.properties(meta, true); // partial update
result = AQL_EXECUTE("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).json;
result = db._query("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(4, result.length);
assertEqual("full", result[0].name);
assertEqual("half", result[1].name);
@ -502,7 +502,7 @@ function IResearchFeatureDDLTestSuite () {
};
view.properties(meta, true); // partial update
var result = AQL_EXECUTE("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(0, result.length);
var properties = view.properties();
assertEqual(10, properties.commit.cleanupIntervalStep);
@ -518,7 +518,7 @@ function IResearchFeatureDDLTestSuite () {
assertEqual("de_DE.UTF-8", properties.locale);
col0.save({ name: "quarter", text: "quick over" });
result = AQL_EXECUTE("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).json;
result = db._query("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(1, result.length);
assertEqual("quarter", result[0].name);
@ -549,7 +549,7 @@ function IResearchFeatureDDLTestSuite () {
};
view.properties(meta, true); // partial update
result = AQL_EXECUTE("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).json;
result = db._query("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(4, result.length);
assertEqual("full", result[0].name);
assertEqual("half", result[1].name);
@ -600,7 +600,7 @@ function IResearchFeatureDDLTestSuite () {
};
view.properties(meta, true); // partial update
result = AQL_EXECUTE("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).json;
result = db._query("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(4, result.length);
assertEqual("full", result[0].name);
assertEqual("half", result[1].name);
@ -654,7 +654,7 @@ function IResearchFeatureDDLTestSuite () {
};
view.properties(meta, true); // partial update
result = AQL_EXECUTE("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).json;
result = db._query("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(4, result.length);
assertEqual("full", result[0].name);
assertEqual("half", result[1].name);
@ -688,7 +688,7 @@ function IResearchFeatureDDLTestSuite () {
var meta = { links: { "TestCollection0": { fields: { a: {} } } } };
view.properties(meta, true); // partial update
var result = AQL_EXECUTE("FOR doc IN VIEW TestView SORT doc.z RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW TestView SORT doc.z RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(2, result.length);
assertEqual(0, result[0].z);
assertEqual(1, result[1].z);
@ -700,7 +700,7 @@ function IResearchFeatureDDLTestSuite () {
assertNotEqual(undefined, updatedMeta.links.TestCollection0.fields.b);
assertEqual(undefined, updatedMeta.links.TestCollection0.fields.a);
result = AQL_EXECUTE("FOR doc IN VIEW TestView SORT doc.z RETURN doc", null, { waitForSync: true }).json;
result = db._query("FOR doc IN VIEW TestView SORT doc.z RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(2, result.length);
assertEqual(2, result[0].z);
assertEqual(3, result[1].z);
@ -708,7 +708,7 @@ function IResearchFeatureDDLTestSuite () {
meta = { links: { "TestCollection0": { fields: { c: {} } } } };
view.properties(meta, false); // full update
result = AQL_EXECUTE("FOR doc IN VIEW TestView SORT doc.z RETURN doc", null, { waitForSync: true }).json;
result = db._query("FOR doc IN VIEW TestView SORT doc.z RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(2, result.length);
assertEqual(0, result[0].z);
assertEqual(2, result[1].z);

View File

@ -1,5 +1,5 @@
/*jshint globalstrict:false, strict:false, maxlen: 500 */
/*global assertUndefined, assertEqual, assertNotEqual, assertTrue, assertFalse, AQL_EXECUTE */
/*global assertUndefined, assertEqual, assertNotEqual, assertTrue, assertFalse*/
////////////////////////////////////////////////////////////////////////////////
/// DISCLAIMER
@ -313,11 +313,11 @@ function iResearchFeatureAqlTestSuite () {
var meta = { links: { "TestCollection0": { includeAllFields: true } } };
view.properties(meta, true); // partial update
var result = AQL_EXECUTE("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(0, result.length);
col0.save({ name: "quarter", text: "quick over" });
result = AQL_EXECUTE("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).json;
result = db._query("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(1, result.length);
assertEqual("quarter", result[0].name);
@ -335,7 +335,7 @@ function iResearchFeatureAqlTestSuite () {
meta = { links: { "TestCollection0": { includeAllFields: true } } };
view.properties(meta, true); // partial update
result = AQL_EXECUTE("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).json;
result = db._query("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(4, result.length);
assertEqual("full", result[0].name);
assertEqual("half", result[1].name);
@ -361,7 +361,7 @@ function iResearchFeatureAqlTestSuite () {
} };
view.properties(meta, true); // partial update
result = AQL_EXECUTE("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).json;
result = db._query("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(4, result.length);
assertEqual("full", result[0].name);
assertEqual("half", result[1].name);
@ -390,7 +390,7 @@ function iResearchFeatureAqlTestSuite () {
} };
view.properties(meta, true); // partial update
result = AQL_EXECUTE("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).json;
result = db._query("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(4, result.length);
assertEqual("full", result[0].name);
assertEqual("half", result[1].name);
@ -421,7 +421,7 @@ function iResearchFeatureAqlTestSuite () {
};
view.properties(meta, true); // partial update
var result = AQL_EXECUTE("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(0, result.length);
var properties = view.properties();
assertEqual(10, properties.commit.cleanupIntervalStep);
@ -437,7 +437,7 @@ function iResearchFeatureAqlTestSuite () {
assertEqual("de_DE.UTF-8", properties.locale);
col0.save({ name: "quarter", text: "quick over" });
result = AQL_EXECUTE("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).json;
result = db._query("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(1, result.length);
assertEqual("quarter", result[0].name);
@ -468,7 +468,7 @@ function iResearchFeatureAqlTestSuite () {
};
view.properties(meta, true); // partial update
result = AQL_EXECUTE("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).json;
result = db._query("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(4, result.length);
assertEqual("full", result[0].name);
assertEqual("half", result[1].name);
@ -519,7 +519,7 @@ function iResearchFeatureAqlTestSuite () {
};
view.properties(meta, true); // partial update
result = AQL_EXECUTE("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).json;
result = db._query("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(4, result.length);
assertEqual("full", result[0].name);
assertEqual("half", result[1].name);
@ -573,7 +573,7 @@ function iResearchFeatureAqlTestSuite () {
};
view.properties(meta, true); // partial update
result = AQL_EXECUTE("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).json;
result = db._query("FOR doc IN VIEW TestView SORT doc.name RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(4, result.length);
assertEqual("full", result[0].name);
assertEqual("half", result[1].name);
@ -607,7 +607,7 @@ function iResearchFeatureAqlTestSuite () {
var meta = { links: { "TestCollection0": { fields: { a: {} } } } };
view.properties(meta, true); // partial update
var result = AQL_EXECUTE("FOR doc IN VIEW TestView SORT doc.z RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW TestView SORT doc.z RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(2, result.length);
assertEqual(0, result[0].z);
assertEqual(1, result[1].z);
@ -619,7 +619,7 @@ function iResearchFeatureAqlTestSuite () {
assertNotEqual(undefined, updatedMeta.links.TestCollection0.fields.b);
assertEqual(undefined, updatedMeta.links.TestCollection0.fields.a);
result = AQL_EXECUTE("FOR doc IN VIEW TestView SORT doc.z RETURN doc", null, { waitForSync: true }).json;
result = db._query("FOR doc IN VIEW TestView SORT doc.z RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(2, result.length);
assertEqual(2, result[0].z);
assertEqual(3, result[1].z);
@ -627,7 +627,7 @@ function iResearchFeatureAqlTestSuite () {
meta = { links: { "TestCollection0": { fields: { c: {} } } } };
view.properties(meta, false); // full update
result = AQL_EXECUTE("FOR doc IN VIEW TestView SORT doc.z RETURN doc", null, { waitForSync: true }).json;
result = db._query("FOR doc IN VIEW TestView SORT doc.z RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(2, result.length);
assertEqual(0, result[0].z);
assertEqual(2, result[1].z);

View File

@ -1,5 +1,5 @@
/*jshint globalstrict:false, strict:false, maxlen: 500 */
/*global assertUndefined, assertEqual, assertTrue, assertFalse, AQL_EXECUTE */
/*global assertUndefined, assertEqual, assertTrue, assertFalse, db._query */
////////////////////////////////////////////////////////////////////////////////
/// DISCLAIMER
@ -46,22 +46,22 @@ function iResearchFeatureAqlTestSuite () {
testDefaultAnalyzers : function() {
// invalid
{
let result = AQL_EXECUTE(
let result = db._query(
"RETURN TOKENS('a quick brown fox jumps', 'invalid')",
null,
{ }
).json;
).toArray();
assertEqual(1, result.length);
assertEqual(null, result[0]);
}
// text_de
{
let result = AQL_EXECUTE(
let result = db._query(
"RETURN TOKENS('a quick brown fox jumps', 'text_de')",
null,
{ }
).json;
).toArray();
assertEqual(1, result.length);
assertTrue(Array === result[0].constructor);
assertEqual(5, result[0].length);
@ -70,11 +70,11 @@ function iResearchFeatureAqlTestSuite () {
// text_en
{
let result = AQL_EXECUTE(
let result = db._query(
"RETURN TOKENS('a quick brown fox jumps', 'text_en')",
null,
{ }
).json;
).toArray();
assertEqual(1, result.length);
assertTrue(Array === result[0].constructor);
assertEqual(5, result[0].length);
@ -83,11 +83,11 @@ function iResearchFeatureAqlTestSuite () {
// text_es
{
let result = AQL_EXECUTE(
let result = db._query(
"RETURN TOKENS('a quick brown fox jumps', 'text_es')",
null,
{ }
).json;
).toArray();
assertEqual(1, result.length);
assertTrue(Array === result[0].constructor);
assertEqual(5, result[0].length);
@ -96,11 +96,11 @@ function iResearchFeatureAqlTestSuite () {
// text_fi
{
let result = AQL_EXECUTE(
let result = db._query(
"RETURN TOKENS('a quick brown fox jumps', 'text_fi')",
null,
{ }
).json;
).toArray();
assertEqual(1, result.length);
assertTrue(Array === result[0].constructor);
assertEqual(5, result[0].length);
@ -109,11 +109,11 @@ function iResearchFeatureAqlTestSuite () {
// text_fr
{
let result = AQL_EXECUTE(
let result = db._query(
"RETURN TOKENS('a quick brown fox jumps', 'text_fr')",
null,
{ }
).json;
).toArray();
assertEqual(1, result.length);
assertTrue(Array === result[0].constructor);
assertEqual(5, result[0].length);
@ -122,11 +122,11 @@ function iResearchFeatureAqlTestSuite () {
// text_it
{
let result = AQL_EXECUTE(
let result = db._query(
"RETURN TOKENS('a quick brown fox jumps', 'text_it')",
null,
{ }
).json;
).toArray();
assertEqual(1, result.length);
assertTrue(Array === result[0].constructor);
assertEqual(5, result[0].length);
@ -135,11 +135,11 @@ function iResearchFeatureAqlTestSuite () {
// text_nl
{
let result = AQL_EXECUTE(
let result = db._query(
"RETURN TOKENS('a quick brown fox jumps', 'text_nl')",
null,
{ }
).json;
).toArray();
assertEqual(1, result.length);
assertTrue(Array === result[0].constructor);
assertEqual(5, result[0].length);
@ -148,11 +148,11 @@ function iResearchFeatureAqlTestSuite () {
// text_no
{
let result = AQL_EXECUTE(
let result = db._query(
"RETURN TOKENS('a quick brown fox jumps', 'text_no')",
null,
{ }
).json;
).toArray();
assertEqual(1, result.length);
assertTrue(Array === result[0].constructor);
assertEqual(5, result[0].length);
@ -161,11 +161,11 @@ function iResearchFeatureAqlTestSuite () {
// text_pt
{
let result = AQL_EXECUTE(
let result = db._query(
"RETURN TOKENS('a quick brown fox jumps', 'text_pt')",
null,
{ }
).json;
).toArray();
assertEqual(1, result.length);
assertTrue(Array === result[0].constructor);
assertEqual(5, result[0].length);
@ -174,11 +174,11 @@ function iResearchFeatureAqlTestSuite () {
// text_ru (codepoints)
{
let result = AQL_EXECUTE(
let result = db._query(
"RETURN TOKENS('ArangoDB - \u044D\u0442\u043E \u043C\u043D\u043E\u0433\u043E\u043C\u043E\u0434\u0435\u043B\u044C\u043D\u0430\u044F \u0431\u0430\u0437\u0430 \u0434\u0430\u043D\u043D\u044B\u0445', 'text_ru')",
null,
{ }
).json;
).toArray();
assertEqual(1, result.length);
assertTrue(Array === result[0].constructor);
assertEqual(5, result[0].length);
@ -188,11 +188,11 @@ function iResearchFeatureAqlTestSuite () {
// text_ru (unicode)
{
let result = AQL_EXECUTE(
let result = db._query(
"RETURN TOKENS('ArangoDB - это многомодельная база данных', 'text_ru')",
null,
{ }
).json;
).toArray();
assertEqual(1, result.length);
assertTrue(Array === result[0].constructor);
assertEqual(5, result[0].length);
@ -202,11 +202,11 @@ function iResearchFeatureAqlTestSuite () {
// text_sv
{
let result = AQL_EXECUTE(
let result = db._query(
"RETURN TOKENS('a quick brown fox jumps', 'text_sv')",
null,
{ }
).json;
).toArray();
assertEqual(1, result.length);
assertTrue(Array === result[0].constructor);
assertEqual(5, result[0].length);
@ -215,11 +215,11 @@ function iResearchFeatureAqlTestSuite () {
// text_zh (codepoints)
{
let result = AQL_EXECUTE(
let result = db._query(
"RETURN TOKENS('ArangoDB \u662F\u4E00\u4E2A\u591A\u6A21\u578B\u6570\u636E\u5E93\u3002', 'text_zh')",
null,
{ }
).json;
).toArray();
assertEqual(1, result.length);
assertTrue(Array === result[0].constructor);
assertEqual(7, result[0].length);
@ -229,11 +229,11 @@ function iResearchFeatureAqlTestSuite () {
// text_zh (unicode)
{
let result = AQL_EXECUTE(
let result = db._query(
"RETURN TOKENS('ArangoDB 是一个多模型数据库。', 'text_zh')",
null,
{ }
).json;
).toArray();
assertEqual(1, result.length);
assertTrue(Array === result[0].constructor);
assertEqual(7, result[0].length);

View File

@ -1,5 +1,5 @@
/*jshint globalstrict:false, strict:false, maxlen: 500 */
/*global assertUndefined, assertEqual, assertTrue, assertFalse, AQL_EXECUTE */
/*global assertUndefined, assertEqual, assertTrue, assertFalse*/
////////////////////////////////////////////////////////////////////////////////
/// @brief tests for iresearch usage
@ -100,11 +100,11 @@ function iResearchAqlTestSuite () {
action: function () {
var db = require("@arangodb").db;
var c = db._collection("UnitTestsCollection");
assertEqual(1, c.document('foo').xyz);
return c.toArray().length;
return {length: c.toArray().length, value: c.document('foo').xyz}
}
});
assertEqual(28, result);
assertEqual(1, result.value);
assertEqual(28, result.length);
// write lock
result = db._executeTransaction({
@ -138,7 +138,7 @@ function iResearchAqlTestSuite () {
},
testAttributeEqualityFilter : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER doc.a == 'foo' RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER doc.a == 'foo' RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 10);
result.forEach(function(res) {
@ -147,7 +147,7 @@ function iResearchAqlTestSuite () {
},
testMultipleAttributeEqualityFilter : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER doc.a == 'foo' && doc.b == 'bar' RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER doc.a == 'foo' && doc.b == 'bar' RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 5);
result.forEach(function(res) {
@ -157,7 +157,7 @@ function iResearchAqlTestSuite () {
},
testMultipleAttributeEqualityFilterSortAttribute : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER doc.a == 'foo' && doc.b == 'bar' SORT doc.c RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER doc.a == 'foo' && doc.b == 'bar' SORT doc.c RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 5);
var last = -1;
@ -170,7 +170,7 @@ function iResearchAqlTestSuite () {
},
testMultipleAttributeEqualityFilterSortAttributeDesc : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER doc.a == 'foo' AND doc.b == 'bar' SORT doc.c DESC RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER doc.a == 'foo' AND doc.b == 'bar' SORT doc.c DESC RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 5);
var last = 5;
@ -183,7 +183,7 @@ function iResearchAqlTestSuite () {
},
testAttributeLessFilter : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER doc.c < 2 RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER doc.c < 2 RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 8);
result.forEach(function(res) {
@ -192,7 +192,7 @@ function iResearchAqlTestSuite () {
},
testAttributeLeqFilter : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER doc.c <= 2 RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER doc.c <= 2 RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 12);
result.forEach(function(res) {
@ -201,7 +201,7 @@ function iResearchAqlTestSuite () {
},
testAttributeGeqFilter : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER doc.c >= 2 RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER doc.c >= 2 RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 12);
result.forEach(function(res) {
@ -210,7 +210,7 @@ function iResearchAqlTestSuite () {
},
testAttributeGreaterFilter : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER doc.c > 2 RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER doc.c > 2 RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 8);
result.forEach(function(res) {
@ -219,7 +219,7 @@ function iResearchAqlTestSuite () {
},
testAttributeOpenIntervalFilter : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER doc.c > 1 AND doc.c < 3 RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER doc.c > 1 AND doc.c < 3 RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 4);
result.forEach(function(res) {
@ -228,7 +228,7 @@ function iResearchAqlTestSuite () {
},
testAttributeClosedIntervalFilter : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER doc.c >= 1 AND doc.c <= 3 RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER doc.c >= 1 AND doc.c <= 3 RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 12);
result.forEach(function(res) {
@ -237,7 +237,7 @@ function iResearchAqlTestSuite () {
},
testAttributeIntervalExclusionFilter : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER doc.c < 1 OR doc.c > 3 RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER doc.c < 1 OR doc.c > 3 RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 8);
result.forEach(function(res) {
@ -246,7 +246,7 @@ function iResearchAqlTestSuite () {
},
testAttributeNeqFilter : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER doc.a != 'foo' RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER doc.a != 'foo' RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 18); // include documents without attribute 'a'
result.forEach(function(res) {
@ -255,7 +255,7 @@ function iResearchAqlTestSuite () {
},
testStartsWithFilter : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER STARTS_WITH(doc.a, 'fo') RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER STARTS_WITH(doc.a, 'fo') RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 10);
result.forEach(function(res) {
@ -264,7 +264,7 @@ function iResearchAqlTestSuite () {
},
testStartsWithFilter2 : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER STARTS_WITH(doc.b, 'ba') RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER STARTS_WITH(doc.b, 'ba') RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 10);
result.forEach(function(res) {
@ -273,7 +273,7 @@ function iResearchAqlTestSuite () {
},
testStartsWithFilterSort : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER STARTS_WITH(doc.b, 'ba') && doc.c == 0 SORT doc.b RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER STARTS_WITH(doc.b, 'ba') && doc.c == 0 SORT doc.b RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 2);
assertEqual(result[0].b, 'bar');
@ -283,7 +283,7 @@ function iResearchAqlTestSuite () {
},
testInTokensFilterSortTFIDF : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER ANALYZER(doc.text IN TOKENS('the quick brown', 'text_en'), 'text_en') SORT TFIDF(doc) LIMIT 4 RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER ANALYZER(doc.text IN TOKENS('the quick brown', 'text_en'), 'text_en') SORT TFIDF(doc) LIMIT 4 RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 4);
assertEqual(result[0].name, 'half');
@ -293,22 +293,22 @@ function iResearchAqlTestSuite () {
},
testPhraseFilter : function () {
var result0 = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER PHRASE(doc.text, 'quick brown fox jumps', 'text_en') RETURN doc", null, { waitForSync: true }).json;
var result0 = db._query("FOR doc IN VIEW UnitTestsView FILTER PHRASE(doc.text, 'quick brown fox jumps', 'text_en') RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result0.length, 1);
assertEqual(result0[0].name, 'full');
var result1 = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER PHRASE(doc.text, [ 'quick brown fox jumps' ], 'text_en') RETURN doc", null, { waitForSync: true }).json;
var result1 = db._query("FOR doc IN VIEW UnitTestsView FILTER PHRASE(doc.text, [ 'quick brown fox jumps' ], 'text_en') RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result1.length, 1);
assertEqual(result1[0].name, 'full');
var result2 = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER ANALYZER(PHRASE(doc.text, 'quick brown fox jumps'), 'text_en') RETURN doc", null, { waitForSync: true }).json;
var result2 = db._query("FOR doc IN VIEW UnitTestsView FILTER ANALYZER(PHRASE(doc.text, 'quick brown fox jumps'), 'text_en') RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result2.length, 1);
assertEqual(result2[0].name, 'full');
var result3 = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER ANALYZER(PHRASE(doc.text, [ 'quick brown fox jumps' ]), 'text_en') RETURN doc", null, { waitForSync: true }).json;
var result3 = db._query("FOR doc IN VIEW UnitTestsView FILTER ANALYZER(PHRASE(doc.text, [ 'quick brown fox jumps' ]), 'text_en') RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result3.length, 1);
assertEqual(result3[0].name, 'full');
@ -321,23 +321,23 @@ function iResearchAqlTestSuite () {
expected.add("other half");
expected.add("quarter");
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER EXISTS(doc.text) RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER EXISTS(doc.text) RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, expected.size);
assertEqual(result.length, expected.size);
result.forEach(function(res) {
assertTrue(expected.delete(res.name));
});
assertEqual(expected.size, 0);
},
testExistsFilterByAnalyzer: function () {
testExistsFilterByAnalyzer : function () {
var expected = new Set();
expected.add("full");
expected.add("half");
expected.add("other half");
expected.add("quarter");
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER EXISTS(doc.text, 'analyzer', 'text_en') RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER EXISTS(doc.text, 'analyzer', 'text_en') RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, expected.size);
result.forEach(function(res) {
@ -353,7 +353,7 @@ function iResearchAqlTestSuite () {
expected.add("other half");
expected.add("quarter");
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER ANALYZER(EXISTS(doc.text, 'analyzer'), 'text_en') RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER ANALYZER(EXISTS(doc.text, 'analyzer'), 'text_en') RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, expected.size);
result.forEach(function(res) {
@ -369,7 +369,7 @@ function iResearchAqlTestSuite () {
expected.add("other half");
expected.add("quarter");
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER EXISTS(doc.text, 'string') RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER EXISTS(doc.text, 'string') RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, expected.size);
result.forEach(function(res) {
@ -379,7 +379,7 @@ function iResearchAqlTestSuite () {
},
testExistsFilterByType : function () {
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER EXISTS(doc.text, 'type') RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER EXISTS(doc.text, 'type') RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, 0);
},
@ -388,7 +388,7 @@ function iResearchAqlTestSuite () {
var expected = new Set();
expected.add("null");
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER EXISTS(doc.anotherNullField, 'null') RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER EXISTS(doc.anotherNullField, 'null') RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, expected.size);
result.forEach(function(res) {
@ -401,7 +401,7 @@ function iResearchAqlTestSuite () {
var expected = new Set();
expected.add("bool");
var result = AQL_EXECUTE("FOR doc IN VIEW UnitTestsView FILTER EXISTS(doc['anotherBoolField'], 'bool') RETURN doc", null, { waitForSync: true }).json;
var result = db._query("FOR doc IN VIEW UnitTestsView FILTER EXISTS(doc['anotherBoolField'], 'bool') RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, expected.size);
result.forEach(function(res) {
@ -414,7 +414,7 @@ function iResearchAqlTestSuite () {
var expected = new Set();
expected.add("numeric");
var result = AQL_EXECUTE("LET suffix='NumericField' LET fieldName = CONCAT('another', suffix) FOR doc IN VIEW UnitTestsView FILTER EXISTS(doc[fieldName], 'numeric') RETURN doc", null, { waitForSync: true }).json;
var result = db._query("LET suffix='NumericField' LET fieldName = CONCAT('another', suffix) FOR doc IN VIEW UnitTestsView FILTER EXISTS(doc[fieldName], 'numeric') RETURN doc", null, { waitForSync: true }).toArray();
assertEqual(result.length, expected.size);
result.forEach(function(res) {
@ -430,12 +430,11 @@ function iResearchAqlTestSuite () {
expected.add(JSON.stringify({ a: "bar", b: "foo", c: 1 }));
expected.add(JSON.stringify({ a: "baz", b: "foo", c: 1 }));
var result = AQL_EXECUTE(
var result = db._query(
"FOR adoc IN AnotherUnitTestsCollection" +
" FOR doc IN VIEW UnitTestsView FILTER adoc.id == doc.c && STARTS_WITH(doc['a'], adoc.a) " +
"RETURN doc"
, null, { waitForSync: true }).json;
, null, { waitForSync: true }).toArray();
assertEqual(result.length, expected.size);
result.forEach(function(res) {
@ -449,12 +448,11 @@ function iResearchAqlTestSuite () {
expected.add(JSON.stringify({ a: "foo", b: "bar", c: 0 }));
expected.add(JSON.stringify({ a: "foo", b: "baz", c: 0 }));
var result = AQL_EXECUTE(
var result = db._query(
"FOR adoc IN AnotherUnitTestsCollection FILTER adoc.id < 1" +
" FOR doc IN VIEW UnitTestsView FILTER adoc.id == doc.c && STARTS_WITH(doc['a'], adoc.a) " +
"RETURN doc"
, null, { waitForSync: true }).json;
, null, { waitForSync: true }).toArray();
assertEqual(result.length, expected.size);
result.forEach(function(res) {
@ -470,12 +468,12 @@ function iResearchAqlTestSuite () {
expected.push({ a: "foo", b: "bar", c: 0 });
expected.push({ a: "foo", b: "baz", c: 0 });
var result = AQL_EXECUTE(
var result = db._query(
"FOR adoc IN AnotherUnitTestsCollection" +
" FOR doc IN VIEW UnitTestsView FILTER adoc.id == doc.c && STARTS_WITH(doc['a'], adoc.a) " +
"SORT doc.c DESC, doc.a, doc.b " +
"RETURN doc"
, null, { waitForSync: true }).json;
, null, { waitForSync: true }).toArray();
assertEqual(result.length, expected.length);
var i = 0;
@ -494,12 +492,12 @@ function iResearchAqlTestSuite () {
expected.push({ a: "foo", b: "bar", c: 0 });
expected.push({ a: "foo", b: "baz", c: 0 });
var result = AQL_EXECUTE(
var result = db._query(
"FOR adoc IN AnotherUnitTestsCollection" +
" FOR doc IN VIEW UnitTestsView FILTER adoc.id == doc.c && STARTS_WITH(doc['a'], adoc.a) " +
"SORT TFIDF(doc) DESC, BM25(doc) DESC, doc.a DESC, doc.b " +
"RETURN doc"
, null, { waitForSync: true }).json;
, null, { waitForSync: true }).toArray();
assertEqual(result.length, expected.length);
var i = 0;