diff --git a/js/client/modules/@arangodb/testsuites/agency.js b/js/client/modules/@arangodb/testsuites/agency.js index c53432fd37..20936791c7 100644 --- a/js/client/modules/@arangodb/testsuites/agency.js +++ b/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')] }; // ////////////////////////////////////////////////////////////////////////////// diff --git a/js/client/modules/@arangodb/testsuites/aql.js b/js/client/modules/@arangodb/testsuites/aql.js index 940ed9c7da..bc2e76eff0 100644 --- a/js/client/modules/@arangodb/testsuites/aql.js +++ b/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') ] }; // ////////////////////////////////////////////////////////////////////////////// diff --git a/js/client/modules/@arangodb/testsuites/audit.js b/js/client/modules/@arangodb/testsuites/audit.js index ddc0455b43..7c58dcf509 100644 --- a/js/client/modules/@arangodb/testsuites/audit.js +++ b/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 = { diff --git a/js/client/modules/@arangodb/testsuites/authentication.js b/js/client/modules/@arangodb/testsuites/authentication.js index 163b1c774c..867566f122 100644 --- a/js/client/modules/@arangodb/testsuites/authentication.js +++ b/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': [] }; diff --git a/js/client/modules/@arangodb/testsuites/backup.js b/js/client/modules/@arangodb/testsuites/backup.js index b626a899eb..ef78095857 100644 --- a/js/client/modules/@arangodb/testsuites/backup.js +++ b/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) => { diff --git a/js/client/modules/@arangodb/testsuites/dump.js b/js/client/modules/@arangodb/testsuites/dump.js index edbc2b5108..4b00a93c23 100644 --- a/js/client/modules/@arangodb/testsuites/dump.js +++ b/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, diff --git a/js/client/modules/@arangodb/testsuites/endpoints.js b/js/client/modules/@arangodb/testsuites/endpoints.js index 1deaf725b7..eabd66755f 100644 --- a/js/client/modules/@arangodb/testsuites/endpoints.js +++ b/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) { diff --git a/js/client/modules/@arangodb/testsuites/export.js b/js/client/modules/@arangodb/testsuites/export.js index d2c46dcb45..1da24c9d4c 100644 --- a/js/client/modules/@arangodb/testsuites/export.js +++ b/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; diff --git a/js/client/modules/@arangodb/testsuites/importing.js b/js/client/modules/@arangodb/testsuites/importing.js index 0b5bbc87b2..413198edc7 100644 --- a/js/client/modules/@arangodb/testsuites/importing.js +++ b/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... ] }; diff --git a/js/client/modules/@arangodb/testsuites/ldap.js b/js/client/modules/@arangodb/testsuites/ldap.js index f14b05fe77..a5515de039 100644 --- a/js/client/modules/@arangodb/testsuites/ldap.js +++ b/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')] }; // ////////////////////////////////////////////////////////////////////////////// diff --git a/js/client/modules/@arangodb/testsuites/loadBalancing.js b/js/client/modules/@arangodb/testsuites/loadBalancing.js index 1630ce2a60..e184188b9b 100644 --- a/js/client/modules/@arangodb/testsuites/loadBalancing.js +++ b/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')] }; //////////////////////////////////////////////////////////////////////////////// diff --git a/js/client/modules/@arangodb/testsuites/recovery.js b/js/client/modules/@arangodb/testsuites/recovery.js index 3a79cd46d3..0a2408c11e 100644 --- a/js/client/modules/@arangodb/testsuites/recovery.js +++ b/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')] }; // ////////////////////////////////////////////////////////////////////////////// diff --git a/js/client/modules/@arangodb/testsuites/replication.js b/js/client/modules/@arangodb/testsuites/replication.js index 1c4add8e07..47d4e941bd 100644 --- a/js/client/modules/@arangodb/testsuites/replication.js +++ b/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')] }; // ////////////////////////////////////////////////////////////////////////////// diff --git a/js/client/modules/@arangodb/testsuites/resilience.js b/js/client/modules/@arangodb/testsuites/resilience.js index edff3ff019..3ae0db69ff 100644 --- a/js/client/modules/@arangodb/testsuites/resilience.js +++ b/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')] }; // ////////////////////////////////////////////////////////////////////////////// diff --git a/js/client/modules/@arangodb/testsuites/rspec.js b/js/client/modules/@arangodb/testsuites/rspec.js index 279a7d4c89..4cdfe7b78a 100644 --- a/js/client/modules/@arangodb/testsuites/rspec.js +++ b/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')], }; // ////////////////////////////////////////////////////////////////////////////// diff --git a/js/client/modules/@arangodb/testsuites/stress.js b/js/client/modules/@arangodb/testsuites/stress.js index 4d1c05161b..83ec81c45e 100644 --- a/js/client/modules/@arangodb/testsuites/stress.js +++ b/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}, diff --git a/scripts/quickieTest.sh b/scripts/quickieTest.sh index b83c81b5b5..af56ae56a3 100755 --- a/scripts/quickieTest.sh +++ b/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..." diff --git a/tests/js/client/tests/README b/tests/js/client/README similarity index 100% rename from tests/js/client/tests/README rename to tests/js/client/README diff --git a/tests/js/client/tests/active-failover/basic.js b/tests/js/client/active-failover/basic.js similarity index 100% rename from tests/js/client/tests/active-failover/basic.js rename to tests/js/client/active-failover/basic.js diff --git a/tests/js/client/tests/active-failover/readonly.js b/tests/js/client/active-failover/readonly.js similarity index 100% rename from tests/js/client/tests/active-failover/readonly.js rename to tests/js/client/active-failover/readonly.js diff --git a/tests/js/client/tests/agency/agency-test.js b/tests/js/client/agency/agency-test.js similarity index 100% rename from tests/js/client/tests/agency/agency-test.js rename to tests/js/client/agency/agency-test.js diff --git a/tests/js/client/assets/queuetest/queuetest.js b/tests/js/client/assets/queuetest/queuetest.js index ba9a020b3f..cfe8041f08 100644 --- a/tests/js/client/assets/queuetest/queuetest.js +++ b/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()}); diff --git a/tests/js/client/tests/authentication/auth.js b/tests/js/client/authentication/auth.js similarity index 100% rename from tests/js/client/tests/authentication/auth.js rename to tests/js/client/authentication/auth.js diff --git a/tests/js/client/tests/authentication/foxx-arango-auth-spec.js b/tests/js/client/authentication/foxx-arango-auth-spec.js similarity index 100% rename from tests/js/client/tests/authentication/foxx-arango-auth-spec.js rename to tests/js/client/authentication/foxx-arango-auth-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-collection-level-create-spec.js b/tests/js/client/authentication/user-access-right-collection-level-create-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-collection-level-create-spec.js rename to tests/js/client/authentication/user-access-right-collection-level-create-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-collection-level-drop-spec.js b/tests/js/client/authentication/user-access-right-collection-level-drop-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-collection-level-drop-spec.js rename to tests/js/client/authentication/user-access-right-collection-level-drop-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-collection-level-read-spec.js b/tests/js/client/authentication/user-access-right-collection-level-read-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-collection-level-read-spec.js rename to tests/js/client/authentication/user-access-right-collection-level-read-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-collection-level-truncate-spec.js b/tests/js/client/authentication/user-access-right-collection-level-truncate-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-collection-level-truncate-spec.js rename to tests/js/client/authentication/user-access-right-collection-level-truncate-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-collection-level-update-spec.js b/tests/js/client/authentication/user-access-right-collection-level-update-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-collection-level-update-spec.js rename to tests/js/client/authentication/user-access-right-collection-level-update-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-collection-properties-spec.js b/tests/js/client/authentication/user-access-right-collection-properties-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-collection-properties-spec.js rename to tests/js/client/authentication/user-access-right-collection-properties-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-collection-spec.js b/tests/js/client/authentication/user-access-right-collection-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-collection-spec.js rename to tests/js/client/authentication/user-access-right-collection-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-create-a-user-spec.js b/tests/js/client/authentication/user-access-right-create-a-user-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-create-a-user-spec.js rename to tests/js/client/authentication/user-access-right-create-a-user-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-create-db-spec.js b/tests/js/client/authentication/user-access-right-create-db-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-create-db-spec.js rename to tests/js/client/authentication/user-access-right-create-db-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-create-graph-spec.js b/tests/js/client/authentication/user-access-right-create-graph-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-create-graph-spec.js rename to tests/js/client/authentication/user-access-right-create-graph-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-create-view-arangosearch-spec.js b/tests/js/client/authentication/user-access-right-create-view-arangosearch-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-create-view-arangosearch-spec.js rename to tests/js/client/authentication/user-access-right-create-view-arangosearch-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-drop-a-user-spec.js b/tests/js/client/authentication/user-access-right-drop-a-user-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-drop-a-user-spec.js rename to tests/js/client/authentication/user-access-right-drop-a-user-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-drop-db-spec.js b/tests/js/client/authentication/user-access-right-drop-db-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-drop-db-spec.js rename to tests/js/client/authentication/user-access-right-drop-db-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-drop-graph-spec.js b/tests/js/client/authentication/user-access-right-drop-graph-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-drop-graph-spec.js rename to tests/js/client/authentication/user-access-right-drop-graph-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-drop-view-arangosearch-spec.js b/tests/js/client/authentication/user-access-right-drop-view-arangosearch-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-drop-view-arangosearch-spec.js rename to tests/js/client/authentication/user-access-right-drop-view-arangosearch-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-foxx-queue-general-spec.js b/tests/js/client/authentication/user-access-right-foxx-queue-general-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-foxx-queue-general-spec.js rename to tests/js/client/authentication/user-access-right-foxx-queue-general-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-foxx-spec.js b/tests/js/client/authentication/user-access-right-foxx-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-foxx-spec.js rename to tests/js/client/authentication/user-access-right-foxx-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-permission-resolution.js b/tests/js/client/authentication/user-access-right-permission-resolution.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-permission-resolution.js rename to tests/js/client/authentication/user-access-right-permission-resolution.js diff --git a/tests/js/client/tests/authentication/user-access-right-read-view-arangosearch-spec.js b/tests/js/client/authentication/user-access-right-read-view-arangosearch-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-read-view-arangosearch-spec.js rename to tests/js/client/authentication/user-access-right-read-view-arangosearch-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-task-collection-level-create-spec.js b/tests/js/client/authentication/user-access-right-task-collection-level-create-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-task-collection-level-create-spec.js rename to tests/js/client/authentication/user-access-right-task-collection-level-create-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-task-collection-level-drop-spec.js b/tests/js/client/authentication/user-access-right-task-collection-level-drop-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-task-collection-level-drop-spec.js rename to tests/js/client/authentication/user-access-right-task-collection-level-drop-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-task-collection-level-read-spec.js b/tests/js/client/authentication/user-access-right-task-collection-level-read-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-task-collection-level-read-spec.js rename to tests/js/client/authentication/user-access-right-task-collection-level-read-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-task-collection-level-truncate-spec.js b/tests/js/client/authentication/user-access-right-task-collection-level-truncate-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-task-collection-level-truncate-spec.js rename to tests/js/client/authentication/user-access-right-task-collection-level-truncate-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-task-collection-level-update-spec.js b/tests/js/client/authentication/user-access-right-task-collection-level-update-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-task-collection-level-update-spec.js rename to tests/js/client/authentication/user-access-right-task-collection-level-update-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-task-collection-spec.js b/tests/js/client/authentication/user-access-right-task-collection-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-task-collection-spec.js rename to tests/js/client/authentication/user-access-right-task-collection-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-task-create-a-user-spec.js b/tests/js/client/authentication/user-access-right-task-create-a-user-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-task-create-a-user-spec.js rename to tests/js/client/authentication/user-access-right-task-create-a-user-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-task-create-db-spec.js b/tests/js/client/authentication/user-access-right-task-create-db-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-task-create-db-spec.js rename to tests/js/client/authentication/user-access-right-task-create-db-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-task-create-graph-spec.js b/tests/js/client/authentication/user-access-right-task-create-graph-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-task-create-graph-spec.js rename to tests/js/client/authentication/user-access-right-task-create-graph-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-task-create-view-arangosearch-spec.js b/tests/js/client/authentication/user-access-right-task-create-view-arangosearch-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-task-create-view-arangosearch-spec.js rename to tests/js/client/authentication/user-access-right-task-create-view-arangosearch-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-task-drop-a-user-spec.js b/tests/js/client/authentication/user-access-right-task-drop-a-user-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-task-drop-a-user-spec.js rename to tests/js/client/authentication/user-access-right-task-drop-a-user-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-task-drop-db-spec.js b/tests/js/client/authentication/user-access-right-task-drop-db-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-task-drop-db-spec.js rename to tests/js/client/authentication/user-access-right-task-drop-db-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-task-drop-graph-spec.js b/tests/js/client/authentication/user-access-right-task-drop-graph-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-task-drop-graph-spec.js rename to tests/js/client/authentication/user-access-right-task-drop-graph-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-task-drop-view-arangosearch-spec.js b/tests/js/client/authentication/user-access-right-task-drop-view-arangosearch-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-task-drop-view-arangosearch-spec.js rename to tests/js/client/authentication/user-access-right-task-drop-view-arangosearch-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-task-read-view-arangosearch-spec.js b/tests/js/client/authentication/user-access-right-task-read-view-arangosearch-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-task-read-view-arangosearch-spec.js rename to tests/js/client/authentication/user-access-right-task-read-view-arangosearch-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-task-repeatable-update-a-user-spec.js b/tests/js/client/authentication/user-access-right-task-repeatable-update-a-user-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-task-repeatable-update-a-user-spec.js rename to tests/js/client/authentication/user-access-right-task-repeatable-update-a-user-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-task-update-a-user-spec.js b/tests/js/client/authentication/user-access-right-task-update-a-user-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-task-update-a-user-spec.js rename to tests/js/client/authentication/user-access-right-task-update-a-user-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-task-update-view-arangosearch-spec.js b/tests/js/client/authentication/user-access-right-task-update-view-arangosearch-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-task-update-view-arangosearch-spec.js rename to tests/js/client/authentication/user-access-right-task-update-view-arangosearch-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-update-a-user-spec.js b/tests/js/client/authentication/user-access-right-update-a-user-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-update-a-user-spec.js rename to tests/js/client/authentication/user-access-right-update-a-user-spec.js diff --git a/tests/js/client/tests/authentication/user-access-right-update-view-arangosearch-spec.js b/tests/js/client/authentication/user-access-right-update-view-arangosearch-spec.js similarity index 100% rename from tests/js/client/tests/authentication/user-access-right-update-view-arangosearch-spec.js rename to tests/js/client/authentication/user-access-right-update-view-arangosearch-spec.js diff --git a/tests/js/client/tests/endpoint-spec.js b/tests/js/client/endpoint-spec.js similarity index 100% rename from tests/js/client/tests/endpoint-spec.js rename to tests/js/client/endpoint-spec.js diff --git a/tests/js/client/tests/http/api-gharial-spec.js b/tests/js/client/http/api-gharial-spec.js similarity index 100% rename from tests/js/client/tests/http/api-gharial-spec.js rename to tests/js/client/http/api-gharial-spec.js diff --git a/tests/js/client/tests/load-balancing/load-balancing-async-auth-cluster.js b/tests/js/client/load-balancing/load-balancing-async-auth-cluster.js similarity index 100% rename from tests/js/client/tests/load-balancing/load-balancing-async-auth-cluster.js rename to tests/js/client/load-balancing/load-balancing-async-auth-cluster.js diff --git a/tests/js/client/tests/load-balancing/load-balancing-async-noauth-cluster.js b/tests/js/client/load-balancing/load-balancing-async-noauth-cluster.js similarity index 100% rename from tests/js/client/tests/load-balancing/load-balancing-async-noauth-cluster.js rename to tests/js/client/load-balancing/load-balancing-async-noauth-cluster.js diff --git a/tests/js/client/tests/load-balancing/load-balancing-cursor-auth-cluster.js b/tests/js/client/load-balancing/load-balancing-cursor-auth-cluster.js similarity index 100% rename from tests/js/client/tests/load-balancing/load-balancing-cursor-auth-cluster.js rename to tests/js/client/load-balancing/load-balancing-cursor-auth-cluster.js diff --git a/tests/js/client/tests/load-balancing/load-balancing-cursor-noauth-cluster.js b/tests/js/client/load-balancing/load-balancing-cursor-noauth-cluster.js similarity index 100% rename from tests/js/client/tests/load-balancing/load-balancing-cursor-noauth-cluster.js rename to tests/js/client/load-balancing/load-balancing-cursor-noauth-cluster.js diff --git a/tests/js/client/tests/load-balancing/load-balancing-pregel-auth-cluster.js b/tests/js/client/load-balancing/load-balancing-pregel-auth-cluster.js similarity index 100% rename from tests/js/client/tests/load-balancing/load-balancing-pregel-auth-cluster.js rename to tests/js/client/load-balancing/load-balancing-pregel-auth-cluster.js diff --git a/tests/js/client/tests/load-balancing/load-balancing-pregel-noauth-cluster.js b/tests/js/client/load-balancing/load-balancing-pregel-noauth-cluster.js similarity index 100% rename from tests/js/client/tests/load-balancing/load-balancing-pregel-noauth-cluster.js rename to tests/js/client/load-balancing/load-balancing-pregel-noauth-cluster.js diff --git a/tests/js/client/tests/load-balancing/load-balancing-tasks-auth-cluster.js b/tests/js/client/load-balancing/load-balancing-tasks-auth-cluster.js similarity index 100% rename from tests/js/client/tests/load-balancing/load-balancing-tasks-auth-cluster.js rename to tests/js/client/load-balancing/load-balancing-tasks-auth-cluster.js diff --git a/tests/js/client/tests/load-balancing/load-balancing-tasks-noauth-cluster.js b/tests/js/client/load-balancing/load-balancing-tasks-noauth-cluster.js similarity index 100% rename from tests/js/client/tests/load-balancing/load-balancing-tasks-noauth-cluster.js rename to tests/js/client/load-balancing/load-balancing-tasks-noauth-cluster.js diff --git a/tests/js/client/tests/resilience/foxxmaster.js b/tests/js/client/resilience/foxxmaster.js similarity index 100% rename from tests/js/client/tests/resilience/foxxmaster.js rename to tests/js/client/resilience/foxxmaster.js diff --git a/tests/js/client/tests/shell/shell-client.js b/tests/js/client/shell/shell-client.js similarity index 100% rename from tests/js/client/tests/shell/shell-client.js rename to tests/js/client/shell/shell-client.js diff --git a/tests/js/client/tests/shell/shell-document.js b/tests/js/client/shell/shell-document.js similarity index 100% rename from tests/js/client/tests/shell/shell-document.js rename to tests/js/client/shell/shell-document.js diff --git a/tests/js/client/tests/shell/shell-download.js b/tests/js/client/shell/shell-download.js similarity index 100% rename from tests/js/client/tests/shell/shell-download.js rename to tests/js/client/shell/shell-download.js diff --git a/tests/js/client/tests/shell/shell-endpoints.js b/tests/js/client/shell/shell-endpoints.js similarity index 100% rename from tests/js/client/tests/shell/shell-endpoints.js rename to tests/js/client/shell/shell-endpoints.js diff --git a/tests/js/client/tests/shell/shell-foxx-api-spec.js b/tests/js/client/shell/shell-foxx-api-spec.js similarity index 100% rename from tests/js/client/tests/shell/shell-foxx-api-spec.js rename to tests/js/client/shell/shell-foxx-api-spec.js diff --git a/tests/js/client/tests/shell/shell-foxx-cors-spec.js b/tests/js/client/shell/shell-foxx-cors-spec.js similarity index 100% rename from tests/js/client/tests/shell/shell-foxx-cors-spec.js rename to tests/js/client/shell/shell-foxx-cors-spec.js diff --git a/tests/js/client/tests/shell/shell-foxx-manager-nightly-spec.js b/tests/js/client/shell/shell-foxx-manager-nightly-spec.js similarity index 100% rename from tests/js/client/tests/shell/shell-foxx-manager-nightly-spec.js rename to tests/js/client/shell/shell-foxx-manager-nightly-spec.js diff --git a/tests/js/client/tests/shell/shell-foxx-manager-spec.js b/tests/js/client/shell/shell-foxx-manager-spec.js similarity index 100% rename from tests/js/client/tests/shell/shell-foxx-manager-spec.js rename to tests/js/client/shell/shell-foxx-manager-spec.js diff --git a/tests/js/client/tests/shell/shell-foxx-paths-spec.js b/tests/js/client/shell/shell-foxx-paths-spec.js similarity index 100% rename from tests/js/client/tests/shell/shell-foxx-paths-spec.js rename to tests/js/client/shell/shell-foxx-paths-spec.js diff --git a/tests/js/client/tests/shell/shell-foxx-queue-spec.js b/tests/js/client/shell/shell-foxx-queue-spec.js similarity index 100% rename from tests/js/client/tests/shell/shell-foxx-queue-spec.js rename to tests/js/client/shell/shell-foxx-queue-spec.js diff --git a/tests/js/client/tests/shell/shell-query-stream-timecritical-spec.js b/tests/js/client/shell/shell-query-stream-timecritical-spec.js similarity index 100% rename from tests/js/client/tests/shell/shell-query-stream-timecritical-spec.js rename to tests/js/client/shell/shell-query-stream-timecritical-spec.js diff --git a/tests/js/client/tests/shell/shell-query-stream.js b/tests/js/client/shell/shell-query-stream.js similarity index 100% rename from tests/js/client/tests/shell/shell-query-stream.js rename to tests/js/client/shell/shell-query-stream.js diff --git a/tests/js/client/tests/shell/shell-rep_li_cat_ion-rocksdb-noncluster.js b/tests/js/client/shell/shell-rep_li_cat_ion-rocksdb-noncluster.js similarity index 100% rename from tests/js/client/tests/shell/shell-rep_li_cat_ion-rocksdb-noncluster.js rename to tests/js/client/shell/shell-rep_li_cat_ion-rocksdb-noncluster.js diff --git a/tests/js/client/tests/shell/shell-request.js b/tests/js/client/shell/shell-request.js similarity index 100% rename from tests/js/client/tests/shell/shell-request.js rename to tests/js/client/shell/shell-request.js diff --git a/tests/js/client/tests/shell/shell-require-canceled.js b/tests/js/client/shell/shell-require-canceled.js similarity index 100% rename from tests/js/client/tests/shell/shell-require-canceled.js rename to tests/js/client/shell/shell-require-canceled.js diff --git a/tests/js/client/tests/shell/shell-statement.js b/tests/js/client/shell/shell-statement.js similarity index 100% rename from tests/js/client/tests/shell/shell-statement.js rename to tests/js/client/shell/shell-statement.js diff --git a/tests/js/client/tests/shell/shell-vpack.js b/tests/js/client/shell/shell-vpack.js similarity index 100% rename from tests/js/client/tests/shell/shell-vpack.js rename to tests/js/client/shell/shell-vpack.js diff --git a/tests/js/common/tests/README b/tests/js/common/README similarity index 100% rename from tests/js/common/tests/README rename to tests/js/common/README diff --git a/tests/js/common/tests/aql/aql-view-arangosearch-cluster.js b/tests/js/common/aql/aql-view-arangosearch-cluster.js similarity index 100% rename from tests/js/common/tests/aql/aql-view-arangosearch-cluster.js rename to tests/js/common/aql/aql-view-arangosearch-cluster.js diff --git a/tests/js/common/tests/aql/aql-view-arangosearch-ddl-cluster.js b/tests/js/common/aql/aql-view-arangosearch-ddl-cluster.js similarity index 100% rename from tests/js/common/tests/aql/aql-view-arangosearch-ddl-cluster.js rename to tests/js/common/aql/aql-view-arangosearch-ddl-cluster.js diff --git a/tests/js/common/tests/aql/aql-view-arangosearch-ddl-noncluster.js b/tests/js/common/aql/aql-view-arangosearch-ddl-noncluster.js similarity index 100% rename from tests/js/common/tests/aql/aql-view-arangosearch-ddl-noncluster.js rename to tests/js/common/aql/aql-view-arangosearch-ddl-noncluster.js diff --git a/tests/js/common/tests/aql/aql-view-arangosearch-feature.js b/tests/js/common/aql/aql-view-arangosearch-feature.js similarity index 100% rename from tests/js/common/tests/aql/aql-view-arangosearch-feature.js rename to tests/js/common/aql/aql-view-arangosearch-feature.js diff --git a/tests/js/common/tests/aql/aql-view-arangosearch-noncluster.js b/tests/js/common/aql/aql-view-arangosearch-noncluster.js similarity index 100% rename from tests/js/common/tests/aql/aql-view-arangosearch-noncluster.js rename to tests/js/common/aql/aql-view-arangosearch-noncluster.js diff --git a/tests/js/common/tests/aql/aql-view-arangosearch-nondeterministic-cluster.js b/tests/js/common/aql/aql-view-arangosearch-nondeterministic-cluster.js similarity index 100% rename from tests/js/common/tests/aql/aql-view-arangosearch-nondeterministic-cluster.js rename to tests/js/common/aql/aql-view-arangosearch-nondeterministic-cluster.js diff --git a/tests/js/common/tests/countries.json b/tests/js/common/countries.json similarity index 100% rename from tests/js/common/tests/countries.json rename to tests/js/common/countries.json diff --git a/tests/js/common/tests/execute-infinite-shortest-path.js b/tests/js/common/execute-infinite-shortest-path.js similarity index 100% rename from tests/js/common/tests/execute-infinite-shortest-path.js rename to tests/js/common/execute-infinite-shortest-path.js diff --git a/tests/js/common/tests/execute-nothing.js b/tests/js/common/execute-nothing.js similarity index 100% rename from tests/js/common/tests/execute-nothing.js rename to tests/js/common/execute-nothing.js diff --git a/tests/js/common/tests/http/api-gharial-creation-cluster-spec.js b/tests/js/common/http/api-gharial-creation-cluster-spec.js similarity index 100% rename from tests/js/common/tests/http/api-gharial-creation-cluster-spec.js rename to tests/js/common/http/api-gharial-creation-cluster-spec.js diff --git a/tests/js/common/tests/http/document-babies-spec.js b/tests/js/common/http/document-babies-spec.js similarity index 100% rename from tests/js/common/tests/http/document-babies-spec.js rename to tests/js/common/http/document-babies-spec.js diff --git a/tests/js/common/tests/http/grants-spec.js b/tests/js/common/http/grants-spec.js similarity index 100% rename from tests/js/common/tests/http/grants-spec.js rename to tests/js/common/http/grants-spec.js diff --git a/tests/js/common/tests/replication/replication.js b/tests/js/common/replication/replication.js similarity index 100% rename from tests/js/common/tests/replication/replication.js rename to tests/js/common/replication/replication.js diff --git a/tests/js/common/tests/shell/exclusive-collections-noncluster-rocksdb.js b/tests/js/common/shell/exclusive-collections-noncluster-rocksdb.js similarity index 100% rename from tests/js/common/tests/shell/exclusive-collections-noncluster-rocksdb.js rename to tests/js/common/shell/exclusive-collections-noncluster-rocksdb.js diff --git a/tests/js/common/tests/shell/general-graph-creation-cluster-spec.js b/tests/js/common/shell/general-graph-creation-cluster-spec.js similarity index 100% rename from tests/js/common/tests/shell/general-graph-creation-cluster-spec.js rename to tests/js/common/shell/general-graph-creation-cluster-spec.js diff --git a/tests/js/common/tests/shell/shell-aqlfunctions.js b/tests/js/common/shell/shell-aqlfunctions.js similarity index 100% rename from tests/js/common/tests/shell/shell-aqlfunctions.js rename to tests/js/common/shell/shell-aqlfunctions.js diff --git a/tests/js/common/tests/shell/shell-array-index-noncluster.js b/tests/js/common/shell/shell-array-index-noncluster.js similarity index 100% rename from tests/js/common/tests/shell/shell-array-index-noncluster.js rename to tests/js/common/shell/shell-array-index-noncluster.js diff --git a/tests/js/common/tests/shell/shell-attributes.js b/tests/js/common/shell/shell-attributes.js similarity index 100% rename from tests/js/common/tests/shell/shell-attributes.js rename to tests/js/common/shell/shell-attributes.js diff --git a/tests/js/common/tests/shell/shell-base64.js b/tests/js/common/shell/shell-base64.js similarity index 100% rename from tests/js/common/tests/shell/shell-base64.js rename to tests/js/common/shell/shell-base64.js diff --git a/tests/js/common/tests/shell/shell-cluster-collection.js b/tests/js/common/shell/shell-cluster-collection.js similarity index 100% rename from tests/js/common/tests/shell/shell-cluster-collection.js rename to tests/js/common/shell/shell-cluster-collection.js diff --git a/tests/js/common/tests/shell/shell-cluster-crud.js b/tests/js/common/shell/shell-cluster-crud.js similarity index 100% rename from tests/js/common/tests/shell/shell-cluster-crud.js rename to tests/js/common/shell/shell-cluster-crud.js diff --git a/tests/js/common/tests/shell/shell-cluster-simple.js b/tests/js/common/shell/shell-cluster-simple.js similarity index 100% rename from tests/js/common/tests/shell/shell-cluster-simple.js rename to tests/js/common/shell/shell-cluster-simple.js diff --git a/tests/js/common/tests/shell/shell-collection-access.js b/tests/js/common/shell/shell-collection-access.js similarity index 100% rename from tests/js/common/tests/shell/shell-collection-access.js rename to tests/js/common/shell/shell-collection-access.js diff --git a/tests/js/common/tests/shell/shell-collection-mmfiles-noncluster.js b/tests/js/common/shell/shell-collection-mmfiles-noncluster.js similarity index 100% rename from tests/js/common/tests/shell/shell-collection-mmfiles-noncluster.js rename to tests/js/common/shell/shell-collection-mmfiles-noncluster.js diff --git a/tests/js/common/tests/shell/shell-collection-mmfiles.js b/tests/js/common/shell/shell-collection-mmfiles.js similarity index 100% rename from tests/js/common/tests/shell/shell-collection-mmfiles.js rename to tests/js/common/shell/shell-collection-mmfiles.js diff --git a/tests/js/common/tests/shell/shell-collection-rocksdb-noncluster.js b/tests/js/common/shell/shell-collection-rocksdb-noncluster.js similarity index 100% rename from tests/js/common/tests/shell/shell-collection-rocksdb-noncluster.js rename to tests/js/common/shell/shell-collection-rocksdb-noncluster.js diff --git a/tests/js/common/tests/shell/shell-collection-rocksdb.js b/tests/js/common/shell/shell-collection-rocksdb.js similarity index 100% rename from tests/js/common/tests/shell/shell-collection-rocksdb.js rename to tests/js/common/shell/shell-collection-rocksdb.js diff --git a/tests/js/common/tests/shell/shell-collection-volatile-mmfiles-noncluster.js b/tests/js/common/shell/shell-collection-volatile-mmfiles-noncluster.js similarity index 100% rename from tests/js/common/tests/shell/shell-collection-volatile-mmfiles-noncluster.js rename to tests/js/common/shell/shell-collection-volatile-mmfiles-noncluster.js diff --git a/tests/js/common/tests/shell/shell-community-sharding-compat-cluster.js b/tests/js/common/shell/shell-community-sharding-compat-cluster.js similarity index 100% rename from tests/js/common/tests/shell/shell-community-sharding-compat-cluster.js rename to tests/js/common/shell/shell-community-sharding-compat-cluster.js diff --git a/tests/js/common/tests/shell/shell-community-sharding-hash-cluster.js b/tests/js/common/shell/shell-community-sharding-hash-cluster.js similarity index 100% rename from tests/js/common/tests/shell/shell-community-sharding-hash-cluster.js rename to tests/js/common/shell/shell-community-sharding-hash-cluster.js diff --git a/tests/js/common/tests/shell/shell-crypto.js b/tests/js/common/shell/shell-crypto.js similarity index 100% rename from tests/js/common/tests/shell/shell-crypto.js rename to tests/js/common/shell/shell-crypto.js diff --git a/tests/js/common/tests/shell/shell-database.js b/tests/js/common/shell/shell-database.js similarity index 100% rename from tests/js/common/tests/shell/shell-database.js rename to tests/js/common/shell/shell-database.js diff --git a/tests/js/common/tests/shell/shell-deadlocks-timecritical-noncluster-mmfiles.js b/tests/js/common/shell/shell-deadlocks-timecritical-noncluster-mmfiles.js similarity index 100% rename from tests/js/common/tests/shell/shell-deadlocks-timecritical-noncluster-mmfiles.js rename to tests/js/common/shell/shell-deadlocks-timecritical-noncluster-mmfiles.js diff --git a/tests/js/common/tests/shell/shell-document-babies.js b/tests/js/common/shell/shell-document-babies.js similarity index 100% rename from tests/js/common/tests/shell/shell-document-babies.js rename to tests/js/common/shell/shell-document-babies.js diff --git a/tests/js/common/tests/shell/shell-document.js b/tests/js/common/shell/shell-document.js similarity index 100% rename from tests/js/common/tests/shell/shell-document.js rename to tests/js/common/shell/shell-document.js diff --git a/tests/js/common/tests/shell/shell-edge-index-cache-rocksdb.js b/tests/js/common/shell/shell-edge-index-cache-rocksdb.js similarity index 100% rename from tests/js/common/tests/shell/shell-edge-index-cache-rocksdb.js rename to tests/js/common/shell/shell-edge-index-cache-rocksdb.js diff --git a/tests/js/common/tests/shell/shell-edge-index-noncluster.js b/tests/js/common/shell/shell-edge-index-noncluster.js similarity index 100% rename from tests/js/common/tests/shell/shell-edge-index-noncluster.js rename to tests/js/common/shell/shell-edge-index-noncluster.js diff --git a/tests/js/common/tests/shell/shell-edge.js b/tests/js/common/shell/shell-edge.js similarity index 100% rename from tests/js/common/tests/shell/shell-edge.js rename to tests/js/common/shell/shell-edge.js diff --git a/tests/js/common/tests/shell/shell-env.js b/tests/js/common/shell/shell-env.js similarity index 100% rename from tests/js/common/tests/shell/shell-env.js rename to tests/js/common/shell/shell-env.js diff --git a/tests/js/common/tests/shell/shell-errors.js b/tests/js/common/shell/shell-errors.js similarity index 100% rename from tests/js/common/tests/shell/shell-errors.js rename to tests/js/common/shell/shell-errors.js diff --git a/tests/js/common/tests/shell/shell-explain-cluster.js b/tests/js/common/shell/shell-explain-cluster.js similarity index 100% rename from tests/js/common/tests/shell/shell-explain-cluster.js rename to tests/js/common/shell/shell-explain-cluster.js diff --git a/tests/js/common/tests/shell/shell-explain-noncluster.js b/tests/js/common/shell/shell-explain-noncluster.js similarity index 100% rename from tests/js/common/tests/shell/shell-explain-noncluster.js rename to tests/js/common/shell/shell-explain-noncluster.js diff --git a/tests/js/common/tests/shell/shell-figures-mmfiles-noncluster.js b/tests/js/common/shell/shell-figures-mmfiles-noncluster.js similarity index 100% rename from tests/js/common/tests/shell/shell-figures-mmfiles-noncluster.js rename to tests/js/common/shell/shell-figures-mmfiles-noncluster.js diff --git a/tests/js/common/tests/shell/shell-foxx-manager-install-spec.js b/tests/js/common/shell/shell-foxx-manager-install-spec.js similarity index 100% rename from tests/js/common/tests/shell/shell-foxx-manager-install-spec.js rename to tests/js/common/shell/shell-foxx-manager-install-spec.js diff --git a/tests/js/common/tests/shell/shell-fs.js b/tests/js/common/shell/shell-fs.js similarity index 100% rename from tests/js/common/tests/shell/shell-fs.js rename to tests/js/common/shell/shell-fs.js diff --git a/tests/js/common/tests/shell/shell-fulltext.js b/tests/js/common/shell/shell-fulltext.js similarity index 100% rename from tests/js/common/tests/shell/shell-fulltext.js rename to tests/js/common/shell/shell-fulltext.js diff --git a/tests/js/common/tests/shell/shell-general-graph.js b/tests/js/common/shell/shell-general-graph.js similarity index 100% rename from tests/js/common/tests/shell/shell-general-graph.js rename to tests/js/common/shell/shell-general-graph.js diff --git a/tests/js/common/tests/shell/shell-graph-measurement.js b/tests/js/common/shell/shell-graph-measurement.js similarity index 100% rename from tests/js/common/tests/shell/shell-graph-measurement.js rename to tests/js/common/shell/shell-graph-measurement.js diff --git a/tests/js/common/tests/shell/shell-graph-traversal.js b/tests/js/common/shell/shell-graph-traversal.js similarity index 100% rename from tests/js/common/tests/shell/shell-graph-traversal.js rename to tests/js/common/shell/shell-graph-traversal.js diff --git a/tests/js/common/tests/shell/shell-hash-index.js b/tests/js/common/shell/shell-hash-index.js similarity index 100% rename from tests/js/common/tests/shell/shell-hash-index.js rename to tests/js/common/shell/shell-hash-index.js diff --git a/tests/js/common/tests/shell/shell-index-ensure.js b/tests/js/common/shell/shell-index-ensure.js similarity index 100% rename from tests/js/common/tests/shell/shell-index-ensure.js rename to tests/js/common/shell/shell-index-ensure.js diff --git a/tests/js/common/tests/shell/shell-index-ensure2-mmfiles.js b/tests/js/common/shell/shell-index-ensure2-mmfiles.js similarity index 100% rename from tests/js/common/tests/shell/shell-index-ensure2-mmfiles.js rename to tests/js/common/shell/shell-index-ensure2-mmfiles.js diff --git a/tests/js/common/tests/shell/shell-index-figures-noncluster-spec.js b/tests/js/common/shell/shell-index-figures-noncluster-spec.js similarity index 100% rename from tests/js/common/tests/shell/shell-index-figures-noncluster-spec.js rename to tests/js/common/shell/shell-index-figures-noncluster-spec.js diff --git a/tests/js/common/tests/shell/shell-index-geo.js b/tests/js/common/shell/shell-index-geo.js similarity index 100% rename from tests/js/common/tests/shell/shell-index-geo.js rename to tests/js/common/shell/shell-index-geo.js diff --git a/tests/js/common/tests/shell/shell-index-vertex-centric.js b/tests/js/common/shell/shell-index-vertex-centric.js similarity index 100% rename from tests/js/common/tests/shell/shell-index-vertex-centric.js rename to tests/js/common/shell/shell-index-vertex-centric.js diff --git a/tests/js/common/tests/shell/shell-index.js b/tests/js/common/shell/shell-index.js similarity index 100% rename from tests/js/common/tests/shell/shell-index.js rename to tests/js/common/shell/shell-index.js diff --git a/tests/js/common/tests/shell/shell-keygen-noncluster.js b/tests/js/common/shell/shell-keygen-noncluster.js similarity index 100% rename from tests/js/common/tests/shell/shell-keygen-noncluster.js rename to tests/js/common/shell/shell-keygen-noncluster.js diff --git a/tests/js/common/tests/shell/shell-keygen.js b/tests/js/common/shell/shell-keygen.js similarity index 100% rename from tests/js/common/tests/shell/shell-keygen.js rename to tests/js/common/shell/shell-keygen.js diff --git a/tests/js/common/tests/shell/shell-locals-spec.js b/tests/js/common/shell/shell-locals-spec.js similarity index 100% rename from tests/js/common/tests/shell/shell-locals-spec.js rename to tests/js/common/shell/shell-locals-spec.js diff --git a/tests/js/common/tests/shell/shell-noncluster-edge.js b/tests/js/common/shell/shell-noncluster-edge.js similarity index 100% rename from tests/js/common/tests/shell/shell-noncluster-edge.js rename to tests/js/common/shell/shell-noncluster-edge.js diff --git a/tests/js/common/tests/shell/shell-persistent-index-mmfiles.js b/tests/js/common/shell/shell-persistent-index-mmfiles.js similarity index 100% rename from tests/js/common/tests/shell/shell-persistent-index-mmfiles.js rename to tests/js/common/shell/shell-persistent-index-mmfiles.js diff --git a/tests/js/common/tests/shell/shell-query-timecritical-spec.js b/tests/js/common/shell/shell-query-timecritical-spec.js similarity index 100% rename from tests/js/common/tests/shell/shell-query-timecritical-spec.js rename to tests/js/common/shell/shell-query-timecritical-spec.js diff --git a/tests/js/common/tests/shell/shell-quickie.js b/tests/js/common/shell/shell-quickie.js similarity index 100% rename from tests/js/common/tests/shell/shell-quickie.js rename to tests/js/common/shell/shell-quickie.js diff --git a/tests/js/common/tests/shell/shell-rename-noncluster.js b/tests/js/common/shell/shell-rename-noncluster.js similarity index 100% rename from tests/js/common/tests/shell/shell-rename-noncluster.js rename to tests/js/common/shell/shell-rename-noncluster.js diff --git a/tests/js/common/tests/shell/shell-require.js b/tests/js/common/shell/shell-require.js similarity index 100% rename from tests/js/common/tests/shell/shell-require.js rename to tests/js/common/shell/shell-require.js diff --git a/tests/js/common/tests/shell/shell-simple-query.js b/tests/js/common/shell/shell-simple-query.js similarity index 100% rename from tests/js/common/tests/shell/shell-simple-query.js rename to tests/js/common/shell/shell-simple-query.js diff --git a/tests/js/common/tests/shell/shell-statement-cluster.js b/tests/js/common/shell/shell-statement-cluster.js similarity index 100% rename from tests/js/common/tests/shell/shell-statement-cluster.js rename to tests/js/common/shell/shell-statement-cluster.js diff --git a/tests/js/common/tests/shell/shell-statement-encoding-noncluster.js b/tests/js/common/shell/shell-statement-encoding-noncluster.js similarity index 99% rename from tests/js/common/tests/shell/shell-statement-encoding-noncluster.js rename to tests/js/common/shell/shell-statement-encoding-noncluster.js index a33fcd3caa..6687d0acaa 100644 --- a/tests/js/common/tests/shell/shell-statement-encoding-noncluster.js +++ b/tests/js/common/shell/shell-statement-encoding-noncluster.js @@ -42,7 +42,7 @@ function StatementResultEncodingSuite () { "use strict"; var c = null; - var countries = JSON.parse(require("fs").read(pathForTesting('common/tests/countries.json'))); + var countries = JSON.parse(require("fs").read(pathForTesting('common/countries.json'))); return { diff --git a/tests/js/common/tests/shell/shell-statement-noncluster.js b/tests/js/common/shell/shell-statement-noncluster.js similarity index 100% rename from tests/js/common/tests/shell/shell-statement-noncluster.js rename to tests/js/common/shell/shell-statement-noncluster.js diff --git a/tests/js/common/tests/shell/shell-statement.js b/tests/js/common/shell/shell-statement.js similarity index 100% rename from tests/js/common/tests/shell/shell-statement.js rename to tests/js/common/shell/shell-statement.js diff --git a/tests/js/common/tests/shell/shell-tasks-timecritical.js b/tests/js/common/shell/shell-tasks-timecritical.js similarity index 100% rename from tests/js/common/tests/shell/shell-tasks-timecritical.js rename to tests/js/common/shell/shell-tasks-timecritical.js diff --git a/tests/js/common/tests/shell/shell-transactions-noncluster.js b/tests/js/common/shell/shell-transactions-noncluster.js similarity index 100% rename from tests/js/common/tests/shell/shell-transactions-noncluster.js rename to tests/js/common/shell/shell-transactions-noncluster.js diff --git a/tests/js/common/tests/shell/shell-transactions-rocksdb-noncluster.js b/tests/js/common/shell/shell-transactions-rocksdb-noncluster.js similarity index 100% rename from tests/js/common/tests/shell/shell-transactions-rocksdb-noncluster.js rename to tests/js/common/shell/shell-transactions-rocksdb-noncluster.js diff --git a/tests/js/common/tests/shell/shell-transactions.js b/tests/js/common/shell/shell-transactions.js similarity index 100% rename from tests/js/common/tests/shell/shell-transactions.js rename to tests/js/common/shell/shell-transactions.js diff --git a/tests/js/common/tests/shell/shell-unique-constraint.js b/tests/js/common/shell/shell-unique-constraint.js similarity index 100% rename from tests/js/common/tests/shell/shell-unique-constraint.js rename to tests/js/common/shell/shell-unique-constraint.js diff --git a/tests/js/common/tests/shell/shell-unique-index-cluster.js b/tests/js/common/shell/shell-unique-index-cluster.js similarity index 100% rename from tests/js/common/tests/shell/shell-unique-index-cluster.js rename to tests/js/common/shell/shell-unique-index-cluster.js diff --git a/tests/js/common/tests/shell/shell-unload.js b/tests/js/common/shell/shell-unload.js similarity index 100% rename from tests/js/common/tests/shell/shell-unload.js rename to tests/js/common/shell/shell-unload.js diff --git a/tests/js/common/tests/shell/shell-users.js b/tests/js/common/shell/shell-users.js similarity index 100% rename from tests/js/common/tests/shell/shell-users.js rename to tests/js/common/shell/shell-users.js diff --git a/tests/js/common/tests/shell/shell-util-spec.js b/tests/js/common/shell/shell-util-spec.js similarity index 100% rename from tests/js/common/tests/shell/shell-util-spec.js rename to tests/js/common/shell/shell-util-spec.js diff --git a/tests/js/common/tests/shell/shell-v8.js b/tests/js/common/shell/shell-v8.js similarity index 100% rename from tests/js/common/tests/shell/shell-v8.js rename to tests/js/common/shell/shell-v8.js diff --git a/tests/js/common/tests/shell/shell-view-arangosearch-link-noncluster.js b/tests/js/common/shell/shell-view-arangosearch-link-noncluster.js similarity index 100% rename from tests/js/common/tests/shell/shell-view-arangosearch-link-noncluster.js rename to tests/js/common/shell/shell-view-arangosearch-link-noncluster.js diff --git a/tests/js/common/tests/shell/shell-view-arangosearch-noncluster.js b/tests/js/common/shell/shell-view-arangosearch-noncluster.js similarity index 100% rename from tests/js/common/tests/shell/shell-view-arangosearch-noncluster.js rename to tests/js/common/shell/shell-view-arangosearch-noncluster.js diff --git a/tests/js/server/tests/README b/tests/js/server/README similarity index 100% rename from tests/js/server/tests/README rename to tests/js/server/README diff --git a/tests/js/server/tests/aql/aql-arithmetic.js b/tests/js/server/aql/aql-arithmetic.js similarity index 100% rename from tests/js/server/tests/aql/aql-arithmetic.js rename to tests/js/server/aql/aql-arithmetic.js diff --git a/tests/js/server/tests/aql/aql-array-access.js b/tests/js/server/aql/aql-array-access.js similarity index 100% rename from tests/js/server/tests/aql/aql-array-access.js rename to tests/js/server/aql/aql-array-access.js diff --git a/tests/js/server/tests/aql/aql-attribute-access.js b/tests/js/server/aql/aql-attribute-access.js similarity index 100% rename from tests/js/server/tests/aql/aql-attribute-access.js rename to tests/js/server/aql/aql-attribute-access.js diff --git a/tests/js/server/tests/aql/aql-bind.js b/tests/js/server/aql/aql-bind.js similarity index 100% rename from tests/js/server/tests/aql/aql-bind.js rename to tests/js/server/aql/aql-bind.js diff --git a/tests/js/server/tests/aql/aql-call-apply.js b/tests/js/server/aql/aql-call-apply.js similarity index 100% rename from tests/js/server/tests/aql/aql-call-apply.js rename to tests/js/server/aql/aql-call-apply.js diff --git a/tests/js/server/tests/aql/aql-complex.js b/tests/js/server/aql/aql-complex.js similarity index 100% rename from tests/js/server/tests/aql/aql-complex.js rename to tests/js/server/aql/aql-complex.js diff --git a/tests/js/server/tests/aql/aql-cross.js b/tests/js/server/aql/aql-cross.js similarity index 100% rename from tests/js/server/tests/aql/aql-cross.js rename to tests/js/server/aql/aql-cross.js diff --git a/tests/js/server/tests/aql/aql-distance.js b/tests/js/server/aql/aql-distance.js similarity index 100% rename from tests/js/server/tests/aql/aql-distance.js rename to tests/js/server/aql/aql-distance.js diff --git a/tests/js/server/tests/aql/aql-distinct.js b/tests/js/server/aql/aql-distinct.js similarity index 100% rename from tests/js/server/tests/aql/aql-distinct.js rename to tests/js/server/aql/aql-distinct.js diff --git a/tests/js/server/tests/aql/aql-document.js b/tests/js/server/aql/aql-document.js similarity index 100% rename from tests/js/server/tests/aql/aql-document.js rename to tests/js/server/aql/aql-document.js diff --git a/tests/js/server/tests/aql/aql-dynamic-attributes.js b/tests/js/server/aql/aql-dynamic-attributes.js similarity index 100% rename from tests/js/server/tests/aql/aql-dynamic-attributes.js rename to tests/js/server/aql/aql-dynamic-attributes.js diff --git a/tests/js/server/tests/aql/aql-edges-cluster.js b/tests/js/server/aql/aql-edges-cluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-edges-cluster.js rename to tests/js/server/aql/aql-edges-cluster.js diff --git a/tests/js/server/tests/aql/aql-edges-noncluster.js b/tests/js/server/aql/aql-edges-noncluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-edges-noncluster.js rename to tests/js/server/aql/aql-edges-noncluster.js diff --git a/tests/js/server/tests/aql/aql-escaping.js b/tests/js/server/aql/aql-escaping.js similarity index 100% rename from tests/js/server/tests/aql/aql-escaping.js rename to tests/js/server/aql/aql-escaping.js diff --git a/tests/js/server/tests/aql/aql-explain-cluster.js b/tests/js/server/aql/aql-explain-cluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-explain-cluster.js rename to tests/js/server/aql/aql-explain-cluster.js diff --git a/tests/js/server/tests/aql/aql-explain-noncluster.js b/tests/js/server/aql/aql-explain-noncluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-explain-noncluster.js rename to tests/js/server/aql/aql-explain-noncluster.js diff --git a/tests/js/server/tests/aql/aql-fail-on-warning.js b/tests/js/server/aql/aql-fail-on-warning.js similarity index 100% rename from tests/js/server/tests/aql/aql-fail-on-warning.js rename to tests/js/server/aql/aql-fail-on-warning.js diff --git a/tests/js/server/tests/aql/aql-failures-noncluster.js b/tests/js/server/aql/aql-failures-noncluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-failures-noncluster.js rename to tests/js/server/aql/aql-failures-noncluster.js diff --git a/tests/js/server/tests/aql/aql-fullcount.js b/tests/js/server/aql/aql-fullcount.js similarity index 100% rename from tests/js/server/tests/aql/aql-fullcount.js rename to tests/js/server/aql/aql-fullcount.js diff --git a/tests/js/server/tests/aql/aql-functions-brute.js b/tests/js/server/aql/aql-functions-brute.js similarity index 100% rename from tests/js/server/tests/aql/aql-functions-brute.js rename to tests/js/server/aql/aql-functions-brute.js diff --git a/tests/js/server/tests/aql/aql-functions-date.js b/tests/js/server/aql/aql-functions-date.js similarity index 100% rename from tests/js/server/tests/aql/aql-functions-date.js rename to tests/js/server/aql/aql-functions-date.js diff --git a/tests/js/server/tests/aql/aql-functions-list.js b/tests/js/server/aql/aql-functions-list.js similarity index 100% rename from tests/js/server/tests/aql/aql-functions-list.js rename to tests/js/server/aql/aql-functions-list.js diff --git a/tests/js/server/tests/aql/aql-functions-misc.js b/tests/js/server/aql/aql-functions-misc.js similarity index 100% rename from tests/js/server/tests/aql/aql-functions-misc.js rename to tests/js/server/aql/aql-functions-misc.js diff --git a/tests/js/server/tests/aql/aql-functions-numeric.js b/tests/js/server/aql/aql-functions-numeric.js similarity index 100% rename from tests/js/server/tests/aql/aql-functions-numeric.js rename to tests/js/server/aql/aql-functions-numeric.js diff --git a/tests/js/server/tests/aql/aql-functions-string.js b/tests/js/server/aql/aql-functions-string.js similarity index 100% rename from tests/js/server/tests/aql/aql-functions-string.js rename to tests/js/server/aql/aql-functions-string.js diff --git a/tests/js/server/tests/aql/aql-functions-types-cxx.js b/tests/js/server/aql/aql-functions-types-cxx.js similarity index 100% rename from tests/js/server/tests/aql/aql-functions-types-cxx.js rename to tests/js/server/aql/aql-functions-types-cxx.js diff --git a/tests/js/server/tests/aql/aql-functions-types.js b/tests/js/server/aql/aql-functions-types.js similarity index 100% rename from tests/js/server/tests/aql/aql-functions-types.js rename to tests/js/server/aql/aql-functions-types.js diff --git a/tests/js/server/tests/aql/aql-functions.js b/tests/js/server/aql/aql-functions.js similarity index 100% rename from tests/js/server/tests/aql/aql-functions.js rename to tests/js/server/aql/aql-functions.js diff --git a/tests/js/server/tests/aql/aql-gather-block-cluster.js b/tests/js/server/aql/aql-gather-block-cluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-gather-block-cluster.js rename to tests/js/server/aql/aql-gather-block-cluster.js diff --git a/tests/js/server/tests/aql/aql-general-graph-28.js b/tests/js/server/aql/aql-general-graph-28.js similarity index 100% rename from tests/js/server/tests/aql/aql-general-graph-28.js rename to tests/js/server/aql/aql-general-graph-28.js diff --git a/tests/js/server/tests/aql/aql-general-graph.js b/tests/js/server/aql/aql-general-graph.js similarity index 100% rename from tests/js/server/tests/aql/aql-general-graph.js rename to tests/js/server/aql/aql-general-graph.js diff --git a/tests/js/server/tests/aql/aql-graph-traverser-mmfiles.js b/tests/js/server/aql/aql-graph-traverser-mmfiles.js similarity index 100% rename from tests/js/server/tests/aql/aql-graph-traverser-mmfiles.js rename to tests/js/server/aql/aql-graph-traverser-mmfiles.js diff --git a/tests/js/server/tests/aql/aql-graph-traverser.js b/tests/js/server/aql/aql-graph-traverser.js similarity index 100% rename from tests/js/server/tests/aql/aql-graph-traverser.js rename to tests/js/server/aql/aql-graph-traverser.js diff --git a/tests/js/server/tests/aql/aql-graph.js b/tests/js/server/aql/aql-graph.js similarity index 100% rename from tests/js/server/tests/aql/aql-graph.js rename to tests/js/server/aql/aql-graph.js diff --git a/tests/js/server/tests/aql/aql-hash-cluster.js b/tests/js/server/aql/aql-hash-cluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-hash-cluster.js rename to tests/js/server/aql/aql-hash-cluster.js diff --git a/tests/js/server/tests/aql/aql-hash-noncluster.js b/tests/js/server/aql/aql-hash-noncluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-hash-noncluster.js rename to tests/js/server/aql/aql-hash-noncluster.js diff --git a/tests/js/server/tests/aql/aql-is-in-polygon.js b/tests/js/server/aql/aql-is-in-polygon.js similarity index 100% rename from tests/js/server/tests/aql/aql-is-in-polygon.js rename to tests/js/server/aql/aql-is-in-polygon.js diff --git a/tests/js/server/tests/aql/aql-join-cluster.js b/tests/js/server/aql/aql-join-cluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-join-cluster.js rename to tests/js/server/aql/aql-join-cluster.js diff --git a/tests/js/server/tests/aql/aql-logical.js b/tests/js/server/aql/aql-logical.js similarity index 100% rename from tests/js/server/tests/aql/aql-logical.js rename to tests/js/server/aql/aql-logical.js diff --git a/tests/js/server/tests/aql/aql-memory-limit.js b/tests/js/server/aql/aql-memory-limit.js similarity index 100% rename from tests/js/server/tests/aql/aql-memory-limit.js rename to tests/js/server/aql/aql-memory-limit.js diff --git a/tests/js/server/tests/aql/aql-modify-cluster.js b/tests/js/server/aql/aql-modify-cluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-modify-cluster.js rename to tests/js/server/aql/aql-modify-cluster.js diff --git a/tests/js/server/tests/aql/aql-modify-noncluster-serializetest.js b/tests/js/server/aql/aql-modify-noncluster-serializetest.js similarity index 100% rename from tests/js/server/tests/aql/aql-modify-noncluster-serializetest.js rename to tests/js/server/aql/aql-modify-noncluster-serializetest.js diff --git a/tests/js/server/tests/aql/aql-modify-noncluster.js b/tests/js/server/aql/aql-modify-noncluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-modify-noncluster.js rename to tests/js/server/aql/aql-modify-noncluster.js diff --git a/tests/js/server/tests/aql/aql-modify-subqueries.js b/tests/js/server/aql/aql-modify-subqueries.js similarity index 100% rename from tests/js/server/tests/aql/aql-modify-subqueries.js rename to tests/js/server/aql/aql-modify-subqueries.js diff --git a/tests/js/server/tests/aql/aql-modify.js b/tests/js/server/aql/aql-modify.js similarity index 100% rename from tests/js/server/tests/aql/aql-modify.js rename to tests/js/server/aql/aql-modify.js diff --git a/tests/js/server/tests/aql/aql-multi-modify.js b/tests/js/server/aql/aql-multi-modify.js similarity index 100% rename from tests/js/server/tests/aql/aql-multi-modify.js rename to tests/js/server/aql/aql-multi-modify.js diff --git a/tests/js/server/tests/aql/aql-operators.js b/tests/js/server/aql/aql-operators.js similarity index 100% rename from tests/js/server/tests/aql/aql-operators.js rename to tests/js/server/aql/aql-operators.js diff --git a/tests/js/server/tests/aql/aql-optimizer-collect-aggregate.js b/tests/js/server/aql/aql-optimizer-collect-aggregate.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-collect-aggregate.js rename to tests/js/server/aql/aql-optimizer-collect-aggregate.js diff --git a/tests/js/server/tests/aql/aql-optimizer-collect-count.js b/tests/js/server/aql/aql-optimizer-collect-count.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-collect-count.js rename to tests/js/server/aql/aql-optimizer-collect-count.js diff --git a/tests/js/server/tests/aql/aql-optimizer-collect-into.js b/tests/js/server/aql/aql-optimizer-collect-into.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-collect-into.js rename to tests/js/server/aql/aql-optimizer-collect-into.js diff --git a/tests/js/server/tests/aql/aql-optimizer-collect-methods.js b/tests/js/server/aql/aql-optimizer-collect-methods.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-collect-methods.js rename to tests/js/server/aql/aql-optimizer-collect-methods.js diff --git a/tests/js/server/tests/aql/aql-optimizer-condition.js b/tests/js/server/aql/aql-optimizer-condition.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-condition.js rename to tests/js/server/aql/aql-optimizer-condition.js diff --git a/tests/js/server/tests/aql/aql-optimizer-costs.js b/tests/js/server/aql/aql-optimizer-costs.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-costs.js rename to tests/js/server/aql/aql-optimizer-costs.js diff --git a/tests/js/server/tests/aql/aql-optimizer-dynamic-bounds.js b/tests/js/server/aql/aql-optimizer-dynamic-bounds.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-dynamic-bounds.js rename to tests/js/server/aql/aql-optimizer-dynamic-bounds.js diff --git a/tests/js/server/tests/aql/aql-optimizer-edge-index.js b/tests/js/server/aql/aql-optimizer-edge-index.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-edge-index.js rename to tests/js/server/aql/aql-optimizer-edge-index.js diff --git a/tests/js/server/tests/aql/aql-optimizer-filters.js b/tests/js/server/aql/aql-optimizer-filters.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-filters.js rename to tests/js/server/aql/aql-optimizer-filters.js diff --git a/tests/js/server/tests/aql/aql-optimizer-fulltext.js b/tests/js/server/aql/aql-optimizer-fulltext.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-fulltext.js rename to tests/js/server/aql/aql-optimizer-fulltext.js diff --git a/tests/js/server/tests/aql/aql-optimizer-geoindex.js b/tests/js/server/aql/aql-optimizer-geoindex.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-geoindex.js rename to tests/js/server/aql/aql-optimizer-geoindex.js diff --git a/tests/js/server/tests/aql/aql-optimizer-index-only-rocksdb.js b/tests/js/server/aql/aql-optimizer-index-only-rocksdb.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-index-only-rocksdb.js rename to tests/js/server/aql/aql-optimizer-index-only-rocksdb.js diff --git a/tests/js/server/tests/aql/aql-optimizer-index-ranges.js b/tests/js/server/aql/aql-optimizer-index-ranges.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-index-ranges.js rename to tests/js/server/aql/aql-optimizer-index-ranges.js diff --git a/tests/js/server/tests/aql/aql-optimizer-indexes-in-or.js b/tests/js/server/aql/aql-optimizer-indexes-in-or.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-indexes-in-or.js rename to tests/js/server/aql/aql-optimizer-indexes-in-or.js diff --git a/tests/js/server/tests/aql/aql-optimizer-indexes-multi.js b/tests/js/server/aql/aql-optimizer-indexes-multi.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-indexes-multi.js rename to tests/js/server/aql/aql-optimizer-indexes-multi.js diff --git a/tests/js/server/tests/aql/aql-optimizer-indexes-sort.js b/tests/js/server/aql/aql-optimizer-indexes-sort.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-indexes-sort.js rename to tests/js/server/aql/aql-optimizer-indexes-sort.js diff --git a/tests/js/server/tests/aql/aql-optimizer-indexes.js b/tests/js/server/aql/aql-optimizer-indexes.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-indexes.js rename to tests/js/server/aql/aql-optimizer-indexes.js diff --git a/tests/js/server/tests/aql/aql-optimizer-keep.js b/tests/js/server/aql/aql-optimizer-keep.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-keep.js rename to tests/js/server/aql/aql-optimizer-keep.js diff --git a/tests/js/server/tests/aql/aql-optimizer-operators.js b/tests/js/server/aql/aql-optimizer-operators.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-operators.js rename to tests/js/server/aql/aql-optimizer-operators.js diff --git a/tests/js/server/tests/aql/aql-optimizer-optimize-cluster-single-document-operations.js b/tests/js/server/aql/aql-optimizer-optimize-cluster-single-document-operations.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-optimize-cluster-single-document-operations.js rename to tests/js/server/aql/aql-optimizer-optimize-cluster-single-document-operations.js diff --git a/tests/js/server/tests/aql/aql-optimizer-plans.js b/tests/js/server/aql/aql-optimizer-plans.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-plans.js rename to tests/js/server/aql/aql-optimizer-plans.js diff --git a/tests/js/server/tests/aql/aql-optimizer-produces-result.js b/tests/js/server/aql/aql-optimizer-produces-result.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-produces-result.js rename to tests/js/server/aql/aql-optimizer-produces-result.js diff --git a/tests/js/server/tests/aql/aql-optimizer-quantifiers.js b/tests/js/server/aql/aql-optimizer-quantifiers.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-quantifiers.js rename to tests/js/server/aql/aql-optimizer-quantifiers.js diff --git a/tests/js/server/tests/aql/aql-optimizer-rule-distribute-in-cluster.js b/tests/js/server/aql/aql-optimizer-rule-distribute-in-cluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-rule-distribute-in-cluster.js rename to tests/js/server/aql/aql-optimizer-rule-distribute-in-cluster.js diff --git a/tests/js/server/tests/aql/aql-optimizer-rule-inline-subqueries.js b/tests/js/server/aql/aql-optimizer-rule-inline-subqueries.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-rule-inline-subqueries.js rename to tests/js/server/aql/aql-optimizer-rule-inline-subqueries.js diff --git a/tests/js/server/tests/aql/aql-optimizer-rule-interchange-adjacent-enumerations-cluster.js b/tests/js/server/aql/aql-optimizer-rule-interchange-adjacent-enumerations-cluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-rule-interchange-adjacent-enumerations-cluster.js rename to tests/js/server/aql/aql-optimizer-rule-interchange-adjacent-enumerations-cluster.js diff --git a/tests/js/server/tests/aql/aql-optimizer-rule-interchange-adjacent-enumerations-noncluster.js b/tests/js/server/aql/aql-optimizer-rule-interchange-adjacent-enumerations-noncluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-rule-interchange-adjacent-enumerations-noncluster.js rename to tests/js/server/aql/aql-optimizer-rule-interchange-adjacent-enumerations-noncluster.js diff --git a/tests/js/server/tests/aql/aql-optimizer-rule-move-calculations-down.js b/tests/js/server/aql/aql-optimizer-rule-move-calculations-down.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-rule-move-calculations-down.js rename to tests/js/server/aql/aql-optimizer-rule-move-calculations-down.js diff --git a/tests/js/server/tests/aql/aql-optimizer-rule-move-calculations-up.js b/tests/js/server/aql/aql-optimizer-rule-move-calculations-up.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-rule-move-calculations-up.js rename to tests/js/server/aql/aql-optimizer-rule-move-calculations-up.js diff --git a/tests/js/server/tests/aql/aql-optimizer-rule-move-filters-up.js b/tests/js/server/aql/aql-optimizer-rule-move-filters-up.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-rule-move-filters-up.js rename to tests/js/server/aql/aql-optimizer-rule-move-filters-up.js diff --git a/tests/js/server/tests/aql/aql-optimizer-rule-optimize-subqueries.js b/tests/js/server/aql/aql-optimizer-rule-optimize-subqueries.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-rule-optimize-subqueries.js rename to tests/js/server/aql/aql-optimizer-rule-optimize-subqueries.js diff --git a/tests/js/server/tests/aql/aql-optimizer-rule-optimize-traversals-spec.js b/tests/js/server/aql/aql-optimizer-rule-optimize-traversals-spec.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-rule-optimize-traversals-spec.js rename to tests/js/server/aql/aql-optimizer-rule-optimize-traversals-spec.js diff --git a/tests/js/server/tests/aql/aql-optimizer-rule-patch-update-statements.js b/tests/js/server/aql/aql-optimizer-rule-patch-update-statements.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-rule-patch-update-statements.js rename to tests/js/server/aql/aql-optimizer-rule-patch-update-statements.js diff --git a/tests/js/server/tests/aql/aql-optimizer-rule-reduce-extraction-to-projection-rocksdb.js b/tests/js/server/aql/aql-optimizer-rule-reduce-extraction-to-projection-rocksdb.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-rule-reduce-extraction-to-projection-rocksdb.js rename to tests/js/server/aql/aql-optimizer-rule-reduce-extraction-to-projection-rocksdb.js diff --git a/tests/js/server/tests/aql/aql-optimizer-rule-remove-collect-variables.js b/tests/js/server/aql/aql-optimizer-rule-remove-collect-variables.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-rule-remove-collect-variables.js rename to tests/js/server/aql/aql-optimizer-rule-remove-collect-variables.js diff --git a/tests/js/server/tests/aql/aql-optimizer-rule-remove-filter-covered-by-index.js b/tests/js/server/aql/aql-optimizer-rule-remove-filter-covered-by-index.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-rule-remove-filter-covered-by-index.js rename to tests/js/server/aql/aql-optimizer-rule-remove-filter-covered-by-index.js diff --git a/tests/js/server/tests/aql/aql-optimizer-rule-remove-filter-covered-by-traversal-spec.js b/tests/js/server/aql/aql-optimizer-rule-remove-filter-covered-by-traversal-spec.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-rule-remove-filter-covered-by-traversal-spec.js rename to tests/js/server/aql/aql-optimizer-rule-remove-filter-covered-by-traversal-spec.js diff --git a/tests/js/server/tests/aql/aql-optimizer-rule-remove-redundant-calculations.js b/tests/js/server/aql/aql-optimizer-rule-remove-redundant-calculations.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-rule-remove-redundant-calculations.js rename to tests/js/server/aql/aql-optimizer-rule-remove-redundant-calculations.js diff --git a/tests/js/server/tests/aql/aql-optimizer-rule-remove-redundant-or.js b/tests/js/server/aql/aql-optimizer-rule-remove-redundant-or.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-rule-remove-redundant-or.js rename to tests/js/server/aql/aql-optimizer-rule-remove-redundant-or.js diff --git a/tests/js/server/tests/aql/aql-optimizer-rule-remove-redundant-sorts.js b/tests/js/server/aql/aql-optimizer-rule-remove-redundant-sorts.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-rule-remove-redundant-sorts.js rename to tests/js/server/aql/aql-optimizer-rule-remove-redundant-sorts.js diff --git a/tests/js/server/tests/aql/aql-optimizer-rule-remove-sort-rand-mmfiles.js b/tests/js/server/aql/aql-optimizer-rule-remove-sort-rand-mmfiles.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-rule-remove-sort-rand-mmfiles.js rename to tests/js/server/aql/aql-optimizer-rule-remove-sort-rand-mmfiles.js diff --git a/tests/js/server/tests/aql/aql-optimizer-rule-remove-unnecessary-calculations.js b/tests/js/server/aql/aql-optimizer-rule-remove-unnecessary-calculations.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-rule-remove-unnecessary-calculations.js rename to tests/js/server/aql/aql-optimizer-rule-remove-unnecessary-calculations.js diff --git a/tests/js/server/tests/aql/aql-optimizer-rule-remove-unnecessary-filters.js b/tests/js/server/aql/aql-optimizer-rule-remove-unnecessary-filters.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-rule-remove-unnecessary-filters.js rename to tests/js/server/aql/aql-optimizer-rule-remove-unnecessary-filters.js diff --git a/tests/js/server/tests/aql/aql-optimizer-rule-remove-unnecessary-remote-scatter-cluster.js b/tests/js/server/aql/aql-optimizer-rule-remove-unnecessary-remote-scatter-cluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-rule-remove-unnecessary-remote-scatter-cluster.js rename to tests/js/server/aql/aql-optimizer-rule-remove-unnecessary-remote-scatter-cluster.js diff --git a/tests/js/server/tests/aql/aql-optimizer-rule-replace-or-with-in.js b/tests/js/server/aql/aql-optimizer-rule-replace-or-with-in.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-rule-replace-or-with-in.js rename to tests/js/server/aql/aql-optimizer-rule-replace-or-with-in.js diff --git a/tests/js/server/tests/aql/aql-optimizer-rule-sort-in-values.js b/tests/js/server/aql/aql-optimizer-rule-sort-in-values.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-rule-sort-in-values.js rename to tests/js/server/aql/aql-optimizer-rule-sort-in-values.js diff --git a/tests/js/server/tests/aql/aql-optimizer-rule-undistribute-remove-after-enum-coll-cluster.js b/tests/js/server/aql/aql-optimizer-rule-undistribute-remove-after-enum-coll-cluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-rule-undistribute-remove-after-enum-coll-cluster.js rename to tests/js/server/aql/aql-optimizer-rule-undistribute-remove-after-enum-coll-cluster.js diff --git a/tests/js/server/tests/aql/aql-optimizer-rule-use-index-for-sort.js b/tests/js/server/aql/aql-optimizer-rule-use-index-for-sort.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-rule-use-index-for-sort.js rename to tests/js/server/aql/aql-optimizer-rule-use-index-for-sort.js diff --git a/tests/js/server/tests/aql/aql-optimizer-rule-use-index-range.js b/tests/js/server/aql/aql-optimizer-rule-use-index-range.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-rule-use-index-range.js rename to tests/js/server/aql/aql-optimizer-rule-use-index-range.js diff --git a/tests/js/server/tests/aql/aql-optimizer-stats-noncluster.js b/tests/js/server/aql/aql-optimizer-stats-noncluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-stats-noncluster.js rename to tests/js/server/aql/aql-optimizer-stats-noncluster.js diff --git a/tests/js/server/tests/aql/aql-optimizer-useindexes.js b/tests/js/server/aql/aql-optimizer-useindexes.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-useindexes.js rename to tests/js/server/aql/aql-optimizer-useindexes.js diff --git a/tests/js/server/tests/aql/aql-optimizer-v8.js b/tests/js/server/aql/aql-optimizer-v8.js similarity index 100% rename from tests/js/server/tests/aql/aql-optimizer-v8.js rename to tests/js/server/aql/aql-optimizer-v8.js diff --git a/tests/js/server/tests/aql/aql-parse.js b/tests/js/server/aql/aql-parse.js similarity index 100% rename from tests/js/server/tests/aql/aql-parse.js rename to tests/js/server/aql/aql-parse.js diff --git a/tests/js/server/tests/aql/aql-primary-index-cluster.js b/tests/js/server/aql/aql-primary-index-cluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-primary-index-cluster.js rename to tests/js/server/aql/aql-primary-index-cluster.js diff --git a/tests/js/server/tests/aql/aql-primary-index-noncluster.js b/tests/js/server/aql/aql-primary-index-noncluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-primary-index-noncluster.js rename to tests/js/server/aql/aql-primary-index-noncluster.js diff --git a/tests/js/server/tests/aql/aql-profiler-noncluster-nightly.js b/tests/js/server/aql/aql-profiler-noncluster-nightly.js similarity index 100% rename from tests/js/server/tests/aql/aql-profiler-noncluster-nightly.js rename to tests/js/server/aql/aql-profiler-noncluster-nightly.js diff --git a/tests/js/server/tests/aql/aql-profiler-noncluster.js b/tests/js/server/aql/aql-profiler-noncluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-profiler-noncluster.js rename to tests/js/server/aql/aql-profiler-noncluster.js diff --git a/tests/js/server/tests/aql/aql-profiler.js b/tests/js/server/aql/aql-profiler.js similarity index 100% rename from tests/js/server/tests/aql/aql-profiler.js rename to tests/js/server/aql/aql-profiler.js diff --git a/tests/js/server/tests/aql/aql-queries-array-nested.js b/tests/js/server/aql/aql-queries-array-nested.js similarity index 100% rename from tests/js/server/tests/aql/aql-queries-array-nested.js rename to tests/js/server/aql/aql-queries-array-nested.js diff --git a/tests/js/server/tests/aql/aql-queries-array.js b/tests/js/server/aql/aql-queries-array.js similarity index 100% rename from tests/js/server/tests/aql/aql-queries-array.js rename to tests/js/server/aql/aql-queries-array.js diff --git a/tests/js/server/tests/aql/aql-queries-collection.js b/tests/js/server/aql/aql-queries-collection.js similarity index 100% rename from tests/js/server/tests/aql/aql-queries-collection.js rename to tests/js/server/aql/aql-queries-collection.js diff --git a/tests/js/server/tests/aql/aql-queries-document.js b/tests/js/server/aql/aql-queries-document.js similarity index 100% rename from tests/js/server/tests/aql/aql-queries-document.js rename to tests/js/server/aql/aql-queries-document.js diff --git a/tests/js/server/tests/aql/aql-queries-fulltext.js b/tests/js/server/aql/aql-queries-fulltext.js similarity index 100% rename from tests/js/server/tests/aql/aql-queries-fulltext.js rename to tests/js/server/aql/aql-queries-fulltext.js diff --git a/tests/js/server/tests/aql/aql-queries-geo.js b/tests/js/server/aql/aql-queries-geo.js similarity index 100% rename from tests/js/server/tests/aql/aql-queries-geo.js rename to tests/js/server/aql/aql-queries-geo.js diff --git a/tests/js/server/tests/aql/aql-queries-noncollection.js b/tests/js/server/aql/aql-queries-noncollection.js similarity index 100% rename from tests/js/server/tests/aql/aql-queries-noncollection.js rename to tests/js/server/aql/aql-queries-noncollection.js diff --git a/tests/js/server/tests/aql/aql-queries-optimizer-in-cluster.js b/tests/js/server/aql/aql-queries-optimizer-in-cluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-queries-optimizer-in-cluster.js rename to tests/js/server/aql/aql-queries-optimizer-in-cluster.js diff --git a/tests/js/server/tests/aql/aql-queries-optimizer-in-noncluster.js b/tests/js/server/aql/aql-queries-optimizer-in-noncluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-queries-optimizer-in-noncluster.js rename to tests/js/server/aql/aql-queries-optimizer-in-noncluster.js diff --git a/tests/js/server/tests/aql/aql-queries-optimizer-limit-cluster.js b/tests/js/server/aql/aql-queries-optimizer-limit-cluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-queries-optimizer-limit-cluster.js rename to tests/js/server/aql/aql-queries-optimizer-limit-cluster.js diff --git a/tests/js/server/tests/aql/aql-queries-optimizer-limit-noncluster.js b/tests/js/server/aql/aql-queries-optimizer-limit-noncluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-queries-optimizer-limit-noncluster.js rename to tests/js/server/aql/aql-queries-optimizer-limit-noncluster.js diff --git a/tests/js/server/tests/aql/aql-queries-optimizer-ref-cluster.js b/tests/js/server/aql/aql-queries-optimizer-ref-cluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-queries-optimizer-ref-cluster.js rename to tests/js/server/aql/aql-queries-optimizer-ref-cluster.js diff --git a/tests/js/server/tests/aql/aql-queries-optimizer-ref-noncluster.js b/tests/js/server/aql/aql-queries-optimizer-ref-noncluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-queries-optimizer-ref-noncluster.js rename to tests/js/server/aql/aql-queries-optimizer-ref-noncluster.js diff --git a/tests/js/server/tests/aql/aql-queries-optimizer-sort-cluster.js b/tests/js/server/aql/aql-queries-optimizer-sort-cluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-queries-optimizer-sort-cluster.js rename to tests/js/server/aql/aql-queries-optimizer-sort-cluster.js diff --git a/tests/js/server/tests/aql/aql-queries-optimizer-sort-noncluster.js b/tests/js/server/aql/aql-queries-optimizer-sort-noncluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-queries-optimizer-sort-noncluster.js rename to tests/js/server/aql/aql-queries-optimizer-sort-noncluster.js diff --git a/tests/js/server/tests/aql/aql-queries-optimizer.js b/tests/js/server/aql/aql-queries-optimizer.js similarity index 100% rename from tests/js/server/tests/aql/aql-queries-optimizer.js rename to tests/js/server/aql/aql-queries-optimizer.js diff --git a/tests/js/server/tests/aql/aql-queries-simple.js b/tests/js/server/aql/aql-queries-simple.js similarity index 100% rename from tests/js/server/tests/aql/aql-queries-simple.js rename to tests/js/server/aql/aql-queries-simple.js diff --git a/tests/js/server/tests/aql/aql-queries-variables.js b/tests/js/server/aql/aql-queries-variables.js similarity index 100% rename from tests/js/server/tests/aql/aql-queries-variables.js rename to tests/js/server/aql/aql-queries-variables.js diff --git a/tests/js/server/tests/aql/aql-query-cache-noncluster.js b/tests/js/server/aql/aql-query-cache-noncluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-query-cache-noncluster.js rename to tests/js/server/aql/aql-query-cache-noncluster.js diff --git a/tests/js/server/tests/aql/aql-range.js b/tests/js/server/aql/aql-range.js similarity index 100% rename from tests/js/server/tests/aql/aql-range.js rename to tests/js/server/aql/aql-range.js diff --git a/tests/js/server/tests/aql/aql-ranges-combined-01.js b/tests/js/server/aql/aql-ranges-combined-01.js similarity index 100% rename from tests/js/server/tests/aql/aql-ranges-combined-01.js rename to tests/js/server/aql/aql-ranges-combined-01.js diff --git a/tests/js/server/tests/aql/aql-ranges-combined-02.js b/tests/js/server/aql/aql-ranges-combined-02.js similarity index 100% rename from tests/js/server/tests/aql/aql-ranges-combined-02.js rename to tests/js/server/aql/aql-ranges-combined-02.js diff --git a/tests/js/server/tests/aql/aql-ranges-combined-03.js b/tests/js/server/aql/aql-ranges-combined-03.js similarity index 100% rename from tests/js/server/tests/aql/aql-ranges-combined-03.js rename to tests/js/server/aql/aql-ranges-combined-03.js diff --git a/tests/js/server/tests/aql/aql-ranges-combined-04.js b/tests/js/server/aql/aql-ranges-combined-04.js similarity index 100% rename from tests/js/server/tests/aql/aql-ranges-combined-04.js rename to tests/js/server/aql/aql-ranges-combined-04.js diff --git a/tests/js/server/tests/aql/aql-ranges-combined-05.js b/tests/js/server/aql/aql-ranges-combined-05.js similarity index 100% rename from tests/js/server/tests/aql/aql-ranges-combined-05.js rename to tests/js/server/aql/aql-ranges-combined-05.js diff --git a/tests/js/server/tests/aql/aql-ranges-combined-06.js b/tests/js/server/aql/aql-ranges-combined-06.js similarity index 100% rename from tests/js/server/tests/aql/aql-ranges-combined-06.js rename to tests/js/server/aql/aql-ranges-combined-06.js diff --git a/tests/js/server/tests/aql/aql-ranges-combined-07.js b/tests/js/server/aql/aql-ranges-combined-07.js similarity index 100% rename from tests/js/server/tests/aql/aql-ranges-combined-07.js rename to tests/js/server/aql/aql-ranges-combined-07.js diff --git a/tests/js/server/tests/aql/aql-ranges-combined-08.js b/tests/js/server/aql/aql-ranges-combined-08.js similarity index 100% rename from tests/js/server/tests/aql/aql-ranges-combined-08.js rename to tests/js/server/aql/aql-ranges-combined-08.js diff --git a/tests/js/server/tests/aql/aql-ranges-combined-09.js b/tests/js/server/aql/aql-ranges-combined-09.js similarity index 100% rename from tests/js/server/tests/aql/aql-ranges-combined-09.js rename to tests/js/server/aql/aql-ranges-combined-09.js diff --git a/tests/js/server/tests/aql/aql-ranges-combined-10.js b/tests/js/server/aql/aql-ranges-combined-10.js similarity index 100% rename from tests/js/server/tests/aql/aql-ranges-combined-10.js rename to tests/js/server/aql/aql-ranges-combined-10.js diff --git a/tests/js/server/tests/aql/aql-ranges-combined-11.js b/tests/js/server/aql/aql-ranges-combined-11.js similarity index 100% rename from tests/js/server/tests/aql/aql-ranges-combined-11.js rename to tests/js/server/aql/aql-ranges-combined-11.js diff --git a/tests/js/server/tests/aql/aql-ranges-combined-12.js b/tests/js/server/aql/aql-ranges-combined-12.js similarity index 100% rename from tests/js/server/tests/aql/aql-ranges-combined-12.js rename to tests/js/server/aql/aql-ranges-combined-12.js diff --git a/tests/js/server/tests/aql/aql-ranges-combined-13.js b/tests/js/server/aql/aql-ranges-combined-13.js similarity index 100% rename from tests/js/server/tests/aql/aql-ranges-combined-13.js rename to tests/js/server/aql/aql-ranges-combined-13.js diff --git a/tests/js/server/tests/aql/aql-ranges-combined-14.js b/tests/js/server/aql/aql-ranges-combined-14.js similarity index 100% rename from tests/js/server/tests/aql/aql-ranges-combined-14.js rename to tests/js/server/aql/aql-ranges-combined-14.js diff --git a/tests/js/server/tests/aql/aql-ranges-combined-15.js b/tests/js/server/aql/aql-ranges-combined-15.js similarity index 100% rename from tests/js/server/tests/aql/aql-ranges-combined-15.js rename to tests/js/server/aql/aql-ranges-combined-15.js diff --git a/tests/js/server/tests/aql/aql-ranges-combined-16.js b/tests/js/server/aql/aql-ranges-combined-16.js similarity index 100% rename from tests/js/server/tests/aql/aql-ranges-combined-16.js rename to tests/js/server/aql/aql-ranges-combined-16.js diff --git a/tests/js/server/tests/aql/aql-ranges.js b/tests/js/server/aql/aql-ranges.js similarity index 100% rename from tests/js/server/tests/aql/aql-ranges.js rename to tests/js/server/aql/aql-ranges.js diff --git a/tests/js/server/tests/aql/aql-refaccess-attribute.js b/tests/js/server/aql/aql-refaccess-attribute.js similarity index 100% rename from tests/js/server/tests/aql/aql-refaccess-attribute.js rename to tests/js/server/aql/aql-refaccess-attribute.js diff --git a/tests/js/server/tests/aql/aql-refaccess-variable.js b/tests/js/server/aql/aql-refaccess-variable.js similarity index 100% rename from tests/js/server/tests/aql/aql-refaccess-variable.js rename to tests/js/server/aql/aql-refaccess-variable.js diff --git a/tests/js/server/tests/aql/aql-regex.js b/tests/js/server/aql/aql-regex.js similarity index 100% rename from tests/js/server/tests/aql/aql-regex.js rename to tests/js/server/aql/aql-regex.js diff --git a/tests/js/server/tests/aql/aql-relational.js b/tests/js/server/aql/aql-relational.js similarity index 100% rename from tests/js/server/tests/aql/aql-relational.js rename to tests/js/server/aql/aql-relational.js diff --git a/tests/js/server/tests/aql/aql-shardids-cluster.js b/tests/js/server/aql/aql-shardids-cluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-shardids-cluster.js rename to tests/js/server/aql/aql-shardids-cluster.js diff --git a/tests/js/server/tests/aql/aql-simple-attributes.js b/tests/js/server/aql/aql-simple-attributes.js similarity index 100% rename from tests/js/server/tests/aql/aql-simple-attributes.js rename to tests/js/server/aql/aql-simple-attributes.js diff --git a/tests/js/server/tests/aql/aql-skiplist-cluster.js b/tests/js/server/aql/aql-skiplist-cluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-skiplist-cluster.js rename to tests/js/server/aql/aql-skiplist-cluster.js diff --git a/tests/js/server/tests/aql/aql-skiplist-noncluster.js b/tests/js/server/aql/aql-skiplist-noncluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-skiplist-noncluster.js rename to tests/js/server/aql/aql-skiplist-noncluster.js diff --git a/tests/js/server/tests/aql/aql-skiplist.js b/tests/js/server/aql/aql-skiplist.js similarity index 100% rename from tests/js/server/tests/aql/aql-skiplist.js rename to tests/js/server/aql/aql-skiplist.js diff --git a/tests/js/server/tests/aql/aql-sort.js b/tests/js/server/aql/aql-sort.js similarity index 100% rename from tests/js/server/tests/aql/aql-sort.js rename to tests/js/server/aql/aql-sort.js diff --git a/tests/js/server/tests/aql/aql-sparse.js b/tests/js/server/aql/aql-sparse.js similarity index 100% rename from tests/js/server/tests/aql/aql-sparse.js rename to tests/js/server/aql/aql-sparse.js diff --git a/tests/js/server/tests/aql/aql-stresstest-nightly.js b/tests/js/server/aql/aql-stresstest-nightly.js similarity index 100% rename from tests/js/server/tests/aql/aql-stresstest-nightly.js rename to tests/js/server/aql/aql-stresstest-nightly.js diff --git a/tests/js/server/tests/aql/aql-subqueries-cluster.js b/tests/js/server/aql/aql-subqueries-cluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-subqueries-cluster.js rename to tests/js/server/aql/aql-subqueries-cluster.js diff --git a/tests/js/server/tests/aql/aql-subquery.js b/tests/js/server/aql/aql-subquery.js similarity index 100% rename from tests/js/server/tests/aql/aql-subquery.js rename to tests/js/server/aql/aql-subquery.js diff --git a/tests/js/server/tests/aql/aql-ternary.js b/tests/js/server/aql/aql-ternary.js similarity index 100% rename from tests/js/server/tests/aql/aql-ternary.js rename to tests/js/server/aql/aql-ternary.js diff --git a/tests/js/server/tests/aql/aql-upsert-cluster.js b/tests/js/server/aql/aql-upsert-cluster.js similarity index 100% rename from tests/js/server/tests/aql/aql-upsert-cluster.js rename to tests/js/server/aql/aql-upsert-cluster.js diff --git a/tests/js/server/tests/aql/aql-variables.js b/tests/js/server/aql/aql-variables.js similarity index 100% rename from tests/js/server/tests/aql/aql-variables.js rename to tests/js/server/aql/aql-variables.js diff --git a/tests/js/server/tests/aql/aql-vpack-externals.js b/tests/js/server/aql/aql-vpack-externals.js similarity index 100% rename from tests/js/server/tests/aql/aql-vpack-externals.js rename to tests/js/server/aql/aql-vpack-externals.js diff --git a/tests/js/server/tests/aql/aql-with-collections.js b/tests/js/server/aql/aql-with-collections.js similarity index 100% rename from tests/js/server/tests/aql/aql-with-collections.js rename to tests/js/server/aql/aql-with-collections.js diff --git a/tests/js/server/tests/aql/aql-within-rectangle.js b/tests/js/server/aql/aql-within-rectangle.js similarity index 100% rename from tests/js/server/tests/aql/aql-within-rectangle.js rename to tests/js/server/aql/aql-within-rectangle.js diff --git a/tests/js/server/tests/backup/backup-setup.js b/tests/js/server/backup/backup-setup.js similarity index 100% rename from tests/js/server/tests/backup/backup-setup.js rename to tests/js/server/backup/backup-setup.js diff --git a/tests/js/server/tests/backup/backup-system-excl-system.js b/tests/js/server/backup/backup-system-excl-system.js similarity index 100% rename from tests/js/server/tests/backup/backup-system-excl-system.js rename to tests/js/server/backup/backup-system-excl-system.js diff --git a/tests/js/server/tests/backup/backup-system-incl-system.js b/tests/js/server/backup/backup-system-incl-system.js similarity index 100% rename from tests/js/server/tests/backup/backup-system-incl-system.js rename to tests/js/server/backup/backup-system-incl-system.js diff --git a/tests/js/server/tests/backup/backup-teardown.js b/tests/js/server/backup/backup-teardown.js similarity index 100% rename from tests/js/server/tests/backup/backup-teardown.js rename to tests/js/server/backup/backup-teardown.js diff --git a/tests/js/server/tests/dump/check-graph.js b/tests/js/server/dump/check-graph.js similarity index 100% rename from tests/js/server/tests/dump/check-graph.js rename to tests/js/server/dump/check-graph.js diff --git a/tests/js/server/tests/dump/dump-authentication-setup.js b/tests/js/server/dump/dump-authentication-setup.js similarity index 100% rename from tests/js/server/tests/dump/dump-authentication-setup.js rename to tests/js/server/dump/dump-authentication-setup.js diff --git a/tests/js/server/tests/dump/dump-authentication.js b/tests/js/server/dump/dump-authentication.js similarity index 100% rename from tests/js/server/tests/dump/dump-authentication.js rename to tests/js/server/dump/dump-authentication.js diff --git a/tests/js/server/tests/dump/dump-cluster/_graphs.structure.json b/tests/js/server/dump/dump-cluster/_graphs.structure.json similarity index 100% rename from tests/js/server/tests/dump/dump-cluster/_graphs.structure.json rename to tests/js/server/dump/dump-cluster/_graphs.structure.json diff --git a/tests/js/server/tests/dump/dump-cluster/_graphs_c827636f2b54efb49f1f02feeeacfb01.data.json b/tests/js/server/dump/dump-cluster/_graphs_c827636f2b54efb49f1f02feeeacfb01.data.json similarity index 100% rename from tests/js/server/tests/dump/dump-cluster/_graphs_c827636f2b54efb49f1f02feeeacfb01.data.json rename to tests/js/server/dump/dump-cluster/_graphs_c827636f2b54efb49f1f02feeeacfb01.data.json diff --git a/tests/js/server/tests/dump/dump-cluster/knows.structure.json b/tests/js/server/dump/dump-cluster/knows.structure.json similarity index 100% rename from tests/js/server/tests/dump/dump-cluster/knows.structure.json rename to tests/js/server/dump/dump-cluster/knows.structure.json diff --git a/tests/js/server/tests/dump/dump-cluster/knows_6047cc85618dc1f4307e80ecfb65e5a6.data.json b/tests/js/server/dump/dump-cluster/knows_6047cc85618dc1f4307e80ecfb65e5a6.data.json similarity index 100% rename from tests/js/server/tests/dump/dump-cluster/knows_6047cc85618dc1f4307e80ecfb65e5a6.data.json rename to tests/js/server/dump/dump-cluster/knows_6047cc85618dc1f4307e80ecfb65e5a6.data.json diff --git a/tests/js/server/tests/dump/dump-cluster/persons.structure.json b/tests/js/server/dump/dump-cluster/persons.structure.json similarity index 100% rename from tests/js/server/tests/dump/dump-cluster/persons.structure.json rename to tests/js/server/dump/dump-cluster/persons.structure.json diff --git a/tests/js/server/tests/dump/dump-cluster/persons_d20dd267d55aba2427ce07f1f8b4d46e.data.json b/tests/js/server/dump/dump-cluster/persons_d20dd267d55aba2427ce07f1f8b4d46e.data.json similarity index 100% rename from tests/js/server/tests/dump/dump-cluster/persons_d20dd267d55aba2427ce07f1f8b4d46e.data.json rename to tests/js/server/dump/dump-cluster/persons_d20dd267d55aba2427ce07f1f8b4d46e.data.json diff --git a/tests/js/server/tests/dump/dump-mmfiles-cluster.js b/tests/js/server/dump/dump-mmfiles-cluster.js similarity index 100% rename from tests/js/server/tests/dump/dump-mmfiles-cluster.js rename to tests/js/server/dump/dump-mmfiles-cluster.js diff --git a/tests/js/server/tests/dump/dump-mmfiles.js b/tests/js/server/dump/dump-mmfiles.js similarity index 100% rename from tests/js/server/tests/dump/dump-mmfiles.js rename to tests/js/server/dump/dump-mmfiles.js diff --git a/tests/js/server/tests/dump/dump-rocksdb-cluster.js b/tests/js/server/dump/dump-rocksdb-cluster.js similarity index 100% rename from tests/js/server/tests/dump/dump-rocksdb-cluster.js rename to tests/js/server/dump/dump-rocksdb-cluster.js diff --git a/tests/js/server/tests/dump/dump-rocksdb.js b/tests/js/server/dump/dump-rocksdb.js similarity index 100% rename from tests/js/server/tests/dump/dump-rocksdb.js rename to tests/js/server/dump/dump-rocksdb.js diff --git a/tests/js/server/tests/dump/dump-setup-cluster.js b/tests/js/server/dump/dump-setup-cluster.js similarity index 100% rename from tests/js/server/tests/dump/dump-setup-cluster.js rename to tests/js/server/dump/dump-setup-cluster.js diff --git a/tests/js/server/tests/dump/dump-setup.js b/tests/js/server/dump/dump-setup.js similarity index 100% rename from tests/js/server/tests/dump/dump-setup.js rename to tests/js/server/dump/dump-setup.js diff --git a/tests/js/server/tests/dump/dump-singleserver/_graphs_c827636f2b54efb49f1f02feeeacfb01.data.json b/tests/js/server/dump/dump-singleserver/_graphs_c827636f2b54efb49f1f02feeeacfb01.data.json similarity index 100% rename from tests/js/server/tests/dump/dump-singleserver/_graphs_c827636f2b54efb49f1f02feeeacfb01.data.json rename to tests/js/server/dump/dump-singleserver/_graphs_c827636f2b54efb49f1f02feeeacfb01.data.json diff --git a/tests/js/server/tests/dump/dump-singleserver/_graphs_c827636f2b54efb49f1f02feeeacfb01.structure.json b/tests/js/server/dump/dump-singleserver/_graphs_c827636f2b54efb49f1f02feeeacfb01.structure.json similarity index 100% rename from tests/js/server/tests/dump/dump-singleserver/_graphs_c827636f2b54efb49f1f02feeeacfb01.structure.json rename to tests/js/server/dump/dump-singleserver/_graphs_c827636f2b54efb49f1f02feeeacfb01.structure.json diff --git a/tests/js/server/tests/dump/dump-singleserver/dump.json b/tests/js/server/dump/dump-singleserver/dump.json similarity index 100% rename from tests/js/server/tests/dump/dump-singleserver/dump.json rename to tests/js/server/dump/dump-singleserver/dump.json diff --git a/tests/js/server/tests/dump/dump-singleserver/knows_6047cc85618dc1f4307e80ecfb65e5a6.data.json b/tests/js/server/dump/dump-singleserver/knows_6047cc85618dc1f4307e80ecfb65e5a6.data.json similarity index 100% rename from tests/js/server/tests/dump/dump-singleserver/knows_6047cc85618dc1f4307e80ecfb65e5a6.data.json rename to tests/js/server/dump/dump-singleserver/knows_6047cc85618dc1f4307e80ecfb65e5a6.data.json diff --git a/tests/js/server/tests/dump/dump-singleserver/knows_6047cc85618dc1f4307e80ecfb65e5a6.structure.json b/tests/js/server/dump/dump-singleserver/knows_6047cc85618dc1f4307e80ecfb65e5a6.structure.json similarity index 100% rename from tests/js/server/tests/dump/dump-singleserver/knows_6047cc85618dc1f4307e80ecfb65e5a6.structure.json rename to tests/js/server/dump/dump-singleserver/knows_6047cc85618dc1f4307e80ecfb65e5a6.structure.json diff --git a/tests/js/server/tests/dump/dump-singleserver/persons_d20dd267d55aba2427ce07f1f8b4d46e.data.json b/tests/js/server/dump/dump-singleserver/persons_d20dd267d55aba2427ce07f1f8b4d46e.data.json similarity index 100% rename from tests/js/server/tests/dump/dump-singleserver/persons_d20dd267d55aba2427ce07f1f8b4d46e.data.json rename to tests/js/server/dump/dump-singleserver/persons_d20dd267d55aba2427ce07f1f8b4d46e.data.json diff --git a/tests/js/server/tests/dump/dump-singleserver/persons_d20dd267d55aba2427ce07f1f8b4d46e.structure.json b/tests/js/server/dump/dump-singleserver/persons_d20dd267d55aba2427ce07f1f8b4d46e.structure.json similarity index 100% rename from tests/js/server/tests/dump/dump-singleserver/persons_d20dd267d55aba2427ce07f1f8b4d46e.structure.json rename to tests/js/server/dump/dump-singleserver/persons_d20dd267d55aba2427ce07f1f8b4d46e.structure.json diff --git a/tests/js/server/tests/dump/dump-teardown-cluster.js b/tests/js/server/dump/dump-teardown-cluster.js similarity index 100% rename from tests/js/server/tests/dump/dump-teardown-cluster.js rename to tests/js/server/dump/dump-teardown-cluster.js diff --git a/tests/js/server/tests/dump/dump-teardown.js b/tests/js/server/dump/dump-teardown.js similarity index 100% rename from tests/js/server/tests/dump/dump-teardown.js rename to tests/js/server/dump/dump-teardown.js diff --git a/tests/js/server/tests/export/export-setup-cluster.js b/tests/js/server/export/export-setup-cluster.js similarity index 100% rename from tests/js/server/tests/export/export-setup-cluster.js rename to tests/js/server/export/export-setup-cluster.js diff --git a/tests/js/server/tests/export/export-setup.js b/tests/js/server/export/export-setup.js similarity index 100% rename from tests/js/server/tests/export/export-setup.js rename to tests/js/server/export/export-setup.js diff --git a/tests/js/server/tests/import/import-setup.js b/tests/js/server/import/import-setup.js similarity index 100% rename from tests/js/server/tests/import/import-setup.js rename to tests/js/server/import/import-setup.js diff --git a/tests/js/server/tests/import/import-teardown.js b/tests/js/server/import/import-teardown.js similarity index 100% rename from tests/js/server/tests/import/import-teardown.js rename to tests/js/server/import/import-teardown.js diff --git a/tests/js/server/tests/import/import.js b/tests/js/server/import/import.js similarity index 100% rename from tests/js/server/tests/import/import.js rename to tests/js/server/import/import.js diff --git a/tests/js/server/tests/recovery/applier-restart.js b/tests/js/server/recovery/applier-restart.js similarity index 100% rename from tests/js/server/tests/recovery/applier-restart.js rename to tests/js/server/recovery/applier-restart.js diff --git a/tests/js/server/tests/recovery/attributes.js b/tests/js/server/recovery/attributes.js similarity index 100% rename from tests/js/server/tests/recovery/attributes.js rename to tests/js/server/recovery/attributes.js diff --git a/tests/js/server/tests/recovery/big-transaction-durability.js b/tests/js/server/recovery/big-transaction-durability.js similarity index 100% rename from tests/js/server/tests/recovery/big-transaction-durability.js rename to tests/js/server/recovery/big-transaction-durability.js diff --git a/tests/js/server/tests/recovery/collection-drop-recreate.js b/tests/js/server/recovery/collection-drop-recreate.js similarity index 100% rename from tests/js/server/tests/recovery/collection-drop-recreate.js rename to tests/js/server/recovery/collection-drop-recreate.js diff --git a/tests/js/server/tests/recovery/collection-duplicate-name.js b/tests/js/server/recovery/collection-duplicate-name.js similarity index 100% rename from tests/js/server/tests/recovery/collection-duplicate-name.js rename to tests/js/server/recovery/collection-duplicate-name.js diff --git a/tests/js/server/tests/recovery/collection-duplicate.js b/tests/js/server/recovery/collection-duplicate.js similarity index 100% rename from tests/js/server/tests/recovery/collection-duplicate.js rename to tests/js/server/recovery/collection-duplicate.js diff --git a/tests/js/server/tests/recovery/collection-keygen-rocksdb.js b/tests/js/server/recovery/collection-keygen-rocksdb.js similarity index 100% rename from tests/js/server/tests/recovery/collection-keygen-rocksdb.js rename to tests/js/server/recovery/collection-keygen-rocksdb.js diff --git a/tests/js/server/tests/recovery/collection-keygen.js b/tests/js/server/recovery/collection-keygen.js similarity index 100% rename from tests/js/server/tests/recovery/collection-keygen.js rename to tests/js/server/recovery/collection-keygen.js diff --git a/tests/js/server/tests/recovery/collection-properties.js b/tests/js/server/recovery/collection-properties.js similarity index 100% rename from tests/js/server/tests/recovery/collection-properties.js rename to tests/js/server/recovery/collection-properties.js diff --git a/tests/js/server/tests/recovery/collection-recreate.js b/tests/js/server/recovery/collection-recreate.js similarity index 100% rename from tests/js/server/tests/recovery/collection-recreate.js rename to tests/js/server/recovery/collection-recreate.js diff --git a/tests/js/server/tests/recovery/collection-rename-recreate-flush.js b/tests/js/server/recovery/collection-rename-recreate-flush.js similarity index 100% rename from tests/js/server/tests/recovery/collection-rename-recreate-flush.js rename to tests/js/server/recovery/collection-rename-recreate-flush.js diff --git a/tests/js/server/tests/recovery/collection-rename-recreate.js b/tests/js/server/recovery/collection-rename-recreate.js similarity index 100% rename from tests/js/server/tests/recovery/collection-rename-recreate.js rename to tests/js/server/recovery/collection-rename-recreate.js diff --git a/tests/js/server/tests/recovery/collection-rename-with-data.js b/tests/js/server/recovery/collection-rename-with-data.js similarity index 100% rename from tests/js/server/tests/recovery/collection-rename-with-data.js rename to tests/js/server/recovery/collection-rename-with-data.js diff --git a/tests/js/server/tests/recovery/collection-rename.js b/tests/js/server/recovery/collection-rename.js similarity index 100% rename from tests/js/server/tests/recovery/collection-rename.js rename to tests/js/server/recovery/collection-rename.js diff --git a/tests/js/server/tests/recovery/collection-unload.js b/tests/js/server/recovery/collection-unload.js similarity index 100% rename from tests/js/server/tests/recovery/collection-unload.js rename to tests/js/server/recovery/collection-unload.js diff --git a/tests/js/server/tests/recovery/collections-different-attributes.js b/tests/js/server/recovery/collections-different-attributes.js similarity index 100% rename from tests/js/server/tests/recovery/collections-different-attributes.js rename to tests/js/server/recovery/collections-different-attributes.js diff --git a/tests/js/server/tests/recovery/collections-reuse.js b/tests/js/server/recovery/collections-reuse.js similarity index 100% rename from tests/js/server/tests/recovery/collections-reuse.js rename to tests/js/server/recovery/collections-reuse.js diff --git a/tests/js/server/tests/recovery/collector-oom.js b/tests/js/server/recovery/collector-oom.js similarity index 100% rename from tests/js/server/tests/recovery/collector-oom.js rename to tests/js/server/recovery/collector-oom.js diff --git a/tests/js/server/tests/recovery/corrupt-wal-marker-multiple.js b/tests/js/server/recovery/corrupt-wal-marker-multiple.js similarity index 100% rename from tests/js/server/tests/recovery/corrupt-wal-marker-multiple.js rename to tests/js/server/recovery/corrupt-wal-marker-multiple.js diff --git a/tests/js/server/tests/recovery/corrupt-wal-marker-single-mmfiles.js b/tests/js/server/recovery/corrupt-wal-marker-single-mmfiles.js similarity index 100% rename from tests/js/server/tests/recovery/corrupt-wal-marker-single-mmfiles.js rename to tests/js/server/recovery/corrupt-wal-marker-single-mmfiles.js diff --git a/tests/js/server/tests/recovery/corrupted-crc-mmfiles.js b/tests/js/server/recovery/corrupted-crc-mmfiles.js similarity index 100% rename from tests/js/server/tests/recovery/corrupted-crc-mmfiles.js rename to tests/js/server/recovery/corrupted-crc-mmfiles.js diff --git a/tests/js/server/tests/recovery/countermanager-delay-rocksdb.js b/tests/js/server/recovery/countermanager-delay-rocksdb.js similarity index 100% rename from tests/js/server/tests/recovery/countermanager-delay-rocksdb.js rename to tests/js/server/recovery/countermanager-delay-rocksdb.js diff --git a/tests/js/server/tests/recovery/countermanager-sync-rocksdb.js b/tests/js/server/recovery/countermanager-sync-rocksdb.js similarity index 100% rename from tests/js/server/tests/recovery/countermanager-sync-rocksdb.js rename to tests/js/server/recovery/countermanager-sync-rocksdb.js diff --git a/tests/js/server/tests/recovery/create-and-drop-databases.js b/tests/js/server/recovery/create-and-drop-databases.js similarity index 100% rename from tests/js/server/tests/recovery/create-and-drop-databases.js rename to tests/js/server/recovery/create-and-drop-databases.js diff --git a/tests/js/server/tests/recovery/create-collection-fail.js b/tests/js/server/recovery/create-collection-fail.js similarity index 100% rename from tests/js/server/tests/recovery/create-collection-fail.js rename to tests/js/server/recovery/create-collection-fail.js diff --git a/tests/js/server/tests/recovery/create-collection-tmpfile-mmfiles.js b/tests/js/server/recovery/create-collection-tmpfile-mmfiles.js similarity index 100% rename from tests/js/server/tests/recovery/create-collection-tmpfile-mmfiles.js rename to tests/js/server/recovery/create-collection-tmpfile-mmfiles.js diff --git a/tests/js/server/tests/recovery/create-collections.js b/tests/js/server/recovery/create-collections.js similarity index 100% rename from tests/js/server/tests/recovery/create-collections.js rename to tests/js/server/recovery/create-collections.js diff --git a/tests/js/server/tests/recovery/create-database-existing.js b/tests/js/server/recovery/create-database-existing.js similarity index 100% rename from tests/js/server/tests/recovery/create-database-existing.js rename to tests/js/server/recovery/create-database-existing.js diff --git a/tests/js/server/tests/recovery/create-database-fail-mmfiles.js b/tests/js/server/recovery/create-database-fail-mmfiles.js similarity index 100% rename from tests/js/server/tests/recovery/create-database-fail-mmfiles.js rename to tests/js/server/recovery/create-database-fail-mmfiles.js diff --git a/tests/js/server/tests/recovery/create-database-recovery.js b/tests/js/server/recovery/create-database-recovery.js similarity index 100% rename from tests/js/server/tests/recovery/create-database-recovery.js rename to tests/js/server/recovery/create-database-recovery.js diff --git a/tests/js/server/tests/recovery/create-databases.js b/tests/js/server/recovery/create-databases.js similarity index 100% rename from tests/js/server/tests/recovery/create-databases.js rename to tests/js/server/recovery/create-databases.js diff --git a/tests/js/server/tests/recovery/create-indexes.js b/tests/js/server/recovery/create-indexes.js similarity index 100% rename from tests/js/server/tests/recovery/create-indexes.js rename to tests/js/server/recovery/create-indexes.js diff --git a/tests/js/server/tests/recovery/create-with-temp-mmfiles.js b/tests/js/server/recovery/create-with-temp-mmfiles.js similarity index 100% rename from tests/js/server/tests/recovery/create-with-temp-mmfiles.js rename to tests/js/server/recovery/create-with-temp-mmfiles.js diff --git a/tests/js/server/tests/recovery/create-with-temp-old-mmfiles.js b/tests/js/server/recovery/create-with-temp-old-mmfiles.js similarity index 100% rename from tests/js/server/tests/recovery/create-with-temp-old-mmfiles.js rename to tests/js/server/recovery/create-with-temp-old-mmfiles.js diff --git a/tests/js/server/tests/recovery/die-during-collector-mmfiles.js b/tests/js/server/recovery/die-during-collector-mmfiles.js similarity index 100% rename from tests/js/server/tests/recovery/die-during-collector-mmfiles.js rename to tests/js/server/recovery/die-during-collector-mmfiles.js diff --git a/tests/js/server/tests/recovery/disk-full-datafile.js b/tests/js/server/recovery/disk-full-datafile.js similarity index 100% rename from tests/js/server/tests/recovery/disk-full-datafile.js rename to tests/js/server/recovery/disk-full-datafile.js diff --git a/tests/js/server/tests/recovery/disk-full-logfile-data-mmfiles.js b/tests/js/server/recovery/disk-full-logfile-data-mmfiles.js similarity index 100% rename from tests/js/server/tests/recovery/disk-full-logfile-data-mmfiles.js rename to tests/js/server/recovery/disk-full-logfile-data-mmfiles.js diff --git a/tests/js/server/tests/recovery/disk-full-logfile-mmfiles.js b/tests/js/server/recovery/disk-full-logfile-mmfiles.js similarity index 100% rename from tests/js/server/tests/recovery/disk-full-logfile-mmfiles.js rename to tests/js/server/recovery/disk-full-logfile-mmfiles.js diff --git a/tests/js/server/tests/recovery/disk-full-no-collection-journal.js b/tests/js/server/recovery/disk-full-no-collection-journal.js similarity index 100% rename from tests/js/server/tests/recovery/disk-full-no-collection-journal.js rename to tests/js/server/recovery/disk-full-no-collection-journal.js diff --git a/tests/js/server/tests/recovery/documents.js b/tests/js/server/recovery/documents.js similarity index 100% rename from tests/js/server/tests/recovery/documents.js rename to tests/js/server/recovery/documents.js diff --git a/tests/js/server/tests/recovery/drop-collections.js b/tests/js/server/recovery/drop-collections.js similarity index 100% rename from tests/js/server/tests/recovery/drop-collections.js rename to tests/js/server/recovery/drop-collections.js diff --git a/tests/js/server/tests/recovery/drop-database-and-fail.js b/tests/js/server/recovery/drop-database-and-fail.js similarity index 100% rename from tests/js/server/tests/recovery/drop-database-and-fail.js rename to tests/js/server/recovery/drop-database-and-fail.js diff --git a/tests/js/server/tests/recovery/drop-database-flush-and-fail.js b/tests/js/server/recovery/drop-database-flush-and-fail.js similarity index 100% rename from tests/js/server/tests/recovery/drop-database-flush-and-fail.js rename to tests/js/server/recovery/drop-database-flush-and-fail.js diff --git a/tests/js/server/tests/recovery/drop-database-only-tmp-mmfiles.js b/tests/js/server/recovery/drop-database-only-tmp-mmfiles.js similarity index 100% rename from tests/js/server/tests/recovery/drop-database-only-tmp-mmfiles.js rename to tests/js/server/recovery/drop-database-only-tmp-mmfiles.js diff --git a/tests/js/server/tests/recovery/drop-databases.js b/tests/js/server/recovery/drop-databases.js similarity index 100% rename from tests/js/server/tests/recovery/drop-databases.js rename to tests/js/server/recovery/drop-databases.js diff --git a/tests/js/server/tests/recovery/drop-index-shutdown.js b/tests/js/server/recovery/drop-index-shutdown.js similarity index 100% rename from tests/js/server/tests/recovery/drop-index-shutdown.js rename to tests/js/server/recovery/drop-index-shutdown.js diff --git a/tests/js/server/tests/recovery/drop-index.js b/tests/js/server/recovery/drop-index.js similarity index 100% rename from tests/js/server/tests/recovery/drop-index.js rename to tests/js/server/recovery/drop-index.js diff --git a/tests/js/server/tests/recovery/drop-indexes.js b/tests/js/server/recovery/drop-indexes.js similarity index 100% rename from tests/js/server/tests/recovery/drop-indexes.js rename to tests/js/server/recovery/drop-indexes.js diff --git a/tests/js/server/tests/recovery/drop-single-collection.js b/tests/js/server/recovery/drop-single-collection.js similarity index 100% rename from tests/js/server/tests/recovery/drop-single-collection.js rename to tests/js/server/recovery/drop-single-collection.js diff --git a/tests/js/server/tests/recovery/edges.js b/tests/js/server/recovery/edges.js similarity index 100% rename from tests/js/server/tests/recovery/edges.js rename to tests/js/server/recovery/edges.js diff --git a/tests/js/server/tests/recovery/empty-datafiles-mmfiles.js b/tests/js/server/recovery/empty-datafiles-mmfiles.js similarity index 100% rename from tests/js/server/tests/recovery/empty-datafiles-mmfiles.js rename to tests/js/server/recovery/empty-datafiles-mmfiles.js diff --git a/tests/js/server/tests/recovery/empty-logfiles-mmfiles.js b/tests/js/server/recovery/empty-logfiles-mmfiles.js similarity index 100% rename from tests/js/server/tests/recovery/empty-logfiles-mmfiles.js rename to tests/js/server/recovery/empty-logfiles-mmfiles.js diff --git a/tests/js/server/tests/recovery/flush-drop-database-and-fail.js b/tests/js/server/recovery/flush-drop-database-and-fail.js similarity index 100% rename from tests/js/server/tests/recovery/flush-drop-database-and-fail.js rename to tests/js/server/recovery/flush-drop-database-and-fail.js diff --git a/tests/js/server/tests/recovery/foxx-directories.js b/tests/js/server/recovery/foxx-directories.js similarity index 100% rename from tests/js/server/tests/recovery/foxx-directories.js rename to tests/js/server/recovery/foxx-directories.js diff --git a/tests/js/server/tests/recovery/indexes-after-flush.js b/tests/js/server/recovery/indexes-after-flush.js similarity index 100% rename from tests/js/server/tests/recovery/indexes-after-flush.js rename to tests/js/server/recovery/indexes-after-flush.js diff --git a/tests/js/server/tests/recovery/indexes-geo-potslot.js b/tests/js/server/recovery/indexes-geo-potslot.js similarity index 100% rename from tests/js/server/tests/recovery/indexes-geo-potslot.js rename to tests/js/server/recovery/indexes-geo-potslot.js diff --git a/tests/js/server/tests/recovery/indexes-geo.js b/tests/js/server/recovery/indexes-geo.js similarity index 100% rename from tests/js/server/tests/recovery/indexes-geo.js rename to tests/js/server/recovery/indexes-geo.js diff --git a/tests/js/server/tests/recovery/indexes-hash.js b/tests/js/server/recovery/indexes-hash.js similarity index 100% rename from tests/js/server/tests/recovery/indexes-hash.js rename to tests/js/server/recovery/indexes-hash.js diff --git a/tests/js/server/tests/recovery/indexes-persistent-nosync.js b/tests/js/server/recovery/indexes-persistent-nosync.js similarity index 100% rename from tests/js/server/tests/recovery/indexes-persistent-nosync.js rename to tests/js/server/recovery/indexes-persistent-nosync.js diff --git a/tests/js/server/tests/recovery/indexes-persistent-restore.js b/tests/js/server/recovery/indexes-persistent-restore.js similarity index 100% rename from tests/js/server/tests/recovery/indexes-persistent-restore.js rename to tests/js/server/recovery/indexes-persistent-restore.js diff --git a/tests/js/server/tests/recovery/indexes-persistent.js b/tests/js/server/recovery/indexes-persistent.js similarity index 100% rename from tests/js/server/tests/recovery/indexes-persistent.js rename to tests/js/server/recovery/indexes-persistent.js diff --git a/tests/js/server/tests/recovery/indexes-skiplist.js b/tests/js/server/recovery/indexes-skiplist.js similarity index 100% rename from tests/js/server/tests/recovery/indexes-skiplist.js rename to tests/js/server/recovery/indexes-skiplist.js diff --git a/tests/js/server/tests/recovery/indexes-sparse-hash.js b/tests/js/server/recovery/indexes-sparse-hash.js similarity index 100% rename from tests/js/server/tests/recovery/indexes-sparse-hash.js rename to tests/js/server/recovery/indexes-sparse-hash.js diff --git a/tests/js/server/tests/recovery/indexes-sparse-skiplist.js b/tests/js/server/recovery/indexes-sparse-skiplist.js similarity index 100% rename from tests/js/server/tests/recovery/indexes-sparse-skiplist.js rename to tests/js/server/recovery/indexes-sparse-skiplist.js diff --git a/tests/js/server/tests/recovery/indexes.js b/tests/js/server/recovery/indexes.js similarity index 100% rename from tests/js/server/tests/recovery/indexes.js rename to tests/js/server/recovery/indexes.js diff --git a/tests/js/server/tests/recovery/insert-update-remove-distance.js b/tests/js/server/recovery/insert-update-remove-distance.js similarity index 100% rename from tests/js/server/tests/recovery/insert-update-remove-distance.js rename to tests/js/server/recovery/insert-update-remove-distance.js diff --git a/tests/js/server/tests/recovery/insert-update-remove.js b/tests/js/server/recovery/insert-update-remove.js similarity index 100% rename from tests/js/server/tests/recovery/insert-update-remove.js rename to tests/js/server/recovery/insert-update-remove.js diff --git a/tests/js/server/tests/recovery/insert-update-replace.js b/tests/js/server/recovery/insert-update-replace.js similarity index 100% rename from tests/js/server/tests/recovery/insert-update-replace.js rename to tests/js/server/recovery/insert-update-replace.js diff --git a/tests/js/server/tests/recovery/intermediate-commit-abort-rocksdb.js b/tests/js/server/recovery/intermediate-commit-abort-rocksdb.js similarity index 100% rename from tests/js/server/tests/recovery/intermediate-commit-abort-rocksdb.js rename to tests/js/server/recovery/intermediate-commit-abort-rocksdb.js diff --git a/tests/js/server/tests/recovery/intermediate-commit-aql-insert-abort-rocksdb.js b/tests/js/server/recovery/intermediate-commit-aql-insert-abort-rocksdb.js similarity index 100% rename from tests/js/server/tests/recovery/intermediate-commit-aql-insert-abort-rocksdb.js rename to tests/js/server/recovery/intermediate-commit-aql-insert-abort-rocksdb.js diff --git a/tests/js/server/tests/recovery/intermediate-commit-aql-insert-rocksdb.js b/tests/js/server/recovery/intermediate-commit-aql-insert-rocksdb.js similarity index 100% rename from tests/js/server/tests/recovery/intermediate-commit-aql-insert-rocksdb.js rename to tests/js/server/recovery/intermediate-commit-aql-insert-rocksdb.js diff --git a/tests/js/server/tests/recovery/intermediate-commit-aql-rocksdb.js b/tests/js/server/recovery/intermediate-commit-aql-rocksdb.js similarity index 100% rename from tests/js/server/tests/recovery/intermediate-commit-aql-rocksdb.js rename to tests/js/server/recovery/intermediate-commit-aql-rocksdb.js diff --git a/tests/js/server/tests/recovery/intermediate-commit-aql-update-abort-rocksdb.js b/tests/js/server/recovery/intermediate-commit-aql-update-abort-rocksdb.js similarity index 100% rename from tests/js/server/tests/recovery/intermediate-commit-aql-update-abort-rocksdb.js rename to tests/js/server/recovery/intermediate-commit-aql-update-abort-rocksdb.js diff --git a/tests/js/server/tests/recovery/intermediate-commit-big-rocksdb.js b/tests/js/server/recovery/intermediate-commit-big-rocksdb.js similarity index 100% rename from tests/js/server/tests/recovery/intermediate-commit-big-rocksdb.js rename to tests/js/server/recovery/intermediate-commit-big-rocksdb.js diff --git a/tests/js/server/tests/recovery/intermediate-commit-rocksdb.js b/tests/js/server/recovery/intermediate-commit-rocksdb.js similarity index 100% rename from tests/js/server/tests/recovery/intermediate-commit-rocksdb.js rename to tests/js/server/recovery/intermediate-commit-rocksdb.js diff --git a/tests/js/server/tests/recovery/intermediate-commit-truncate-rocksdb.js b/tests/js/server/recovery/intermediate-commit-truncate-rocksdb.js similarity index 100% rename from tests/js/server/tests/recovery/intermediate-commit-truncate-rocksdb.js rename to tests/js/server/recovery/intermediate-commit-truncate-rocksdb.js diff --git a/tests/js/server/tests/recovery/intermediate-commits-babies-rocksdb.js b/tests/js/server/recovery/intermediate-commits-babies-rocksdb.js similarity index 100% rename from tests/js/server/tests/recovery/intermediate-commits-babies-rocksdb.js rename to tests/js/server/recovery/intermediate-commits-babies-rocksdb.js diff --git a/tests/js/server/tests/recovery/leftover-collection-directory-mmfiles.js b/tests/js/server/recovery/leftover-collection-directory-mmfiles.js similarity index 100% rename from tests/js/server/tests/recovery/leftover-collection-directory-mmfiles.js rename to tests/js/server/recovery/leftover-collection-directory-mmfiles.js diff --git a/tests/js/server/tests/recovery/leftover-database-directory-mmfiles.js b/tests/js/server/recovery/leftover-database-directory-mmfiles.js similarity index 100% rename from tests/js/server/tests/recovery/leftover-database-directory-mmfiles.js rename to tests/js/server/recovery/leftover-database-directory-mmfiles.js diff --git a/tests/js/server/tests/recovery/many-documents.js b/tests/js/server/recovery/many-documents.js similarity index 100% rename from tests/js/server/tests/recovery/many-documents.js rename to tests/js/server/recovery/many-documents.js diff --git a/tests/js/server/tests/recovery/many-inserts.js b/tests/js/server/recovery/many-inserts.js similarity index 100% rename from tests/js/server/tests/recovery/many-inserts.js rename to tests/js/server/recovery/many-inserts.js diff --git a/tests/js/server/tests/recovery/many-logs.js b/tests/js/server/recovery/many-logs.js similarity index 100% rename from tests/js/server/tests/recovery/many-logs.js rename to tests/js/server/recovery/many-logs.js diff --git a/tests/js/server/tests/recovery/many-updates.js b/tests/js/server/recovery/many-updates.js similarity index 100% rename from tests/js/server/tests/recovery/many-updates.js rename to tests/js/server/recovery/many-updates.js diff --git a/tests/js/server/tests/recovery/multi-database-durability.js b/tests/js/server/recovery/multi-database-durability.js similarity index 100% rename from tests/js/server/tests/recovery/multi-database-durability.js rename to tests/js/server/recovery/multi-database-durability.js diff --git a/tests/js/server/tests/recovery/multiple-journals-2-mmfiles.js b/tests/js/server/recovery/multiple-journals-2-mmfiles.js similarity index 100% rename from tests/js/server/tests/recovery/multiple-journals-2-mmfiles.js rename to tests/js/server/recovery/multiple-journals-2-mmfiles.js diff --git a/tests/js/server/tests/recovery/multiple-journals-3-mmfiles.js b/tests/js/server/recovery/multiple-journals-3-mmfiles.js similarity index 100% rename from tests/js/server/tests/recovery/multiple-journals-3-mmfiles.js rename to tests/js/server/recovery/multiple-journals-3-mmfiles.js diff --git a/tests/js/server/tests/recovery/multiple-journals-mmfiles.js b/tests/js/server/recovery/multiple-journals-mmfiles.js similarity index 100% rename from tests/js/server/tests/recovery/multiple-journals-mmfiles.js rename to tests/js/server/recovery/multiple-journals-mmfiles.js diff --git a/tests/js/server/tests/recovery/multiple-logs.js b/tests/js/server/recovery/multiple-logs.js similarity index 100% rename from tests/js/server/tests/recovery/multiple-logs.js rename to tests/js/server/recovery/multiple-logs.js diff --git a/tests/js/server/tests/recovery/no-journal.js b/tests/js/server/recovery/no-journal.js similarity index 100% rename from tests/js/server/tests/recovery/no-journal.js rename to tests/js/server/recovery/no-journal.js diff --git a/tests/js/server/tests/recovery/no-shutdown-info-multiple-logs.js b/tests/js/server/recovery/no-shutdown-info-multiple-logs.js similarity index 100% rename from tests/js/server/tests/recovery/no-shutdown-info-multiple-logs.js rename to tests/js/server/recovery/no-shutdown-info-multiple-logs.js diff --git a/tests/js/server/tests/recovery/no-shutdown-info-no-flush.js b/tests/js/server/recovery/no-shutdown-info-no-flush.js similarity index 100% rename from tests/js/server/tests/recovery/no-shutdown-info-no-flush.js rename to tests/js/server/recovery/no-shutdown-info-no-flush.js diff --git a/tests/js/server/tests/recovery/no-shutdown-info-with-flush.js b/tests/js/server/recovery/no-shutdown-info-with-flush.js similarity index 100% rename from tests/js/server/tests/recovery/no-shutdown-info-with-flush.js rename to tests/js/server/recovery/no-shutdown-info-with-flush.js diff --git a/tests/js/server/tests/recovery/recreate-collection.js b/tests/js/server/recovery/recreate-collection.js similarity index 100% rename from tests/js/server/tests/recovery/recreate-collection.js rename to tests/js/server/recovery/recreate-collection.js diff --git a/tests/js/server/tests/recovery/recreate-databases.js b/tests/js/server/recovery/recreate-databases.js similarity index 100% rename from tests/js/server/tests/recovery/recreate-databases.js rename to tests/js/server/recovery/recreate-databases.js diff --git a/tests/js/server/tests/recovery/resume-recovery-all.js b/tests/js/server/recovery/resume-recovery-all.js similarity index 100% rename from tests/js/server/tests/recovery/resume-recovery-all.js rename to tests/js/server/recovery/resume-recovery-all.js diff --git a/tests/js/server/tests/recovery/resume-recovery-multi-flush.js b/tests/js/server/recovery/resume-recovery-multi-flush.js similarity index 100% rename from tests/js/server/tests/recovery/resume-recovery-multi-flush.js rename to tests/js/server/recovery/resume-recovery-multi-flush.js diff --git a/tests/js/server/tests/recovery/resume-recovery-other.js b/tests/js/server/recovery/resume-recovery-other.js similarity index 100% rename from tests/js/server/tests/recovery/resume-recovery-other.js rename to tests/js/server/recovery/resume-recovery-other.js diff --git a/tests/js/server/tests/recovery/resume-recovery-simple.js b/tests/js/server/recovery/resume-recovery-simple.js similarity index 100% rename from tests/js/server/tests/recovery/resume-recovery-simple.js rename to tests/js/server/recovery/resume-recovery-simple.js diff --git a/tests/js/server/tests/recovery/resume-recovery.js b/tests/js/server/recovery/resume-recovery.js similarity index 100% rename from tests/js/server/tests/recovery/resume-recovery.js rename to tests/js/server/recovery/resume-recovery.js diff --git a/tests/js/server/tests/recovery/transaction-durability-multiple.js b/tests/js/server/recovery/transaction-durability-multiple.js similarity index 100% rename from tests/js/server/tests/recovery/transaction-durability-multiple.js rename to tests/js/server/recovery/transaction-durability-multiple.js diff --git a/tests/js/server/tests/recovery/transaction-durability.js b/tests/js/server/recovery/transaction-durability.js similarity index 100% rename from tests/js/server/tests/recovery/transaction-durability.js rename to tests/js/server/recovery/transaction-durability.js diff --git a/tests/js/server/tests/recovery/transaction-just-committed.js b/tests/js/server/recovery/transaction-just-committed.js similarity index 100% rename from tests/js/server/tests/recovery/transaction-just-committed.js rename to tests/js/server/recovery/transaction-just-committed.js diff --git a/tests/js/server/tests/recovery/transaction-no-abort.js b/tests/js/server/recovery/transaction-no-abort.js similarity index 100% rename from tests/js/server/tests/recovery/transaction-no-abort.js rename to tests/js/server/recovery/transaction-no-abort.js diff --git a/tests/js/server/tests/recovery/transaction-no-commit.js b/tests/js/server/recovery/transaction-no-commit.js similarity index 100% rename from tests/js/server/tests/recovery/transaction-no-commit.js rename to tests/js/server/recovery/transaction-no-commit.js diff --git a/tests/js/server/tests/recovery/truncate-collection-failures-after-commits-rocksdb.js b/tests/js/server/recovery/truncate-collection-failures-after-commits-rocksdb.js similarity index 100% rename from tests/js/server/tests/recovery/truncate-collection-failures-after-commits-rocksdb.js rename to tests/js/server/recovery/truncate-collection-failures-after-commits-rocksdb.js diff --git a/tests/js/server/tests/recovery/truncate-collection-failures-before-commit-rocksdb.js b/tests/js/server/recovery/truncate-collection-failures-before-commit-rocksdb.js similarity index 100% rename from tests/js/server/tests/recovery/truncate-collection-failures-before-commit-rocksdb.js rename to tests/js/server/recovery/truncate-collection-failures-before-commit-rocksdb.js diff --git a/tests/js/server/tests/recovery/truncate-collection-failures-between-commits-rocksdb.js b/tests/js/server/recovery/truncate-collection-failures-between-commits-rocksdb.js similarity index 100% rename from tests/js/server/tests/recovery/truncate-collection-failures-between-commits-rocksdb.js rename to tests/js/server/recovery/truncate-collection-failures-between-commits-rocksdb.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-create.js b/tests/js/server/recovery/view-arangosearch-create.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-create.js rename to tests/js/server/recovery/view-arangosearch-create.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-drop.js b/tests/js/server/recovery/view-arangosearch-drop.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-drop.js rename to tests/js/server/recovery/view-arangosearch-drop.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-link-create-no-flushthread.js b/tests/js/server/recovery/view-arangosearch-link-create-no-flushthread.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-link-create-no-flushthread.js rename to tests/js/server/recovery/view-arangosearch-link-create-no-flushthread.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-link-create-nonempty.js b/tests/js/server/recovery/view-arangosearch-link-create-nonempty.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-link-create-nonempty.js rename to tests/js/server/recovery/view-arangosearch-link-create-nonempty.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-link-create.js b/tests/js/server/recovery/view-arangosearch-link-create.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-link-create.js rename to tests/js/server/recovery/view-arangosearch-link-create.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-link-drop-collection-no-flushthread.js b/tests/js/server/recovery/view-arangosearch-link-drop-collection-no-flushthread.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-link-drop-collection-no-flushthread.js rename to tests/js/server/recovery/view-arangosearch-link-drop-collection-no-flushthread.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-link-drop-collection.js b/tests/js/server/recovery/view-arangosearch-link-drop-collection.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-link-drop-collection.js rename to tests/js/server/recovery/view-arangosearch-link-drop-collection.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-link-drop-no-flushthread.js b/tests/js/server/recovery/view-arangosearch-link-drop-no-flushthread.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-link-drop-no-flushthread.js rename to tests/js/server/recovery/view-arangosearch-link-drop-no-flushthread.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-link-drop.js b/tests/js/server/recovery/view-arangosearch-link-drop.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-link-drop.js rename to tests/js/server/recovery/view-arangosearch-link-drop.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-link-populate-drop-collection-no-flushthread.js b/tests/js/server/recovery/view-arangosearch-link-populate-drop-collection-no-flushthread.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-link-populate-drop-collection-no-flushthread.js rename to tests/js/server/recovery/view-arangosearch-link-populate-drop-collection-no-flushthread.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-link-populate-drop-link-no-flushthread.js b/tests/js/server/recovery/view-arangosearch-link-populate-drop-link-no-flushthread.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-link-populate-drop-link-no-flushthread.js rename to tests/js/server/recovery/view-arangosearch-link-populate-drop-link-no-flushthread.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-link-populate-drop-view-no-flushthread.js b/tests/js/server/recovery/view-arangosearch-link-populate-drop-view-no-flushthread.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-link-populate-drop-view-no-flushthread.js rename to tests/js/server/recovery/view-arangosearch-link-populate-drop-view-no-flushthread.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-link-populate-fail.js b/tests/js/server/recovery/view-arangosearch-link-populate-fail.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-link-populate-fail.js rename to tests/js/server/recovery/view-arangosearch-link-populate-fail.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-link-populate-no-callbacks.js b/tests/js/server/recovery/view-arangosearch-link-populate-no-callbacks.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-link-populate-no-callbacks.js rename to tests/js/server/recovery/view-arangosearch-link-populate-no-callbacks.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-link-populate-no-flushthread.js b/tests/js/server/recovery/view-arangosearch-link-populate-no-flushthread.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-link-populate-no-flushthread.js rename to tests/js/server/recovery/view-arangosearch-link-populate-no-flushthread.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-link-populate-no-release.js b/tests/js/server/recovery/view-arangosearch-link-populate-no-release.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-link-populate-no-release.js rename to tests/js/server/recovery/view-arangosearch-link-populate-no-release.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-link-populate-remove-no-flushthread.js b/tests/js/server/recovery/view-arangosearch-link-populate-remove-no-flushthread.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-link-populate-remove-no-flushthread.js rename to tests/js/server/recovery/view-arangosearch-link-populate-remove-no-flushthread.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-link-populate-remove.js b/tests/js/server/recovery/view-arangosearch-link-populate-remove.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-link-populate-remove.js rename to tests/js/server/recovery/view-arangosearch-link-populate-remove.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-link-populate-transaction-abort-no-flushthread.js b/tests/js/server/recovery/view-arangosearch-link-populate-transaction-abort-no-flushthread.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-link-populate-transaction-abort-no-flushthread.js rename to tests/js/server/recovery/view-arangosearch-link-populate-transaction-abort-no-flushthread.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-link-populate-transaction-abort.js b/tests/js/server/recovery/view-arangosearch-link-populate-transaction-abort.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-link-populate-transaction-abort.js rename to tests/js/server/recovery/view-arangosearch-link-populate-transaction-abort.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-link-populate-transaction-no-flushthread.js b/tests/js/server/recovery/view-arangosearch-link-populate-transaction-no-flushthread.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-link-populate-transaction-no-flushthread.js rename to tests/js/server/recovery/view-arangosearch-link-populate-transaction-no-flushthread.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-link-populate-transaction.js b/tests/js/server/recovery/view-arangosearch-link-populate-transaction.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-link-populate-transaction.js rename to tests/js/server/recovery/view-arangosearch-link-populate-transaction.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-link-populate.js b/tests/js/server/recovery/view-arangosearch-link-populate.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-link-populate.js rename to tests/js/server/recovery/view-arangosearch-link-populate.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-link-rename-collection-no-flushthread.js b/tests/js/server/recovery/view-arangosearch-link-rename-collection-no-flushthread.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-link-rename-collection-no-flushthread.js rename to tests/js/server/recovery/view-arangosearch-link-rename-collection-no-flushthread.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-link-rename-collection.js b/tests/js/server/recovery/view-arangosearch-link-rename-collection.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-link-rename-collection.js rename to tests/js/server/recovery/view-arangosearch-link-rename-collection.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-modify-properties.js b/tests/js/server/recovery/view-arangosearch-modify-properties.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-modify-properties.js rename to tests/js/server/recovery/view-arangosearch-modify-properties.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-properties.js b/tests/js/server/recovery/view-arangosearch-properties.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-properties.js rename to tests/js/server/recovery/view-arangosearch-properties.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-recreate.js b/tests/js/server/recovery/view-arangosearch-recreate.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-recreate.js rename to tests/js/server/recovery/view-arangosearch-recreate.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-rename-no-flushthread.js b/tests/js/server/recovery/view-arangosearch-rename-no-flushthread.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-rename-no-flushthread.js rename to tests/js/server/recovery/view-arangosearch-rename-no-flushthread.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-rename-query.js b/tests/js/server/recovery/view-arangosearch-rename-query.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-rename-query.js rename to tests/js/server/recovery/view-arangosearch-rename-query.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-rename-recreate-flush.js b/tests/js/server/recovery/view-arangosearch-rename-recreate-flush.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-rename-recreate-flush.js rename to tests/js/server/recovery/view-arangosearch-rename-recreate-flush.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-rename-recreate.js b/tests/js/server/recovery/view-arangosearch-rename-recreate.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-rename-recreate.js rename to tests/js/server/recovery/view-arangosearch-rename-recreate.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-rename.js b/tests/js/server/recovery/view-arangosearch-rename.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-rename.js rename to tests/js/server/recovery/view-arangosearch-rename.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-view-create-drop-no-flushthread.js b/tests/js/server/recovery/view-arangosearch-view-create-drop-no-flushthread.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-view-create-drop-no-flushthread.js rename to tests/js/server/recovery/view-arangosearch-view-create-drop-no-flushthread.js diff --git a/tests/js/server/tests/recovery/view-arangosearch-view-create-drop.js b/tests/js/server/recovery/view-arangosearch-view-create-drop.js similarity index 100% rename from tests/js/server/tests/recovery/view-arangosearch-view-create-drop.js rename to tests/js/server/recovery/view-arangosearch-view-create-drop.js diff --git a/tests/js/server/tests/recovery/wait-for-sync.js b/tests/js/server/recovery/wait-for-sync.js similarity index 100% rename from tests/js/server/tests/recovery/wait-for-sync.js rename to tests/js/server/recovery/wait-for-sync.js diff --git a/tests/js/server/tests/recovery/write-throttling-mmfiles.js b/tests/js/server/recovery/write-throttling-mmfiles.js similarity index 100% rename from tests/js/server/tests/recovery/write-throttling-mmfiles.js rename to tests/js/server/recovery/write-throttling-mmfiles.js diff --git a/tests/js/server/tests/replication/replication-aql.js b/tests/js/server/replication/replication-aql.js similarity index 100% rename from tests/js/server/tests/replication/replication-aql.js rename to tests/js/server/replication/replication-aql.js diff --git a/tests/js/server/tests/replication/replication-fuzz-global.js b/tests/js/server/replication/replication-fuzz-global.js similarity index 100% rename from tests/js/server/tests/replication/replication-fuzz-global.js rename to tests/js/server/replication/replication-fuzz-global.js diff --git a/tests/js/server/tests/replication/replication-fuzz.js b/tests/js/server/replication/replication-fuzz.js similarity index 100% rename from tests/js/server/tests/replication/replication-fuzz.js rename to tests/js/server/replication/replication-fuzz.js diff --git a/tests/js/server/tests/replication/replication-ongoing-32.js b/tests/js/server/replication/replication-ongoing-32.js similarity index 100% rename from tests/js/server/tests/replication/replication-ongoing-32.js rename to tests/js/server/replication/replication-ongoing-32.js diff --git a/tests/js/server/tests/replication/replication-ongoing-frompresent-32.js b/tests/js/server/replication/replication-ongoing-frompresent-32.js similarity index 100% rename from tests/js/server/tests/replication/replication-ongoing-frompresent-32.js rename to tests/js/server/replication/replication-ongoing-frompresent-32.js diff --git a/tests/js/server/tests/replication/replication-ongoing-frompresent.js b/tests/js/server/replication/replication-ongoing-frompresent.js similarity index 100% rename from tests/js/server/tests/replication/replication-ongoing-frompresent.js rename to tests/js/server/replication/replication-ongoing-frompresent.js diff --git a/tests/js/server/tests/replication/replication-ongoing-global-spec.js b/tests/js/server/replication/replication-ongoing-global-spec.js similarity index 100% rename from tests/js/server/tests/replication/replication-ongoing-global-spec.js rename to tests/js/server/replication/replication-ongoing-global-spec.js diff --git a/tests/js/server/tests/replication/replication-ongoing-global.js b/tests/js/server/replication/replication-ongoing-global.js similarity index 100% rename from tests/js/server/tests/replication/replication-ongoing-global.js rename to tests/js/server/replication/replication-ongoing-global.js diff --git a/tests/js/server/tests/replication/replication-ongoing.js b/tests/js/server/replication/replication-ongoing.js similarity index 100% rename from tests/js/server/tests/replication/replication-ongoing.js rename to tests/js/server/replication/replication-ongoing.js diff --git a/tests/js/server/tests/replication/replication-random.js b/tests/js/server/replication/replication-random.js similarity index 100% rename from tests/js/server/tests/replication/replication-random.js rename to tests/js/server/replication/replication-random.js diff --git a/tests/js/server/tests/replication/replication-static.js b/tests/js/server/replication/replication-static.js similarity index 100% rename from tests/js/server/tests/replication/replication-static.js rename to tests/js/server/replication/replication-static.js diff --git a/tests/js/server/tests/replication/replication-sync.js b/tests/js/server/replication/replication-sync.js similarity index 100% rename from tests/js/server/tests/replication/replication-sync.js rename to tests/js/server/replication/replication-sync.js diff --git a/tests/js/server/tests/resilience/moving-shards-cluster.js b/tests/js/server/resilience/moving-shards-cluster.js similarity index 100% rename from tests/js/server/tests/resilience/moving-shards-cluster.js rename to tests/js/server/resilience/moving-shards-cluster.js diff --git a/tests/js/server/tests/resilience/moving-shards-with-arangosearch-view-cluster.js b/tests/js/server/resilience/moving-shards-with-arangosearch-view-cluster.js similarity index 100% rename from tests/js/server/tests/resilience/moving-shards-with-arangosearch-view-cluster.js rename to tests/js/server/resilience/moving-shards-with-arangosearch-view-cluster.js diff --git a/tests/js/server/tests/resilience/repair-distribute-shards-like-spec.js b/tests/js/server/resilience/repair-distribute-shards-like-spec.js similarity index 100% rename from tests/js/server/tests/resilience/repair-distribute-shards-like-spec.js rename to tests/js/server/resilience/repair-distribute-shards-like-spec.js diff --git a/tests/js/server/tests/resilience/resilience-synchronous-repl-cluster.js b/tests/js/server/resilience/resilience-synchronous-repl-cluster.js similarity index 100% rename from tests/js/server/tests/resilience/resilience-synchronous-repl-cluster.js rename to tests/js/server/resilience/resilience-synchronous-repl-cluster.js diff --git a/tests/js/server/tests/resilience/resilience-synchronous-repl-with-arangosearch-view-cluster.js b/tests/js/server/resilience/resilience-synchronous-repl-with-arangosearch-view-cluster.js similarity index 100% rename from tests/js/server/tests/resilience/resilience-synchronous-repl-with-arangosearch-view-cluster.js rename to tests/js/server/resilience/resilience-synchronous-repl-with-arangosearch-view-cluster.js diff --git a/tests/js/server/tests/resilience/shard-distribution-spec.js b/tests/js/server/resilience/shard-distribution-spec.js similarity index 100% rename from tests/js/server/tests/resilience/shard-distribution-spec.js rename to tests/js/server/resilience/shard-distribution-spec.js diff --git a/tests/js/server/tests/shell/shell-any-nondeterministic-noncluster.js b/tests/js/server/shell/shell-any-nondeterministic-noncluster.js similarity index 100% rename from tests/js/server/tests/shell/shell-any-nondeterministic-noncluster.js rename to tests/js/server/shell/shell-any-nondeterministic-noncluster.js diff --git a/tests/js/server/tests/shell/shell-array-index-noncluster.js b/tests/js/server/shell/shell-array-index-noncluster.js similarity index 100% rename from tests/js/server/tests/shell/shell-array-index-noncluster.js rename to tests/js/server/shell/shell-array-index-noncluster.js diff --git a/tests/js/server/tests/shell/shell-binary-document.js b/tests/js/server/shell/shell-binary-document.js similarity index 100% rename from tests/js/server/tests/shell/shell-binary-document.js rename to tests/js/server/shell/shell-binary-document.js diff --git a/tests/js/server/tests/shell/shell-cluster-agency.js b/tests/js/server/shell/shell-cluster-agency.js similarity index 100% rename from tests/js/server/tests/shell/shell-cluster-agency.js rename to tests/js/server/shell/shell-cluster-agency.js diff --git a/tests/js/server/tests/shell/shell-cluster-collection-selectivity.js b/tests/js/server/shell/shell-cluster-collection-selectivity.js similarity index 100% rename from tests/js/server/tests/shell/shell-cluster-collection-selectivity.js rename to tests/js/server/shell/shell-cluster-collection-selectivity.js diff --git a/tests/js/server/tests/shell/shell-cluster-gatherblocks.js b/tests/js/server/shell/shell-cluster-gatherblocks.js similarity index 100% rename from tests/js/server/tests/shell/shell-cluster-gatherblocks.js rename to tests/js/server/shell/shell-cluster-gatherblocks.js diff --git a/tests/js/server/tests/shell/shell-collection-mmfiles-files-noncluster.js b/tests/js/server/shell/shell-collection-mmfiles-files-noncluster.js similarity index 100% rename from tests/js/server/tests/shell/shell-collection-mmfiles-files-noncluster.js rename to tests/js/server/shell/shell-collection-mmfiles-files-noncluster.js diff --git a/tests/js/server/tests/shell/shell-collection-not-loaded-timecritical-noncluster.js b/tests/js/server/shell/shell-collection-not-loaded-timecritical-noncluster.js similarity index 100% rename from tests/js/server/tests/shell/shell-collection-not-loaded-timecritical-noncluster.js rename to tests/js/server/shell/shell-collection-not-loaded-timecritical-noncluster.js diff --git a/tests/js/server/tests/shell/shell-collection-properties-cluster-spec.js b/tests/js/server/shell/shell-collection-properties-cluster-spec.js similarity index 100% rename from tests/js/server/tests/shell/shell-collection-properties-cluster-spec.js rename to tests/js/server/shell/shell-collection-properties-cluster-spec.js diff --git a/tests/js/server/tests/shell/shell-collection-rocksdb-failures-noncluster.js b/tests/js/server/shell/shell-collection-rocksdb-failures-noncluster.js similarity index 100% rename from tests/js/server/tests/shell/shell-collection-rocksdb-failures-noncluster.js rename to tests/js/server/shell/shell-collection-rocksdb-failures-noncluster.js diff --git a/tests/js/server/tests/shell/shell-collection-rocksdb-noncluster.js b/tests/js/server/shell/shell-collection-rocksdb-noncluster.js similarity index 100% rename from tests/js/server/tests/shell/shell-collection-rocksdb-noncluster.js rename to tests/js/server/shell/shell-collection-rocksdb-noncluster.js diff --git a/tests/js/server/tests/shell/shell-collection-rocksdb-rangedelete.js b/tests/js/server/shell/shell-collection-rocksdb-rangedelete.js similarity index 100% rename from tests/js/server/tests/shell/shell-collection-rocksdb-rangedelete.js rename to tests/js/server/shell/shell-collection-rocksdb-rangedelete.js diff --git a/tests/js/server/tests/shell/shell-compaction-mmfiles-noncluster-timecritical.js b/tests/js/server/shell/shell-compaction-mmfiles-noncluster-timecritical.js similarity index 100% rename from tests/js/server/tests/shell/shell-compaction-mmfiles-noncluster-timecritical.js rename to tests/js/server/shell/shell-compaction-mmfiles-noncluster-timecritical.js diff --git a/tests/js/server/tests/shell/shell-compaction-seq-mmfiles-noncluster-timecritical.js b/tests/js/server/shell/shell-compaction-seq-mmfiles-noncluster-timecritical.js similarity index 100% rename from tests/js/server/tests/shell/shell-compaction-seq-mmfiles-noncluster-timecritical.js rename to tests/js/server/shell/shell-compaction-seq-mmfiles-noncluster-timecritical.js diff --git a/tests/js/server/tests/shell/shell-create-options-cluster-spec.js b/tests/js/server/shell/shell-create-options-cluster-spec.js similarity index 100% rename from tests/js/server/tests/shell/shell-create-options-cluster-spec.js rename to tests/js/server/shell/shell-create-options-cluster-spec.js diff --git a/tests/js/server/tests/shell/shell-database-mmfiles-noncluster.js b/tests/js/server/shell/shell-database-mmfiles-noncluster.js similarity index 100% rename from tests/js/server/tests/shell/shell-database-mmfiles-noncluster.js rename to tests/js/server/shell/shell-database-mmfiles-noncluster.js diff --git a/tests/js/server/tests/shell/shell-database-rocksdb-noncluster.js b/tests/js/server/shell/shell-database-rocksdb-noncluster.js similarity index 100% rename from tests/js/server/tests/shell/shell-database-rocksdb-noncluster.js rename to tests/js/server/shell/shell-database-rocksdb-noncluster.js diff --git a/tests/js/server/tests/shell/shell-datafile-mmfiles-timecritical-noncluster.js b/tests/js/server/shell/shell-datafile-mmfiles-timecritical-noncluster.js similarity index 100% rename from tests/js/server/tests/shell/shell-datafile-mmfiles-timecritical-noncluster.js rename to tests/js/server/shell/shell-datafile-mmfiles-timecritical-noncluster.js diff --git a/tests/js/server/tests/shell/shell-distributeShardsLike-cluster.js b/tests/js/server/shell/shell-distributeShardsLike-cluster.js similarity index 100% rename from tests/js/server/tests/shell/shell-distributeShardsLike-cluster.js rename to tests/js/server/shell/shell-distributeShardsLike-cluster.js diff --git a/tests/js/server/tests/shell/shell-edge-index-selectivity-noncluster.js b/tests/js/server/shell/shell-edge-index-selectivity-noncluster.js similarity index 100% rename from tests/js/server/tests/shell/shell-edge-index-selectivity-noncluster.js rename to tests/js/server/shell/shell-edge-index-selectivity-noncluster.js diff --git a/tests/js/server/tests/shell/shell-foxx-auth-spec.js b/tests/js/server/shell/shell-foxx-auth-spec.js similarity index 100% rename from tests/js/server/tests/shell/shell-foxx-auth-spec.js rename to tests/js/server/shell/shell-foxx-auth-spec.js diff --git a/tests/js/server/tests/shell/shell-foxx-cleanup-spec.js b/tests/js/server/shell/shell-foxx-cleanup-spec.js similarity index 100% rename from tests/js/server/tests/shell/shell-foxx-cleanup-spec.js rename to tests/js/server/shell/shell-foxx-cleanup-spec.js diff --git a/tests/js/server/tests/shell/shell-foxx-legacy-base-middleware.js b/tests/js/server/shell/shell-foxx-legacy-base-middleware.js similarity index 100% rename from tests/js/server/tests/shell/shell-foxx-legacy-base-middleware.js rename to tests/js/server/shell/shell-foxx-legacy-base-middleware.js diff --git a/tests/js/server/tests/shell/shell-foxx-legacy-console.js b/tests/js/server/shell/shell-foxx-legacy-console.js similarity index 100% rename from tests/js/server/tests/shell/shell-foxx-legacy-console.js rename to tests/js/server/shell/shell-foxx-legacy-console.js diff --git a/tests/js/server/tests/shell/shell-foxx-legacy-model-events-spec.js b/tests/js/server/shell/shell-foxx-legacy-model-events-spec.js similarity index 100% rename from tests/js/server/tests/shell/shell-foxx-legacy-model-events-spec.js rename to tests/js/server/shell/shell-foxx-legacy-model-events-spec.js diff --git a/tests/js/server/tests/shell/shell-foxx-legacy-model.js b/tests/js/server/shell/shell-foxx-legacy-model.js similarity index 100% rename from tests/js/server/tests/shell/shell-foxx-legacy-model.js rename to tests/js/server/shell/shell-foxx-legacy-model.js diff --git a/tests/js/server/tests/shell/shell-foxx-legacy-query-spec.js b/tests/js/server/shell/shell-foxx-legacy-query-spec.js similarity index 100% rename from tests/js/server/tests/shell/shell-foxx-legacy-query-spec.js rename to tests/js/server/shell/shell-foxx-legacy-query-spec.js diff --git a/tests/js/server/tests/shell/shell-foxx-legacy-repository-events-auto-spec.js b/tests/js/server/shell/shell-foxx-legacy-repository-events-auto-spec.js similarity index 100% rename from tests/js/server/tests/shell/shell-foxx-legacy-repository-events-auto-spec.js rename to tests/js/server/shell/shell-foxx-legacy-repository-events-auto-spec.js diff --git a/tests/js/server/tests/shell/shell-foxx-legacy-repository-events-spec.js b/tests/js/server/shell/shell-foxx-legacy-repository-events-spec.js similarity index 100% rename from tests/js/server/tests/shell/shell-foxx-legacy-repository-events-spec.js rename to tests/js/server/shell/shell-foxx-legacy-repository-events-spec.js diff --git a/tests/js/server/tests/shell/shell-foxx-legacy-repository-spec.js b/tests/js/server/shell/shell-foxx-legacy-repository-spec.js similarity index 100% rename from tests/js/server/tests/shell/shell-foxx-legacy-repository-spec.js rename to tests/js/server/shell/shell-foxx-legacy-repository-spec.js diff --git a/tests/js/server/tests/shell/shell-foxx-legacy-template-middleware.js b/tests/js/server/shell/shell-foxx-legacy-template-middleware.js similarity index 100% rename from tests/js/server/tests/shell/shell-foxx-legacy-template-middleware.js rename to tests/js/server/shell/shell-foxx-legacy-template-middleware.js diff --git a/tests/js/server/tests/shell/shell-foxx-manager-spec-nightly.js b/tests/js/server/shell/shell-foxx-manager-spec-nightly.js similarity index 100% rename from tests/js/server/tests/shell/shell-foxx-manager-spec-nightly.js rename to tests/js/server/shell/shell-foxx-manager-spec-nightly.js diff --git a/tests/js/server/tests/shell/shell-foxx-manager-spec.js b/tests/js/server/shell/shell-foxx-manager-spec.js similarity index 100% rename from tests/js/server/tests/shell/shell-foxx-manager-spec.js rename to tests/js/server/shell/shell-foxx-manager-spec.js diff --git a/tests/js/server/tests/shell/shell-foxx-manifest-spec.js b/tests/js/server/shell/shell-foxx-manifest-spec.js similarity index 100% rename from tests/js/server/tests/shell/shell-foxx-manifest-spec.js rename to tests/js/server/shell/shell-foxx-manifest-spec.js diff --git a/tests/js/server/tests/shell/shell-foxx-queues.js b/tests/js/server/shell/shell-foxx-queues.js similarity index 100% rename from tests/js/server/tests/shell/shell-foxx-queues.js rename to tests/js/server/shell/shell-foxx-queues.js diff --git a/tests/js/server/tests/shell/shell-foxx-request-spec.js b/tests/js/server/shell/shell-foxx-request-spec.js similarity index 100% rename from tests/js/server/tests/shell/shell-foxx-request-spec.js rename to tests/js/server/shell/shell-foxx-request-spec.js diff --git a/tests/js/server/tests/shell/shell-foxx-response-0-spec.js b/tests/js/server/shell/shell-foxx-response-0-spec.js similarity index 100% rename from tests/js/server/tests/shell/shell-foxx-response-0-spec.js rename to tests/js/server/shell/shell-foxx-response-0-spec.js diff --git a/tests/js/server/tests/shell/shell-foxx-response-1-spec.js b/tests/js/server/shell/shell-foxx-response-1-spec.js similarity index 100% rename from tests/js/server/tests/shell/shell-foxx-response-1-spec.js rename to tests/js/server/shell/shell-foxx-response-1-spec.js diff --git a/tests/js/server/tests/shell/shell-foxx-response-2-spec.js b/tests/js/server/shell/shell-foxx-response-2-spec.js similarity index 100% rename from tests/js/server/tests/shell/shell-foxx-response-2-spec.js rename to tests/js/server/shell/shell-foxx-response-2-spec.js diff --git a/tests/js/server/tests/shell/shell-foxx-response-3-spec.js b/tests/js/server/shell/shell-foxx-response-3-spec.js similarity index 100% rename from tests/js/server/tests/shell/shell-foxx-response-3-spec.js rename to tests/js/server/shell/shell-foxx-response-3-spec.js diff --git a/tests/js/server/tests/shell/shell-foxx-router-spec.js b/tests/js/server/shell/shell-foxx-router-spec.js similarity index 100% rename from tests/js/server/tests/shell/shell-foxx-router-spec.js rename to tests/js/server/shell/shell-foxx-router-spec.js diff --git a/tests/js/server/tests/shell/shell-foxx-routing-consistency-spec.js b/tests/js/server/shell/shell-foxx-routing-consistency-spec.js similarity index 100% rename from tests/js/server/tests/shell/shell-foxx-routing-consistency-spec.js rename to tests/js/server/shell/shell-foxx-routing-consistency-spec.js diff --git a/tests/js/server/tests/shell/shell-foxx-swagger-spec.js b/tests/js/server/shell/shell-foxx-swagger-spec.js similarity index 100% rename from tests/js/server/tests/shell/shell-foxx-swagger-spec.js rename to tests/js/server/shell/shell-foxx-swagger-spec.js diff --git a/tests/js/server/tests/shell/shell-foxx.js b/tests/js/server/shell/shell-foxx.js similarity index 100% rename from tests/js/server/tests/shell/shell-foxx.js rename to tests/js/server/shell/shell-foxx.js diff --git a/tests/js/server/tests/shell/shell-hash-index-failures.js b/tests/js/server/shell/shell-hash-index-failures.js similarity index 100% rename from tests/js/server/tests/shell/shell-hash-index-failures.js rename to tests/js/server/shell/shell-hash-index-failures.js diff --git a/tests/js/server/tests/shell/shell-hash-index-selectivity-noncluster.js b/tests/js/server/shell/shell-hash-index-selectivity-noncluster.js similarity index 100% rename from tests/js/server/tests/shell/shell-hash-index-selectivity-noncluster.js rename to tests/js/server/shell/shell-hash-index-selectivity-noncluster.js diff --git a/tests/js/server/tests/shell/shell-index-cluster-spec.js b/tests/js/server/shell/shell-index-cluster-spec.js similarity index 100% rename from tests/js/server/tests/shell/shell-index-cluster-spec.js rename to tests/js/server/shell/shell-index-cluster-spec.js diff --git a/tests/js/server/tests/shell/shell-pregel.js b/tests/js/server/shell/shell-pregel.js similarity index 100% rename from tests/js/server/tests/shell/shell-pregel.js rename to tests/js/server/shell/shell-pregel.js diff --git a/tests/js/server/tests/shell/shell-readonly-mode-spec.js b/tests/js/server/shell/shell-readonly-mode-spec.js similarity index 100% rename from tests/js/server/tests/shell/shell-readonly-mode-spec.js rename to tests/js/server/shell/shell-readonly-mode-spec.js diff --git a/tests/js/server/tests/shell/shell-rocksdb-correctness.js b/tests/js/server/shell/shell-rocksdb-correctness.js similarity index 100% rename from tests/js/server/tests/shell/shell-rocksdb-correctness.js rename to tests/js/server/shell/shell-rocksdb-correctness.js diff --git a/tests/js/server/tests/shell/shell-routing.js b/tests/js/server/shell/shell-routing.js similarity index 100% rename from tests/js/server/tests/shell/shell-routing.js rename to tests/js/server/shell/shell-routing.js diff --git a/tests/js/server/tests/shell/shell-shaped-noncluster.js b/tests/js/server/shell/shell-shaped-noncluster.js similarity index 100% rename from tests/js/server/tests/shell/shell-shaped-noncluster.js rename to tests/js/server/shell/shell-shaped-noncluster.js diff --git a/tests/js/server/tests/shell/shell-skiplist-correctness.js b/tests/js/server/shell/shell-skiplist-correctness.js similarity index 100% rename from tests/js/server/tests/shell/shell-skiplist-correctness.js rename to tests/js/server/shell/shell-skiplist-correctness.js diff --git a/tests/js/server/tests/shell/shell-skiplist-index-selectivity-rocksdb-noncluster.js b/tests/js/server/shell/shell-skiplist-index-selectivity-rocksdb-noncluster.js similarity index 100% rename from tests/js/server/tests/shell/shell-skiplist-index-selectivity-rocksdb-noncluster.js rename to tests/js/server/shell/shell-skiplist-index-selectivity-rocksdb-noncluster.js diff --git a/tests/js/server/tests/shell/shell-skiplist-index.js b/tests/js/server/shell/shell-skiplist-index.js similarity index 100% rename from tests/js/server/tests/shell/shell-skiplist-index.js rename to tests/js/server/shell/shell-skiplist-index.js diff --git a/tests/js/server/tests/shell/shell-skiplist-rm-performance-timecritical-noncluster.js b/tests/js/server/shell/shell-skiplist-rm-performance-timecritical-noncluster.js similarity index 100% rename from tests/js/server/tests/shell/shell-skiplist-rm-performance-timecritical-noncluster.js rename to tests/js/server/shell/shell-skiplist-rm-performance-timecritical-noncluster.js diff --git a/tests/js/server/tests/shell/shell-transactions-noncluster-mmfiles.js b/tests/js/server/shell/shell-transactions-noncluster-mmfiles.js similarity index 100% rename from tests/js/server/tests/shell/shell-transactions-noncluster-mmfiles.js rename to tests/js/server/shell/shell-transactions-noncluster-mmfiles.js diff --git a/tests/js/server/tests/shell/shell-transactions-noncluster.js b/tests/js/server/shell/shell-transactions-noncluster.js similarity index 100% rename from tests/js/server/tests/shell/shell-transactions-noncluster.js rename to tests/js/server/shell/shell-transactions-noncluster.js diff --git a/tests/js/server/tests/shell/shell-wal-mmfiles-noncluster-memoryintense.js b/tests/js/server/shell/shell-wal-mmfiles-noncluster-memoryintense.js similarity index 100% rename from tests/js/server/tests/shell/shell-wal-mmfiles-noncluster-memoryintense.js rename to tests/js/server/shell/shell-wal-mmfiles-noncluster-memoryintense.js diff --git a/tests/js/server/tests/stress/crud.js b/tests/js/server/stress/crud.js similarity index 98% rename from tests/js/server/tests/stress/crud.js rename to tests/js/server/stress/crud.js index 5c975e3d7e..d556d7da57 100644 --- a/tests/js/server/tests/stress/crud.js +++ b/tests/js/server/stress/crud.js @@ -26,7 +26,7 @@ const internal = require('internal'); const fs = require('fs'); -const tasks = require('org/arangodb/tasks'); +const tasks = require('@arangodb/tasks'); const _ = require('lodash'); @@ -295,7 +295,7 @@ exports.createDeleteUpdateParallel = function (opts) { print('Starting', n, 'worker'); const cmd = function (params) { - require('./' + pathForTesting('server/tests/stress/crud')).createDeleteUpdateRaw(params); + require('./' + pathForTesting('server/stress/crud')).createDeleteUpdateRaw(params); }; for (let i = 0; i < n; ++i) { diff --git a/tests/js/server/tests/stress/deadlock.js b/tests/js/server/stress/deadlock.js similarity index 98% rename from tests/js/server/tests/stress/deadlock.js rename to tests/js/server/stress/deadlock.js index 78c3bbb68b..2ea4dbb361 100644 --- a/tests/js/server/tests/stress/deadlock.js +++ b/tests/js/server/stress/deadlock.js @@ -246,7 +246,7 @@ exports.lockCycleParallel = function (opts) { print('Starting', n, 'worker'); const cmd = function (params) { - require('./' + pathForTesting('server/tests/stress/deadlock')).lockCycleRaw(params); + require('./' + pathForTesting('server/stress/deadlock')).lockCycleRaw(params); }; for (let i = 0; i < n; ++i) { diff --git a/tests/js/server/tests/stress/killingQueries.js b/tests/js/server/stress/killingQueries.js similarity index 97% rename from tests/js/server/tests/stress/killingQueries.js rename to tests/js/server/stress/killingQueries.js index ddcc7ed4fd..68f688cfb0 100644 --- a/tests/js/server/tests/stress/killingQueries.js +++ b/tests/js/server/stress/killingQueries.js @@ -481,16 +481,16 @@ exports.killingParallel = function (opts) { // start worker const w = [ function (params) { - require('./' + pathForTesting('server/tests/stress/killingQueries')).inserter(params); + require('./' + pathForTesting('server/stress/killingQueries')).inserter(params); }, function (params) { - require('./' + pathForTesting('server/tests/stress/killingQueries')).updater(params); + require('./' + pathForTesting('server/stress/killingQueries')).updater(params); }, function (params) { - require('./' + pathForTesting('server/tests/stress/killingQueries')).remover(params); + require('./' + pathForTesting('server/stress/killingQueries')).remover(params); }, function (params) { - require('./' + pathForTesting('server/tests/stress/killingQueries')).killer(params); + require('./' + pathForTesting('server/stress/killingQueries')).killer(params); } ]; diff --git a/utils/jslint.sh b/utils/jslint.sh index 454c6ad90c..1c9a97dff1 100755 --- a/utils/jslint.sh +++ b/utils/jslint.sh @@ -10,9 +10,9 @@ if [ "x$@" == "x" ] ; then `find ./js/common/modules/@arangodb -name "*.js"` \ `find ./js/client/modules/@arangodb -name "*.js"` \ `find ./js/server/modules/@arangodb -name "*.js"` \ - `find ./tests/js/server/tests -name "*.js" | grep -v "ranges-combined"` \ - `find ./tests/js/common/tests -name "*.js"` \ - `find ./tests/js/client/tests -name "*.js"` \ + `find ./tests/js/server -name "*.js" | grep -v "ranges-combined"` \ + `find ./tests/js/common -name "*.js" | grep -v "test-data"` \ + `find ./tests/js/client -name "*.js"` \ `find ./UnitTests -name "*.js"` \ \ `find ./js/apps/system/_admin/aardvark/APP/frontend/js/models -name "*.js"` \