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

Further refactoring fpr general graph

This commit is contained in:
Michael Hackstein 2014-05-22 10:36:27 +02:00
parent 1dfdcca97c
commit 2aaca2fa0b
1 changed files with 64 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

172
js/common/tests/shell-general-graph.js
View File

@ -52,6 +52,13 @@ function GeneralGraphCreationSuite() {
var vn2 = "UnitTestVerticies2"; var vn2 = "UnitTestVerticies2";
var vn3 = "UnitTestVerticies3"; var vn3 = "UnitTestVerticies3";
var vn4 = "UnitTestVerticies4"; var vn4 = "UnitTestVerticies4";
var gn = "UnitTestGraph";
var edgeDef = graph._edgeDefinitions(
graph._undirectedRelationDefinition(rn, vn1),
graph._directedRelationDefinition(rn1,
[vn1, vn2], [vn3, vn4]
)
);
return { return {
@ -150,7 +157,7 @@ function GeneralGraphCreationSuite() {
try { try {
var param = {}; var param = {};
param[vn1] = vn2; param[vn1] = vn2;
graph._directedRelationDefinition(rn, param, ""); graph._directedRelationDefinition(rn, param, vn3);
fail(); fail();
} }
catch (err) { catch (err) {
@ -164,7 +171,7 @@ function GeneralGraphCreationSuite() {
try { try {
var param = {}; var param = {};
param[vn1] = vn2; param[vn1] = vn2;
graph._directedRelationDefinition(rn, "", param); graph._directedRelationDefinition(rn, vn3, param);
fail(); fail();
} }
catch (err) { catch (err) {
@ -180,7 +187,7 @@ function GeneralGraphCreationSuite() {
//with args //with args
assertEqual(graph._edgeDefinitions( assertEqual(graph._edgeDefinitions(
graph._undirectedRelationDefinition(rn, vn1), graph._undirectedRelationDefinition(rn, vn1),
graph._directedRelationDefinition(rn, graph._directedRelationDefinition(rn1,
[vn1, vn2], [vn3, vn4]) [vn1, vn2], [vn3, vn4])
), [ ), [
{ {
@ -196,46 +203,42 @@ function GeneralGraphCreationSuite() {
]); ]);
}, },
test_create : function () { test_create : function () {
try { if (db._collection("_graphs").exists(gn)) {
arangodb.db._collection("_graphs").remove("_graphs/bla3") db._collection("_graphs").remove(gn);
} catch (err) {
} }
var a = graph._create( var a = graph._create(
"bla3", gn,
graph._edgeDefinitions( graph._edgeDefinitions(
graph._undirectedRelationDefinition("relationName", "vertexC1"), graph._undirectedRelationDefinition(rn, vn1),
graph._directedRelationDefinition("relationName2", graph._directedRelationDefinition(rn1, [vn1, vn2], [vn3, vn4])
["vertexC1", "vertexC2"], ["vertexC3", "vertexC4"]
)
) )
); );
assertTrue(a.__vertexCollections.hasOwnProperty('vertexC1')); assertTrue(a.__vertexCollections.hasOwnProperty(vn1));
assertTrue(a.__vertexCollections.hasOwnProperty('vertexC2')); assertTrue(a.__vertexCollections.hasOwnProperty(vn2));
assertTrue(a.__vertexCollections.hasOwnProperty('vertexC3')); assertTrue(a.__vertexCollections.hasOwnProperty(vn3));
assertTrue(a.__vertexCollections.hasOwnProperty('vertexC4')); assertTrue(a.__vertexCollections.hasOwnProperty(vn4));
assertTrue(a.__edgeCollections.hasOwnProperty('relationName')); assertTrue(a.__edgeCollections.hasOwnProperty(rn));
assertTrue(a.__edgeCollections.hasOwnProperty('relationName2')); assertTrue(a.__edgeCollections.hasOwnProperty(rn1));
assertEqual(a.__edgeDefinitions, [ assertEqual(a.__edgeDefinitions, [
{ {
"collection" : "relationName", "collection" : rn,
"from" : [ "from" : [
"vertexC1" vn1
], ],
"to" : [ "to" : [
"vertexC1" vn1
] ]
}, },
{ {
"collection" : "relationName2", "collection" : rn1,
"from" : [ "from" : [
"vertexC1", vn1,
"vertexC2" vn2
], ],
"to" : [ "to" : [
"vertexC3", vn3,
"vertexC4" vn4
] ]
} }
] ]
@ -243,126 +246,79 @@ function GeneralGraphCreationSuite() {
}, },
test_create_WithOut_EdgeDefiniton : function () { test_create_WithOut_EdgeDefiniton : function () {
var msg; if (db._collection("_graphs").exists(gn)) {
try { db._collection("_graphs").remove(gn);
arangodb.db._collection("_graphs").remove("_graphs/bla3")
} catch (err) {
} }
try { try {
var a = graph._create( graph._create(
"bla3", gn,
[] []
); );
fail();
} catch (err) { } catch (err) {
msg = err; assertEqual(err, "at least one edge definition is required to create a graph.");
} }
assertEqual(msg, "at least one edge definition is required to create a graph.");
}, },
test_create_WithOut_Name : function () { test_create_WithOut_Name : function () {
var msg; if (db._collection("_graphs").exists(gn)) {
try { db._collection("_graphs").remove(gn);
arangodb.db._collection("_graphs").remove("_graphs/bla3")
} catch (err) {
} }
try { try {
var a = graph._create( graph._create(
"", "",
graph._edgeDefinitions( edgeDef
graph._undirectedRelationDefinition("relationName", "vertexC1"),
graph._directedRelationDefinition("relationName2",
["vertexC1", "vertexC2"], ["vertexC3", "vertexC4"]
)
)
); );
fail();
} catch (err) { } catch (err) {
msg = err; assertEqual(err, "a graph name is required to create a graph.");
} }
assertEqual(msg, "a graph name is required to create a graph.");
}, },
test_create_With_Already_Existing_Graph : function () { test_create_With_Already_Existing_Graph : function () {
try { if (db._collection("_graphs").exists(gn)) {
arangodb.db._collection("_graphs").remove("_graphs/bla3") db._collection("_graphs").remove(gn);
} catch (err) {
} }
graph._create( graph._create(gn, edgeDef);
"bla3",
graph._edgeDefinitions(
graph._undirectedRelationDefinition("relationName", "vertexC1"),
graph._directedRelationDefinition("relationName2",
["vertexC1", "vertexC2"], ["vertexC3", "vertexC4"]
)
)
);
var msg;
try { try {
var a = graph._create( graph._create(gn, edgeDef);
"bla3",
graph._edgeDefinitions(
graph._undirectedRelationDefinition("relationName", "vertexC1"),
graph._directedRelationDefinition("relationName2",
["vertexC1", "vertexC2"], ["vertexC3", "vertexC4"]
)
)
);
} catch (err) { } catch (err) {
msg = err; assertEqual(err, "graph " + gn + " already exists.");
} }
assertEqual(msg, "graph bla3 already exists.");
}, },
test_get_graph : function () { test_get_graph : function () {
if (db._collection("_graphs").exists(gn)) {
try { db._collection("_graphs").remove(gn);
arangodb.db._collection("_graphs").remove("_graphs/bla3")
} catch (err) {
} }
graph._create( graph._create(gn, edgeDef);
"bla3", var a = graph._graph(gn);
graph._edgeDefinitions(
graph._undirectedRelationDefinition("relationName", "vertexC1"),
graph._directedRelationDefinition("relationName2",
["vertexC1", "vertexC2"], ["vertexC3", "vertexC4"]
)
)
);
var a = graph._graph("bla3"); assertTrue(a.__vertexCollections.hasOwnProperty(vn1));
assertTrue(a.__vertexCollections.hasOwnProperty(vn2));
assertTrue(a.__vertexCollections.hasOwnProperty('vertexC1')); assertTrue(a.__vertexCollections.hasOwnProperty(vn3));
assertTrue(a.__vertexCollections.hasOwnProperty('vertexC2')); assertTrue(a.__vertexCollections.hasOwnProperty(vn4));
assertTrue(a.__vertexCollections.hasOwnProperty('vertexC3')); assertTrue(a.__edgeCollections.hasOwnProperty(rn));
assertTrue(a.__vertexCollections.hasOwnProperty('vertexC4')); assertTrue(a.__edgeCollections.hasOwnProperty(rn1));
assertTrue(a.__edgeCollections.hasOwnProperty('relationName'));
assertTrue(a.__edgeCollections.hasOwnProperty('relationName2'));
assertEqual(a.__edgeDefinitions, [ assertEqual(a.__edgeDefinitions, [
{ {
"collection" : "relationName", "collection" : rn,
"from" : [ "from" : [
"vertexC1" vn1
], ],
"to" : [ "to" : [
"vertexC1" vn1
] ]
}, },
{ {
"collection" : "relationName2", "collection" : rn1,
"from" : [ "from" : [
"vertexC1", vn1,
"vertexC2" vn2
], ],
"to" : [ "to" : [
"vertexC3", vn3,
"vertexC4" vn4
] ]
} }
] ]