Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed tests

This commit is contained in:
Jan Steemann 2016-01-26 16:44:07 +01:00
parent ee6d77c425
commit b6e9cee7e2
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
js/server/tests/aql/aql-graph-traverser.js
View File

@ -425,7 +425,7 @@ function multiCollectionGraphSuite () {
/* this test is intended to trigger the clone functionality. */
var query = "FOR t IN " + vn +
" FOR s IN " + vn2 +
" FOR x, e, p IN OUTBOUND t " + en + " RETURN {vertex: x, path: p}";
" FOR x, e, p IN OUTBOUND t " + en + " SORT x._key RETURN {vertex: x, path: p}";
var result = db._query(query).toArray();
var plans = AQL_EXPLAIN(query, { }, opts).plans;
plans.forEach(function(plan) {
@ -435,7 +435,7 @@ function multiCollectionGraphSuite () {
},
testNoBindParameterSingleFor: function () {
var query = "FOR s IN " + vn + " SORT s FOR x, e, p IN OUTBOUND s " + en + " SORT x RETURN x";
var query = "FOR s IN " + vn + " FOR x, e, p IN OUTBOUND s " + en + " SORT x._key RETURN x";
var result = db._query(query).toArray();
var plans = AQL_EXPLAIN(query, { }, opts).plans;
plans.forEach(function(plan) {
@ -445,8 +445,8 @@ function multiCollectionGraphSuite () {
},
testNoBindParameterSingleForFilter: function () {
var query = "FOR s IN " + vn + " SORT s FOR x, e, p IN OUTBOUND s " +
en + " FILTER p.vertices[1]._key == s._key SORT x RETURN x";
var query = "FOR s IN " + vn + " FOR x, e, p IN OUTBOUND s " +
en + " FILTER p.vertices[1]._key == s._key SORT x._key RETURN x";
var result = db._query(query).toArray();
assertEqual(result.length, 0);
var plans = AQL_EXPLAIN(query, { }, opts).plans;
@ -457,8 +457,8 @@ function multiCollectionGraphSuite () {
},
testNoBindParameterV8Function: function () {
var query = "FOR s IN " + vn + " SORT s FOR x, e, p IN OUTBOUND s " +
en + " FILTER p.vertices[1]._key == NOOPT(V8(RAND())) SORT x RETURN x";
var query = "FOR s IN " + vn + " FOR x, e, p IN OUTBOUND s " +
en + " FILTER p.vertices[1]._key == NOOPT(V8(RAND())) SORT x._key RETURN x";
var result = db._query(query).toArray();
assertEqual(result.length, 0);
var plans = AQL_EXPLAIN(query, { }, opts).plans;
@ -470,7 +470,7 @@ function multiCollectionGraphSuite () {
testNoBindParameter: function () {
var query = "FOR x, e, p IN OUTBOUND '" + vertex.B + "' " + en + " RETURN {vertex: x, path: p}";
var query = "FOR x, e, p IN OUTBOUND '" + vertex.B + "' " + en + " SORT x._key RETURN {vertex: x, path: p}";
var result = db._query(query).toArray();
validateResult(result);
var plans = AQL_EXPLAIN(query, { }, opts).plans;
@ -481,7 +481,7 @@ function multiCollectionGraphSuite () {
},
testStartBindParameter: function () {
var query = "FOR x, e, p IN OUTBOUND @startId " + en + " RETURN {vertex: x, path: p}";
var query = "FOR x, e, p IN OUTBOUND @startId " + en + " SORT x._key RETURN {vertex: x, path: p}";
var bindVars = {
startId: vertex.B
};
@ -495,7 +495,7 @@ function multiCollectionGraphSuite () {
},
testEdgeCollectionBindParameter: function () {
var query = "FOR x, e, p IN OUTBOUND '" + vertex.B + "' @@eCol RETURN {vertex: x, path: p}";
var query = "FOR x, e, p IN OUTBOUND '" + vertex.B + "' @@eCol SORT x._key RETURN {vertex: x, path: p}";
var bindVars = {
"@eCol": en
};
@ -509,7 +509,8 @@ function multiCollectionGraphSuite () {
},
testStepsBindParameter: function () {
var query = "FOR x, e, p IN @steps OUTBOUND '" + vertex.B + "' " + en + " RETURN {vertex: x, path: p}";
var query = "FOR x, e, p IN @steps OUTBOUND '" + vertex.B + "' " + en +
" SORT x._key RETURN {vertex: x, path: p}";
var bindVars = {
steps: 1
};
@ -524,7 +525,7 @@ function multiCollectionGraphSuite () {
testStepsRangeBindParameter: function () {
var query = "FOR x, e, p IN @lsteps..@rsteps OUTBOUND '" + vertex.B
+ "' " + en + " RETURN {vertex: x, path: p}";
+ "' " + en + " SORT x._key RETURN {vertex: x, path: p}";
var bindVars = {
lsteps: 1,
rsteps: 1
@ -539,7 +540,7 @@ function multiCollectionGraphSuite () {
},
testFirstEntryIsVertex: function () {
var query = "FOR x IN OUTBOUND @startId @@eCol RETURN x";
var query = "FOR x IN OUTBOUND @startId @@eCol SORT x._key RETURN x";
var bindVars = {
"@eCol": en,
startId: vertex.B
@ -555,7 +556,7 @@ function multiCollectionGraphSuite () {
},
testSecondEntryIsEdge: function () {
var query = "FOR x, e IN OUTBOUND @startId @@eCol RETURN e";
var query = "FOR x, e IN OUTBOUND @startId @@eCol SORT x._key RETURN e";
var bindVars = {
"@eCol": en,
startId: vertex.B
@ -571,7 +572,7 @@ function multiCollectionGraphSuite () {
},
testThirdEntryIsPath: function () {
var query = "FOR x, e, p IN OUTBOUND @startId @@eCol RETURN p";
var query = "FOR x, e, p IN OUTBOUND @startId @@eCol SORT x._key RETURN p";
var bindVars = {
"@eCol": en,
startId: vertex.B
@ -592,7 +593,7 @@ function multiCollectionGraphSuite () {
},
testOutboundDirection: function () {
var query = "FOR x IN OUTBOUND @startId @@eCol RETURN x._id";
var query = "FOR x IN OUTBOUND @startId @@eCol SORT x._key RETURN x._id";
var bindVars = {
"@eCol": en,
startId: vertex.B
@ -609,7 +610,7 @@ function multiCollectionGraphSuite () {
},
testInboundDirection: function () {
var query = "FOR x IN INBOUND @startId @@eCol RETURN x._id";
var query = "FOR x IN INBOUND @startId @@eCol SORT x._key RETURN x._id";
var bindVars = {
"@eCol": en,
startId: vertex.C
@ -647,7 +648,7 @@ function multiCollectionGraphSuite () {
},
testExactNumberSteps: function () {
var query = "FOR x IN 2 OUTBOUND @startId @@eCol SORT x._id ASC RETURN x._id";
var query = "FOR x IN 2 OUTBOUND @startId @@eCol SORT x._id ASC RETURN x._id";
var bindVars = {
"@eCol": en,
startId: vertex.B
@ -728,7 +729,7 @@ function multiCollectionGraphSuite () {
testSingleDocumentInput: function () {
var query = "FOR y IN @@vCol FILTER y._id == @startId "
+ "FOR x IN OUTBOUND y @@eCol RETURN x";
+ "FOR x IN OUTBOUND y @@eCol SORT x._key RETURN x";
var bindVars = {
startId: vertex.B,
"@eCol": en,