Improve tests.

arangodb · jsteemann · Apr 1, 2020 · Mar 19, 2020 · Mar 20, 2020 · Mar 24, 2020
commit 2b6d11acf7791740e836b76559842b326a14a498
diff --git a/arangod/Aql/Functions.cpp b/arangod/Aql/Functions.cpp
@@ -7515,7 +7515,7 @@ AqlValue Functions::NotImplemented(ExpressionContext* expressionContext,
 AqlValue Functions::GetSchema(ExpressionContext* expressionContext,
                               transaction::Methods* trx,
                               VPackFunctionParameters const& parameters) {
-  // GET_VALIDATON("collectionName")
+  // GET_VALIDATON(collectionName)
   static char const* AFN = "GET_SCHEMA";
 
   if (parameters.size() != 1) {

diff --git a/tests/js/common/shell/shell-validation-rocksdb.js b/tests/js/common/shell/shell-validation-rocksdb.js
@@ -303,6 +303,12 @@ function ValidationBasicsSuite () {
       }
 
     },
+
+    testRemoveValidation: () => {
+      testCollection.properties({"validation" : { } });
+      sleepInCluster();
+    },
+
     // json  ////////////////////////////////////////////////////////////////////////////////////////////
     testJson: () => {
       const v =  validatorJson;
@@ -361,7 +367,7 @@ function ValidationBasicsSuite () {
 
     },
     // AQL  ////////////////////////////////////////////////////////////////////////////////////////////
-    testGET_SCHEMA: () => {
+    test_GET_SCHEMA: () => {
       const v =  validatorJson;
       v.level = "strict";
       testCollection.properties({"validation" : v });
@@ -372,27 +378,29 @@ function ValidationBasicsSuite () {
       // get regular schema
       res = db._query(`RETURN GET_SCHEMA("${testCollectionName}")`).toArray();
       assertEqual(res[0], v.rule);
+    },
 
+    test_GET_SCHEMA_no_collection: () => {
       // schema on non existing collection
       try {
         db._query(`RETURN GET_SCHEMA("nonExistingTestCollection")`).toArray();
         fail();
       } catch (err) {
         assertEqual(ERRORS.ERROR_ARANGO_DATA_SOURCE_NOT_FOUND.code, err.errorNum);
       }
+    },
 
+    test_GET_SCHEMA_null: () => {
       // no validation available must return `null`
-      testCollection.drop();
-      db._create(testCollectionName);
-      res = db._query(`RETURN GET_SCHEMA("${testCollectionName}")`).toArray();
+      testCollection.properties({validation : {}});
+      let res = db._query(`RETURN GET_SCHEMA("${testCollectionName}")`).toArray();
       assertEqual(res[0], null);
     },
 
-    testSCHEMA_VALIDATE: () => {
+    test_SCHEMA_VALIDATE: () => {
       const v =  validatorJson;
       // unset validation
-      // FIXME - just pass empty object (PR 11346)
-      testCollection.properties({"validation" : { rule:{} } });
+      testCollection.properties({validation : {}});
       sleepInCluster();
 
       let res;