From b1cdeca44c53c9c7dca374c20a1f9e20074892b6 Mon Sep 17 00:00:00 2001
From: Michael Hackstein <michael@arangodb.com>
Date: Thu, 22 May 2014 10:39:12 +0200
Subject: [PATCH] Further refactoring, another suite now based on variables and
 prefixed with UnitTests

---
 js/common/tests/shell-general-graph.js | 31 +++++++++++---------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/js/common/tests/shell-general-graph.js b/js/common/tests/shell-general-graph.js
index 3d97a15dd0..53c9225e3d 100644
--- a/js/common/tests/shell-general-graph.js
+++ b/js/common/tests/shell-general-graph.js
@@ -326,56 +326,51 @@ function GeneralGraphCreationSuite() {
     },
 
     test_get_graph_without_hit : function () {
-      var msg;
       try {
-        var a = graph._graph("bla4");
+        graph._graph(gn + "UnknownExtension");
+        fail();
       } catch (e) {
-        msg = e;
+        assertEqual(e, "graph " + gn + "UnknownExtension" + " does not exists.");
       }
-      assertEqual(msg, "graph bla4 does not exists.");
     },
 
     test_creationOfGraphShouldNotAffectCollections: function() {
-      var en = "UnitTestsEdges";
-      var vn1 = "UnitTestsVertices";
-      var vn2 = "UnitTestsVertices2";
-      var gn = "UnitTestsGraph";
       if(graph._exists(gn)) {
         graph._drop(gn);
       }
-      var edgeDef = [graph._directedRelationDefinition(en, vn1, vn2)];
-      var g = graph._create(gn, edgeDef);
+      var edgeDef2 = [graph._directedRelationDefinition(rn, vn1, vn2)];
+      var g = graph._create(gn, edgeDef2);
       var v1 = g[vn1].save({_key: "1"})._id;
       var v2 = g[vn2].save({_key: "2"})._id;
       var v3 = g[vn1].save({_key: "3"})._id;
 
-      g[en].save(v1, v2, {});
+      g[rn].save(v1, v2, {});
       assertEqual(g[vn1].count(), 2);
       assertEqual(g[vn2].count(), 1);
-      assertEqual(g[en].count(), 1);
+      assertEqual(g[rn].count(), 1);
       try {
-        g[en].save(v2, v3, {});
+        g[rn].save(v2, v3, {});
         fail();
       } catch (e) {
         // This should create an error
-        assertEqual(g[en].count(), 1);
+        assertEqual(g[rn].count(), 1);
       }
 
       try {
-        db[en].save(v2, v3, {});
+        db[rn].save(v2, v3, {});
       } catch (e) {
         // This should not create an error
         fail();
       }
-      assertEqual(g[en].count(), 2);
+      assertEqual(g[rn].count(), 2);
 
       db[vn2].remove(v2);
       // This should not remove edges
-      assertEqual(g[en].count(), 2);
+      assertEqual(g[rn].count(), 2);
 
       g[vn1].remove(v1);
       // This should remove edges
-      assertEqual(g[en].count(), 1);
+      assertEqual(g[rn].count(), 1);
       graph._drop(gn, true);
     }