Added tests for view creation with links.

arangodb · jsteemann · Sep 12, 2018 · Sep 12, 2018 · Aug 31, 2018 · Sep 12, 2018
commit cdefefde097b75247fa8762b98b15d4d448d8c89
diff --git a/tests/IResearch/IResearchView-test.cpp b/tests/IResearch/IResearchView-test.cpp
@@ -336,8 +336,19 @@ SECTION("test_defaults") {
     REQUIRE((false == !logicalView));
     std::set<TRI_voc_cid_t> cids;
     logicalView->visitCollections([&cids](TRI_voc_cid_t cid)->bool { cids.emplace(cid); return true; });
-    CHECK((0 == cids.size()));
-    CHECK((true == logicalCollection->getIndexes().empty()));
+    CHECK((1 == cids.size()));
+    CHECK((false == logicalCollection->getIndexes().empty()));
+
+    arangodb::velocypack::Builder builder;
+
+    builder.openObject();
+    logicalView->toVelocyPack(builder, true, false);
+    builder.close();
+
+    auto slice = builder.slice();
+    auto tmpSlice = slice.get("links");
+    CHECK((true == tmpSlice.isObject() && 1 == tmpSlice.length()));
+    CHECK((true == tmpSlice.hasKey("testCollection")));
   }
 
   // view definition with links

diff --git a/tests/js/common/shell/shell-view-arangosearch-link-noncluster.js b/tests/js/common/shell/shell-view-arangosearch-link-noncluster.js
@@ -76,7 +76,7 @@ function IResearchLinkSuite () {
       var meta = { links: { 'testCollection' : { includeAllFields: true } } };
       var view = db._createView("badView", "arangosearch", meta);
       var links = view.properties().links;
-      assertEqual(links['testCollection'], undefined);
+      assertNotEqual(links['testCollection'], undefined);
       view.drop();
     },
 
@@ -98,11 +98,7 @@ function IResearchLinkSuite () {
       assertEqual(links['testCollection'], undefined);
 
       view.drop();
-      try {
-        view = db._view('testView');
-      } catch (err) {
-        assertEqual(ERRORS.ERROR_VIEW_NOT_FOUND.code, err.errorNum);
-      }
+      assertNull(db._view('testView'));
     }
 
   };

diff --git a/tests/js/common/shell/shell-view-arangosearch-noncluster.js b/tests/js/common/shell/shell-view-arangosearch-noncluster.js
@@ -180,16 +180,8 @@ function ViewSuite () {
       assertEqual(propD.consolidationIntervalMsec, 3);
       abc.drop();
       def.drop();
-      try {
-        abc = db._view("abc");
-      } catch (err) {
-        assertEqual(ERRORS.ERROR_ARANGO_DATA_SOURCE_NOT_FOUND.code, err.errorNum);
-      }
-      try {
-        def = db._view("def");
-      } catch (err) {
-        assertEqual(ERRORS.ERROR_ARANGO_DATA_SOURCE_NOT_FOUND.code, err.errorNum);
-      }
+      assertNull(db._view("abc"));
+      assertNull(db._view("def"));
     },
 
     ////////////////////////////////////////////////////////////////////////////