rename `tests/js/*/tests/*` to `tests/js/*/*` (#6280)

js/client/modules/@arangodb/testsuites/agency.js

@@ -35,7 +35,7 @@ const optionsDocumentation = [
 const tu = require('@arangodb/test-utils');
 
 const testPaths = {
-  'agency': [tu.pathForTesting('client/tests/agency')]
+  'agency': [tu.pathForTesting('client/agency')]
 };
 
 // //////////////////////////////////////////////////////////////////////////////

js/client/modules/@arangodb/testsuites/aql.js

@@ -41,11 +41,11 @@ const _ = require('lodash');
 const tu = require('@arangodb/test-utils');
 
 const testPaths = {
-  'shell_client': [ tu.pathForTesting('common/tests/shell'), tu.pathForTesting('client/tests/http'), tu.pathForTesting('client/tests/shell') ],
-  'shell_server': [ tu.pathForTesting('common/tests/shell'), tu.pathForTesting('server/tests/shell') ],
-  'shell_server_only': [ tu.pathForTesting('server/tests/shell') ],
-  'shell_server_aql': [ tu.pathForTesting('server/tests/aql'), tu.pathForTesting('common/tests/aql') ],
-  'shell_client_aql': [ tu.pathForTesting('client/tests/aql'), tu.pathForTesting('common/tests/aql') ]
+  'shell_client': [ tu.pathForTesting('common/shell'), tu.pathForTesting('client/http'), tu.pathForTesting('client/shell') ],
+  'shell_server': [ tu.pathForTesting('common/shell'), tu.pathForTesting('server/shell') ],
+  'shell_server_only': [ tu.pathForTesting('server/shell') ],
+  'shell_server_aql': [ tu.pathForTesting('server/aql'), tu.pathForTesting('common/aql') ],
+  'shell_client_aql': [ tu.pathForTesting('client/aql'), tu.pathForTesting('common/aql') ]
 };
 
 // //////////////////////////////////////////////////////////////////////////////

js/client/modules/@arangodb/testsuites/audit.js

@@ -45,7 +45,7 @@ const RESET = require('internal').COLORS.COLOR_RESET;
 // const YELLOW = require('internal').COLORS.COLOR_YELLOW;
 
 const testPaths = {
-  audit: [tu.pathForTesting('server/tests/audit')]
+  audit: [tu.pathForTesting('server/audit')]
 };
 
 const sharedConf = {

js/client/modules/@arangodb/testsuites/authentication.js

@@ -49,8 +49,8 @@ const RESET = require('internal').COLORS.COLOR_RESET;
 const download = require('internal').download;
 
 const testPaths = {
-  'authentication': [tu.pathForTesting('client/tests/authentication')],
-  'authentication_server': [tu.pathForTesting('server/tests/authentication')],
+  'authentication': [tu.pathForTesting('client/authentication')],
+  'authentication_server': [tu.pathForTesting('server/authentication')],
   'authentication_parameters': []
 };
 

js/client/modules/@arangodb/testsuites/backup.js

@@ -44,7 +44,7 @@ const log = (text) => {
   print(`${CYAN}${Date()}: Backup - ${text}${RESET}`);
 };
 const makePath = (name) => {
-  return tu.makePathUnix(tu.pathForTesting(`server/tests/backup/${name}`));
+  return tu.makePathUnix(tu.pathForTesting(`server/backup/${name}`));
 };
 
 const isAlive = (info, options) => {
@@ -60,10 +60,10 @@ const syssys = 'systemsystem';
 const sysNoSys = 'systemnosystem';
 
 const testPaths = {
-  'BackupNoAuthSysTests': [tu.pathForTesting('server/tests/backup/backup-system-incl-system.js')],
-  'BackupNoAuthNoSysTests': [tu.pathForTesting('server/tests/backup/backup-system-excl-system.js')],
-  'BackupAuthSysTests': [tu.pathForTesting('server/tests/backup/backup-system-incl-system.js')],
-  'BackupAuthNoSysTests': [tu.pathForTesting('server/tests/backup/backup-system-excl-system.js')]
+  'BackupNoAuthSysTests': [tu.pathForTesting('server/backup/backup-system-incl-system.js')],
+  'BackupNoAuthNoSysTests': [tu.pathForTesting('server/backup/backup-system-excl-system.js')],
+  'BackupAuthSysTests': [tu.pathForTesting('server/backup/backup-system-incl-system.js')],
+  'BackupAuthNoSysTests': [tu.pathForTesting('server/backup/backup-system-excl-system.js')]
 };
 
 const failPreStartMessage = (msg) => {

js/client/modules/@arangodb/testsuites/dump.js

@@ -47,9 +47,9 @@ const RESET = require('internal').COLORS.COLOR_RESET;
 // const YELLOW = require('internal').COLORS.COLOR_YELLOW;
 
 const testPaths = {
-  'dump': [tu.pathForTesting('server/tests/dump')],
-  'dump_encrypted': [tu.pathForTesting('server/tests/dump')],
-  'dump_authentication': [tu.pathForTesting('server/tests/dump')]
+  'dump': [tu.pathForTesting('server/dump')],
+  'dump_encrypted': [tu.pathForTesting('server/dump')],
+  'dump_authentication': [tu.pathForTesting('server/dump')]
 };
 
 
@@ -164,7 +164,7 @@ function dump_backend (options, serverAuthInfo, clientAuth, dumpOptions, which,
               results.failed = 0;
 	    } else {
               print(CYAN + Date() + ': Dump and Restore - restoreOld' + RESET);
-              let restoreDir = tu.makePathUnix(tu.pathForTesting('server/tests/dump/dump' + notCluster));
+              let restoreDir = tu.makePathUnix(tu.pathForTesting('server/dump/dump' + notCluster));
 
               results.restoreOld = pu.run.arangoDumpRestore(
                 options,

js/client/modules/@arangodb/testsuites/endpoints.js

@@ -48,7 +48,7 @@ const RESET = require('internal').COLORS.COLOR_RESET;
 // const YELLOW = require('internal').COLORS.COLOR_YELLOW;
 
 const testPaths = {
-  'endpoints': [tu.pathForTesting('client/tests/endpoint-spec.js')]
+  'endpoints': [tu.pathForTesting('client/endpoint-spec.js')]
 };
 
 function endpoints (options) {

js/client/modules/@arangodb/testsuites/export.js

@@ -46,7 +46,7 @@ const RESET = require('internal').COLORS.COLOR_RESET;
 const toArgv = require('internal').toArgv;
 
 const testPaths = {
-  'export': [tu.pathForTesting('server/tests/export')] // we have to be fuzzy...
+  'export': [tu.pathForTesting('server/export')] // we have to be fuzzy...
 };
 
 // //////////////////////////////////////////////////////////////////////////////
@@ -109,7 +109,7 @@ function exportTest (options) {
     return results;
   }
 
-  results.setup = tu.runInArangosh(options, instanceInfo, tu.makePathUnix(tu.pathForTesting('server/tests/export/export-setup' + cluster + '.js')));
+  results.setup = tu.runInArangosh(options, instanceInfo, tu.makePathUnix(tu.pathForTesting('server/export/export-setup' + cluster + '.js')));
   results.setup.failed = 0;
   if (!pu.arangod.check.instanceAlive(instanceInfo, options) || results.setup.status !== true) {
     results.setup.failed = 1;

js/client/modules/@arangodb/testsuites/importing.js

@@ -39,7 +39,7 @@ const yaml = require('js-yaml');
 
 const testPaths = {
   'importing': [
-    tu.pathForTesting('server/tests/import'),
+    tu.pathForTesting('server/import'),
     tu.pathForTesting('common/test-data/import') // our testdata...
   ]
 };

js/client/modules/@arangodb/testsuites/ldap.js

@@ -46,11 +46,11 @@ const RESET = require('internal').COLORS.COLOR_RESET;
 // const YELLOW = require('internal').COLORS.COLOR_YELLOW;
 
 const testPaths = {
-  'ldap': [tu.pathForTesting('client/tests/authentication')],
-  'ldaprole': [tu.pathForTesting('client/tests/authentication')],
-  'ldapsearch': [tu.pathForTesting('client/tests/authentication')],
-  'ldaprolesimple': [tu.pathForTesting('client/tests/authentication')],
-  'ldapsearchsimple': [tu.pathForTesting('client/tests/authentication')]
+  'ldap': [tu.pathForTesting('client/authentication')],
+  'ldaprole': [tu.pathForTesting('client/authentication')],
+  'ldapsearch': [tu.pathForTesting('client/authentication')],
+  'ldaprolesimple': [tu.pathForTesting('client/authentication')],
+  'ldapsearchsimple': [tu.pathForTesting('client/authentication')]
 };
 
 // //////////////////////////////////////////////////////////////////////////////

js/client/modules/@arangodb/testsuites/loadBalancing.js

@@ -44,7 +44,7 @@ const RESET = require('internal').COLORS.COLOR_RESET;
 const download = require('internal').download;
 
 const testPaths = {
-  'load_balancing': [tu.pathForTesting('client/tests/load-balancing')]
+  'load_balancing': [tu.pathForTesting('client/load-balancing')]
 };
 
 ////////////////////////////////////////////////////////////////////////////////

js/client/modules/@arangodb/testsuites/recovery.js

@@ -42,7 +42,7 @@ const RED = require('internal').COLORS.COLOR_RED;
 const RESET = require('internal').COLORS.COLOR_RESET;
 
 const testPaths = {
-  'recovery': [tu.pathForTesting('server/tests/recovery')]
+  'recovery': [tu.pathForTesting('server/recovery')]
 };
 
 // //////////////////////////////////////////////////////////////////////////////

js/client/modules/@arangodb/testsuites/replication.js

@@ -41,13 +41,13 @@ const pu = require('@arangodb/process-utils');
 const tu = require('@arangodb/test-utils');
 
 const testPaths = {
-  'shell_replication': [tu.pathForTesting('common/tests/replication')],
-  'replication_aql': [tu.pathForTesting('server/tests/replication')],
-  'replication_fuzz': [tu.pathForTesting('server/tests/replication')],
-  'replication_random': [tu.pathForTesting('server/tests/replication')],
-  'replication_ongoing': [tu.pathForTesting('server/tests/replication')],
-  'replication_static': [tu.pathForTesting('server/tests/replication')],
-  'replication_sync': [tu.pathForTesting('server/tests/replication')]
+  'shell_replication': [tu.pathForTesting('common/replication')],
+  'replication_aql': [tu.pathForTesting('server/replication')],
+  'replication_fuzz': [tu.pathForTesting('server/replication')],
+  'replication_random': [tu.pathForTesting('server/replication')],
+  'replication_ongoing': [tu.pathForTesting('server/replication')],
+  'replication_static': [tu.pathForTesting('server/replication')],
+  'replication_sync': [tu.pathForTesting('server/replication')]
 };
 
 // //////////////////////////////////////////////////////////////////////////////

js/client/modules/@arangodb/testsuites/resilience.js

@@ -36,9 +36,9 @@ const optionsDocumentation = [
 const tu = require('@arangodb/test-utils');
 
 const testPaths = {
-  'resilience': [tu.pathForTesting('server/tests/resilience')],
-  'client_resilience': [tu.pathForTesting('client/tests/resilience')],
-  'active_failover': [tu.pathForTesting('client/tests/active-failover')]
+  'resilience': [tu.pathForTesting('server/resilience')],
+  'client_resilience': [tu.pathForTesting('client/resilience')],
+  'active_failover': [tu.pathForTesting('client/active-failover')]
 };
 
 // //////////////////////////////////////////////////////////////////////////////

js/client/modules/@arangodb/testsuites/rspec.js

@@ -56,7 +56,7 @@ const testPaths = {
   'http_replication': [tu.pathForTesting('HttpReplication', 'rb')],
   'http_server': [tu.pathForTesting('HttpInterface', 'rb')],
   'ssl_server': [tu.pathForTesting('HttpInterface', 'rb')],
-  'server_http': [tu.pathForTesting('common/tests/http')],
+  'server_http': [tu.pathForTesting('common/http')],
 };
 
 // //////////////////////////////////////////////////////////////////////////////

js/client/modules/@arangodb/testsuites/stress.js

@@ -141,7 +141,7 @@ function stressCrud (options) {
   const concurrency = options.concurrency;
 
   const command = `
-  const stressCrud = require('./' + tu.pathForTesting('server/tests/stress/crud'));
+  const stressCrud = require('./' + tu.pathForTesting('server/stress/crud'));
 
   stressCrud.createDeleteUpdateParallel({
     concurrency: ${concurrency},
@@ -168,7 +168,7 @@ function stressKilling (options) {
   _.defaults(opts, options);
 
   const command = `
-  const stressCrud = require('./' + tu.pathForTesting('server/tests/stress/killingQueries'));
+  const stressCrud = require('./' + tu.pathForTesting('server/stress/killingQueries'));
 
   stressCrud.killingParallel({
     duration: ${duration},
@@ -188,7 +188,7 @@ function stressLocks (options) {
   const concurrency = options.concurrency;
 
   const command = `
-  const deadlock = require('./' + tu.pathForTesting('server/tests/stress/deadlock'));
+  const deadlock = require('./' + tu.pathForTesting('server/stress/deadlock'));
 
   deadlock.lockCycleParallel({
     concurrency: ${concurrency},

scripts/quickieTest.sh

@@ -5,10 +5,10 @@ trap "rm -rf ${JSLINTOUT}" EXIT
 ./utils/jslint.sh 2>&1 > ${JSLINTOUT} &
 JSLINTPID="$!"
 
-scripts/unittest shell_server --test js/common/tests/shell/shell-quickie.js "$@"
-scripts/unittest shell_server --test js/common/tests/shell/shell-quickie.js --cluster true --agencySupervision false "$@"
-scripts/unittest shell_client --test js/common/tests/shell/shell-quickie.js "$@"
-scripts/unittest shell_client --test js/common/tests/shell/shell-quickie.js --cluster true --agencySize 1 "$@"
+scripts/unittest shell_server --test tests/js/common/shell/shell-quickie.js "$@"
+scripts/unittest shell_server --test tests/js/common/shell/shell-quickie.js --cluster true --agencySupervision false "$@"
+scripts/unittest shell_client --test tests/js/common/shell/shell-quickie.js "$@"
+scripts/unittest shell_client --test tests/js/common/shell/shell-quickie.js --cluster true --agencySize 1 "$@"
 
 echo "waiting for the result of jslint..."
 

tests/js/client/assets/queuetest/queuetest.js

@@ -1,3 +1,4 @@
+/* global ArangoServerState */
 const db = require('internal').db;
 
 db.foxxqueuetest.replace('test', {'date': Date.now(), 'server': ArangoServerState.id()});