mirror of https://gitee.com/bigwinds/arangodb
Fixed example graph and aql traversal test.
This commit is contained in:
parent
10529ba474
commit
a656182145
|
@ -140,7 +140,6 @@ var createMoviesGraph = function (prefixed) {
|
||||||
var Carrie = g[Person].save({_key: "Carrie", name:'Carrie-Anne Moss', born:1967})._id;
|
var Carrie = g[Person].save({_key: "Carrie", name:'Carrie-Anne Moss', born:1967})._id;
|
||||||
var Laurence = g[Person].save({_key: "Laurence", name:'Laurence Fishburne', born:1961})._id;
|
var Laurence = g[Person].save({_key: "Laurence", name:'Laurence Fishburne', born:1961})._id;
|
||||||
var Hugo = g[Person].save({_key: "Hugo", name:'Hugo Weaving', born:1960})._id;
|
var Hugo = g[Person].save({_key: "Hugo", name:'Hugo Weaving', born:1960})._id;
|
||||||
var Emil = g[Person].save({_key: "Emil", name:"Emil Eifrem", born: 1978})._id;
|
|
||||||
var AndyW = g[Person].save({_key: "AndyW", name:'Andy Wachowski', born:1967})._id;
|
var AndyW = g[Person].save({_key: "AndyW", name:'Andy Wachowski', born:1967})._id;
|
||||||
var LanaW = g[Person].save({_key: "LanaW", name:'Lana Wachowski', born:1965})._id;
|
var LanaW = g[Person].save({_key: "LanaW", name:'Lana Wachowski', born:1965})._id;
|
||||||
var JoelS = g[Person].save({_key: "JoelS", name:'Joel Silver', born:1952})._id;
|
var JoelS = g[Person].save({_key: "JoelS", name:'Joel Silver', born:1952})._id;
|
||||||
|
@ -149,7 +148,6 @@ var createMoviesGraph = function (prefixed) {
|
||||||
g[ACTED_IN].save(Carrie, TheMatrix, {roles: ["Trinity"]});
|
g[ACTED_IN].save(Carrie, TheMatrix, {roles: ["Trinity"]});
|
||||||
g[ACTED_IN].save(Laurence, TheMatrix, {roles: ["Morpheus"]});
|
g[ACTED_IN].save(Laurence, TheMatrix, {roles: ["Morpheus"]});
|
||||||
g[ACTED_IN].save(Hugo, TheMatrix, {roles: ["Agent Smith"]});
|
g[ACTED_IN].save(Hugo, TheMatrix, {roles: ["Agent Smith"]});
|
||||||
g[ACTED_IN].save(Emil, TheMatrix, {roles: ["Emil"]});
|
|
||||||
g[DIRECTED].save(AndyW, TheMatrix, {});
|
g[DIRECTED].save(AndyW, TheMatrix, {});
|
||||||
g[DIRECTED].save(LanaW, TheMatrix, {});
|
g[DIRECTED].save(LanaW, TheMatrix, {});
|
||||||
g[PRODUCED].save(JoelS, TheMatrix, {});
|
g[PRODUCED].save(JoelS, TheMatrix, {});
|
||||||
|
@ -705,37 +703,34 @@ var createMoviesGraph = function (prefixed) {
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
var dropGraph = function(name, prefixed) {
|
|
||||||
if (prefixed) {
|
|
||||||
name = "UnitTest" + name;
|
|
||||||
}
|
|
||||||
|
|
||||||
var knownGraphs = {
|
var knownGraphs = {
|
||||||
"knows_graph" : createTraversalExample,
|
"knows_graph" : createTraversalExample,
|
||||||
"routeplanner" : createRoutePlannerGraph,
|
"routeplanner" : createRoutePlannerGraph,
|
||||||
"social" : createSocialGraph,
|
"social" : createSocialGraph,
|
||||||
"movie" : createMoviesGraph
|
"movies" : createMoviesGraph
|
||||||
};
|
};
|
||||||
|
|
||||||
var dropGraph = function(name) {
|
var dropGraph = function (name, prefixed) {
|
||||||
if (! knownGraphs.hasOwnProperty(name)) {
|
if (! knownGraphs.hasOwnProperty(name)) {
|
||||||
// trying to drop an unknown graph - better not do it
|
// trying to drop an unknown graph - better not do it
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
if (prefixed) {
|
||||||
|
name = "UnitTest" + name;
|
||||||
|
}
|
||||||
if (Graph._exists(name)) {
|
if (Graph._exists(name)) {
|
||||||
return Graph._drop(name, true);
|
return Graph._drop(name, true);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
var loadGraph = function(name) {
|
var loadGraph = function (name, prefixed) {
|
||||||
if (! knownGraphs.hasOwnProperty(name)) {
|
if (! knownGraphs.hasOwnProperty(name)) {
|
||||||
// trying to drop an unknown graph - better not do it
|
// trying to drop an unknown graph - better not do it
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
dropGraph(name);
|
dropGraph(name);
|
||||||
return knownGraphs[name]();
|
return knownGraphs[name](prefixed);
|
||||||
};
|
};
|
||||||
|
|
||||||
exports.loadGraph = loadGraph;
|
exports.loadGraph = loadGraph;
|
||||||
|
|
|
@ -53,6 +53,7 @@
|
||||||
beforeEach(function() {
|
beforeEach(function() {
|
||||||
cleanup();
|
cleanup();
|
||||||
graph = example.loadGraph("movies", true);
|
graph = example.loadGraph("movies", true);
|
||||||
|
expect(graph).not.toEqual(false);
|
||||||
});
|
});
|
||||||
|
|
||||||
afterEach(function() {
|
afterEach(function() {
|
||||||
|
@ -327,7 +328,7 @@
|
||||||
"@Acted_In": Acted_In,
|
"@Acted_In": Acted_In,
|
||||||
"@Person": Person
|
"@Person": Person
|
||||||
}).toArray();
|
}).toArray();
|
||||||
expect(result.length).toEqual(50);
|
expect(result.length).toEqual(49);
|
||||||
result.sort(function (a, b) {
|
result.sort(function (a, b) {
|
||||||
if (a.Strength > b.Strength) {
|
if (a.Strength > b.Strength) {
|
||||||
return -1;
|
return -1;
|
||||||
|
|
Loading…
Reference in New Issue