moved tests into sub-directories

js/client/modules/@arangodb/testing.js

@@ -20,7 +20,7 @@
 /// See the License for the specific language governing permissions and
 /// limitations under the License.
 ///
-/// Copyright holder is triAGENS GmbH, Cologne, Germany
+/// Copyright holder is ArangoDB GmbH, Cologne, Germany
 ///
 /// @author Max Neunhoeffer
 ////////////////////////////////////////////////////////////////////////////////
@@ -1468,52 +1468,45 @@ function findTests() {
     return;
   }
 
-  testsCases.common = _.filter(fs.list(makePathUnix("js/common/tests")),
+  testsCases.common = _.filter(fs.list(makePathUnix("js/common/tests/shell")),
     function(p) {
-      return p.substr(0, 6) === "shell-" &&
-        p.substr(-3) === ".js";
+      return p.substr(-3) === ".js";
     }).map(
     function(x) {
-      return fs.join(makePathUnix("js/common/tests"), x);
+      return fs.join(makePathUnix("js/common/tests/shell"), x);
     }).sort();
 
-  testsCases.server_only = _.filter(fs.list(makePathUnix("js/server/tests")),
+  testsCases.server_only = _.filter(fs.list(makePathUnix("js/server/tests/shell")),
     function(p) {
-      return p.substr(0, 6) === "shell-" &&
-        p.substr(-3) === ".js";
+      return p.substr(-3) === ".js";
     }).map(
     function(x) {
-      return fs.join(makePathUnix("js/server/tests"), x);
+      return fs.join(makePathUnix("js/server/tests/shell"), x);
     }).sort();
 
-  testsCases.client_only = _.filter(fs.list(makePathUnix("js/client/tests")),
+  testsCases.client_only = _.filter(fs.list(makePathUnix("js/client/tests/shell")),
     function(p) {
-      return p.substr(0, 6) === "shell-" &&
-        p.substr(-3) === ".js";
+      return p.substr(-3) === ".js";
     }).map(
     function(x) {
-      return fs.join(makePathUnix("js/client/tests"), x);
+      return fs.join(makePathUnix("js/client/tests/shell"), x);
     }).sort();
 
-  testsCases.server_aql = _.filter(fs.list(makePathUnix("js/server/tests")),
+  testsCases.server_aql = _.filter(fs.list(makePathUnix("js/server/tests/aql")),
     function(p) {
-      return p.substr(0, 4) === "aql-" &&
-        p.substr(-3) === ".js" &&
-        p.indexOf("ranges-combined") === -1;
+      return p.substr(-3) === ".js" && p.indexOf("ranges-combined") === -1;
     }).map(
     function(x) {
-      return fs.join(makePathUnix("js/server/tests"), x);
+      return fs.join(makePathUnix("js/server/tests/aql"), x);
     }).sort();
 
   testsCases.server_aql_extended =
-    _.filter(fs.list(makePathUnix("js/server/tests")),
+    _.filter(fs.list(makePathUnix("js/server/tests/aql")),
       function(p) {
-        return p.substr(0, 4) === "aql-" &&
-          p.substr(-3) === ".js" &&
-          p.indexOf("ranges-combined") !== -1;
+        return p.substr(-3) === ".js" && p.indexOf("ranges-combined") !== -1;
       }).map(
       function(x) {
-        return fs.join(makePathUnix("js/server/tests"), x);
+        return fs.join(makePathUnix("js/server/tests/aql"), x);
       }).sort();
 
   testsCases.server_aql_performance =

js/client/tests/README

@@ -1,15 +1,14 @@
 Conventions for testing framework:
 ==================================
 
-All files in this directory whose name starts with "shell-"
-and ends with ".js" automatically take part in client
-shell tests (target "shell_client").
+All files in the directory "shell" and ends with ".js" automatically
+take part in client shell tests (target "shell_client").
 
-If the filename contains the string "-cluster", then it is
-only executed when testing in cluster mode. If the filename
-contains the string "-noncluster", then it is only executed
-when testing in single instance mode.
+If the filename contains the string "-cluster", then it is only
+executed when testing in cluster mode. If the filename contains the
+string "-noncluster", then it is only executed when testing in single
+instance mode.
 
-If the filename contains the string "-disabled", then it is
-not executed at all. This is for tests that cannot be run from the
+If the filename contains the string "-disabled", then it is not
+executed at all. This is for tests that cannot be run from the
 JavaScript test framework and have to be run from the Makefile.

js/common/tests/README

@@ -1,16 +1,15 @@
 Conventions for testing framework:
 ==================================
 
-All files in this directory whose name starts with "shell-"
-and ends with ".js" automatically take part in client and 
-server shell tests (targets "shell_client" and "shell_server"
-and "shell_server_only").
+All files in the directory "shell" and ends with ".js" automatically
+take part in client and server shell tests (targets "shell_client" and
+"shell_server" and "shell_server_only").
 
-If the filename contains the string "-cluster", then it is
-only executed when testing in cluster mode. If the filename
-contains the string "-noncluster", then it is only executed
-when testing in single instance mode.
+If the filename contains the string "-cluster", then it is only
+executed when testing in cluster mode. If the filename contains the
+string "-noncluster", then it is only executed when testing in single
+instance mode.
 
-If the filename contains the string "-disabled", then it is
-not executed at all. This is for tests that cannot be run from the
+If the filename contains the string "-disabled", then it is not
+executed at all. This is for tests that cannot be run from the
 JavaScript test framework and have to be run from the Makefile.

js/server/tests/README

@@ -1,21 +1,20 @@
 Conventions for testing framework:
 ==================================
 
-All files in this directory whose name starts with "shell-"
-and ends with ".js" automatically take part in server
-shell tests (targets "shell_server" and "shell-server-only").
+All files in the directory "shell" and ends with ".js" automatically
+take part in server shell tests (targets "shell_server" and
+"shell-server-only").
 
-All files in this directory whose name starts with "ahuacatl-"
-and ends with ".js" automatically take part in server ahuacatl
-tests (target "shell_server_ahuacatl"). Those, whose filename
-contains the string "ranges-combined" are only taken if the
-flag "skipRanges" in the test options is set to false.
+All files in the directory "aql" and ends with ".js" automatically
+take part in server aql tests (target "shell_server_aql"). Those,
+whose filename contains the string "ranges-combined" are only taken if
+the flag "skipRanges" in the test options is set to false.
 
-If the filename contains the string "-cluster", then it is
-only executed when testing in cluster mode. If the filename
-contains the string "-noncluster", then it is only executed
-when testing in single instance mode.
+If the filename contains the string "-cluster", then it is only
+executed when testing in cluster mode. If the filename contains the
+string "-noncluster", then it is only executed when testing in single
+instance mode.
 
-If the filename contains the string "-disabled", then it is
-not executed at all. This is for tests that cannot be run from the
+If the filename contains the string "-disabled", then it is not
+executed at all. This is for tests that cannot be run from the
 JavaScript test framework and have to be run from the Makefile.