From 46b75452dea7783170c8984ebceaefceb6018dad Mon Sep 17 00:00:00 2001
From: kilo52 <phil.gaiser@raven-computing.com>
Date: Wed, 8 Jan 2025 19:50:33 +0100
Subject: [PATCH 1/2] Added standard test script to Node.js server application
 template.

Renames the run.sh script to test.sh and refactores existing
project control code.
---
 js/02_server-nodejs/source/.docker/entrypoint.sh | 10 +++++-----
 js/02_server-nodejs/source/{run.sh => test.sh}   |  8 ++++----
 js/var/script_run_isolated_main                  |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename js/02_server-nodejs/source/{run.sh => test.sh} (85%)

diff --git a/js/02_server-nodejs/source/.docker/entrypoint.sh b/js/02_server-nodejs/source/.docker/entrypoint.sh
index 60e42c1..45c34bc 100755
--- a/js/02_server-nodejs/source/.docker/entrypoint.sh
+++ b/js/02_server-nodejs/source/.docker/entrypoint.sh
@@ -3,16 +3,16 @@
 #                                                                             #
 #                   The Entrypoint for the Docker Container                   #
 #                                                                             #
-# The (first) argument 'app' is handled in a special way. It is used to       #
-# launch the underlying project's run.sh script. All subsequent arguments     #
+# The (first) argument 'tests' is handled in a special way. It is used to     #
+# launch the underlying project's test.sh script. All subsequent arguments    #
 # are passed to that script transparently. If the first argument is           #
-# not 'app', then all arguments are passed to the exec command as is.         #
+# not 'tests', then all arguments are passed to the exec command as is.       #
 #                                                                             #
 ###############################################################################
 
-if [[ "$1" == "app" ]]; then
+if [[ "$1" == "tests" ]]; then
   shift;
-  exec ./run.sh "$@";
+  exec ./test.sh "$@";
 else
   exec "$@";
 fi
diff --git a/js/02_server-nodejs/source/run.sh b/js/02_server-nodejs/source/test.sh
similarity index 85%
rename from js/02_server-nodejs/source/run.sh
rename to js/02_server-nodejs/source/test.sh
index cc3e829..916d141 100755
--- a/js/02_server-nodejs/source/run.sh
+++ b/js/02_server-nodejs/source/test.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
-# Run script for the ${{VAR_PROJECT_NAME}} server application.
+# Test script for the ${{VAR_PROJECT_NAME}} server application.
 
-USAGE="Usage: run.sh [options]";
+USAGE="Usage: test.sh [options]";
 
 HELP_TEXT=$(cat << EOS
-Runs the ${{VAR_PROJECT_NAME}} server application.
+Tests the ${{VAR_PROJECT_NAME}} server application.
 
 ${USAGE}
 
@@ -34,7 +34,7 @@ ${{VAR_SCRIPT_BUILD_ISOLATED_ARGPARSE}}
     echo "Unknown argument: '$arg'";
     echo "$USAGE";
     echo "";
-    echo "Run 'run.sh --help' for more information";
+    echo "Run 'test.sh --help' for more information";
     exit 1;
     ;;
   esac
diff --git a/js/var/script_run_isolated_main b/js/var/script_run_isolated_main
index 48c7d86..539273b 100644
--- a/js/var/script_run_isolated_main
+++ b/js/var/script_run_isolated_main
@@ -1,5 +1,5 @@
 if [[ $ARG_ISOLATED == true ]]; then
   source ".docker/controls.sh";
-  project_run_isolated app "${ARGS_ISOLATED[@]}";
+  project_run_isolated tests "${ARGS_ISOLATED[@]}";
   exit $?;
 fi

From f27c03e1744351a0d23dc68074a6aaf15cc57082 Mon Sep 17 00:00:00 2001
From: kilo52 <phil.gaiser@raven-computing.com>
Date: Fri, 10 Jan 2025 14:36:17 +0100
Subject: [PATCH 2/2] Fixed wrong file name in test case.

---
 tests/test_func_js_server-nodejs.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_func_js_server-nodejs.sh b/tests/test_func_js_server-nodejs.sh
index 9544614..16ec978 100644
--- a/tests/test_func_js_server-nodejs.sh
+++ b/tests/test_func_js_server-nodejs.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (C) 2023 Raven Computing
+# Copyright (C) 2025 Raven Computing
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ function test_functionality_result() {
   files+=("package.json");
   files+=("app.js");
   files+=("public/index.html");
-  files+=("run.sh");
+  files+=("test.sh");
   files+=(".docker/controls.sh");
   files+=(".docker/Dockerfile-run");
   files+=(".docker/entrypoint.sh");