fixup! test: fix tests so they'll run on Windows

.github/workflows/build.yml

@@ -34,4 +34,8 @@ jobs:
 
             - name: Run Tests
               shell: bash
-              run: bash --version && ./gradlew -i check integrationTest && bin/test
+              run: |
+                set -e
+                bin/disable-gradle-daemon
+                ./gradlew -i check integrationTest
+                bin/test

agent/bin/test_install

@@ -28,7 +28,7 @@ function install_petclinic (
         git checkout "${oldVersion}" 
         ;;
     esac
-    ./mvnw --quiet package -Dmaven.test.skip=true
+    ./mvnw --quiet package -DskipTests -Dcheckstyle.skip=true -Dspring-javaformat.skip=true
   else
     case "${JAVA_VERSION}" in
       1.8*)
@@ -37,7 +37,7 @@ function install_petclinic (
         echo "No old version, not packaging in ${pkg}"
         ;;
       17.*)
-        ./mvnw --quiet package -Dmaven.test.skip=true
+        ./mvnw --quiet package -DskipTests -Dcheckstyle.skip=true -Dspring-javaformat.skip=true
         ;;
     esac
   fi

agent/bin/test_run

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
+# set -e
 
 export PATH="$BATS_DIR"/bin:$PATH
 
@@ -13,6 +13,7 @@ report_failure() {
 
 trap 'report_failure $LINENO' ERR
 
+set -x
 ./test/petclinic/test
 if [[ $JAVA_VERSION == 17.* ]]; then
   ./test/petclinic-fw/test

agent/test/access/test

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-bats --tap test/access/access.bats
+bats -x --tap test/access/access.bats

agent/test/agent_cli/test

@@ -6,7 +6,7 @@ cp test/petclinic/appmap.yml test/agent_cli/spring-petclinic/.
 mkdir -p build/log
 
 run_bats() {
-  bats --tap test/agent_cli/agent_cli.bats > build/log/bats-agent_cli.log 2>&1
+  bats -x --tap test/agent_cli/agent_cli.bats
 }
 ${@:-run_bats}
 bats_ret=$?

agent/test/classloading/test

@@ -1,2 +1,2 @@
 #!/bin/bash
-bats --tap test/classloading "${@}"
+bats -x --tap test/classloading "${@}"

agent/test/helper.bash

@@ -15,7 +15,9 @@ start_recording() {
 }
 
 stop_recording() {
-  output="$(_curl -sXDELETE ${WS_URL}/_appmap/record | tee /dev/stderr)"
+  local out="${1:-$BATS_TEST_TMPDIR/stop_recording_output}"
+  _curl -sXDELETE -o "$out" "${WS_URL}/_appmap/record" || true
+  [ -f $out ] && output="$(< $out)" || true
 }
 
 teardown() {
@@ -26,7 +28,7 @@ print_debug() {
   local query="${1}"
   local result="${2}"
 
-  if [[ ! -z "${DEBUG_JSON}" ]]; then
+  if [[ ! -z "${DEBUG_JSON}" || ! -z "${JSON_DEBUG}" ]]; then
     echo >&3
     echo "query: ${query}" >&3
     echo >&3
@@ -83,7 +85,7 @@ assert_json_not_contains() {
 }
 
 find_agent_jar() {
-  echo "$PWD/build/libs/$(ls build/libs | grep 'appmap-[[:digit:]]')"
+  echo "$(git rev-parse --show-toplevel)/agent/build/libs/$(ls build/libs | grep 'appmap-[[:digit:]]')"
 }
 
 check_ws_running() {
@@ -144,17 +146,17 @@ start_petclinic() {
 }
 
 start_petclinic_fw() {
-  export LOG_DIR=$PWD/build/log
+  WD="$(git rev-parse --show-toplevel)/agent"
+  export LOG_DIR="$WD/build/log"
   mkdir -p ${LOG_DIR}
 
-  export LOG=$PWD/build/fixtures/spring-framework-petclinic/petclinic.log
+  export LOG="$WD/build/fixtures/spring-framework-petclinic/petclinic.log"
   export WS_SCHEME="http" WS_HOST="localhost" WS_PORT="8080"
   export WS_URL="${WS_SCHEME}://${WS_HOST}:${WS_PORT}"
 
   check_ws_running
 
   printf '  starting PetClinic (framework)\n'
-  WD=$PWD
   AGENT_JAR="$(find_agent_jar)"
 
   pushd build/fixtures/spring-framework-petclinic >/dev/null
@@ -164,10 +166,13 @@ start_petclinic_fw() {
   local mvn_pid=$!
   popd >/dev/null
 
-  while ! pgrep -P $mvn_pid; do
+  while ! ps -p $mvn_pid >/dev/null; do
     sleep 1
   done
-  export JVM_PID=$(pgrep -P $mvn_pid)
+  # Final check, this will fail if the server didn't start
+  ps -p $mvn_pid
+
+  export JVM_PID=$(ps -p $mvn_pid | awk 'END {print $1}')
 
   wait_for_ws
 }

agent/test/http_client/test

@@ -1,2 +1,2 @@
-#!/bin/bash
-bats --tap test/http_client "${@}"
+#!/usr/bin/env bash
+bats -x --tap test/http_client "${@}"

agent/test/httpcore/httpcore.bats

@@ -67,7 +67,7 @@ load '../helper'
   _curl -XGET "${WS_URL}"
 
   stop_recording
-
+  echo "${output}" >&3
   # Sanity check the events and classmap
   assert_json_eq '.events | length' 6
 
@@ -80,14 +80,11 @@ load '../helper'
 
   # Pick the functions out of the classMap
   local filter='[.classMap | paths(objects) as $p | getpath($p) | select(.type == "function")]'
-
+  local join='join(",")'
+
   assert_json_eq "${filter}[0].name" 'sayHello'
-  assert_json_eq "${filter}[0].labels" '[
-  "say",
-  "Hello"
-]'
+  assert_json_eq "${filter}[0].labels | ${join}" 'say,Hello'
+
   assert_json_eq "${filter}[1].name" 'handle'
-  assert_json_eq "${filter}[1].labels" '[
-  "handler"
-]'
+  assert_json_eq "${filter}[1].labels | ${join}" 'handler'
 }

agent/test/httpcore/test

@@ -30,7 +30,7 @@ start_server() {
 start_server
 
 run_bats() {
-  bats --tap test/httpcore/httpcore.bats > build/log/bats-httpcore.log 2>&1
+  bats -x --tap test/httpcore/httpcore.bats
 }
 ${@:-run_bats}
 bats_ret=$?

agent/test/jdbc/test

@@ -3,4 +3,4 @@
 LOG=build/log/bats-jdbc.log 
 trap "cat $LOG" ERR
 
-bats --tap test/jdbc/jdbc.bats >$LOG 2>&1
+bats --x -tap test/jdbc/jdbc.bat

agent/test/petclinic-fw/test

@@ -1,2 +1,2 @@
 #!/bin/bash
-bats --tap test/petclinic-fw"${@}"
+bats -x --tap test/petclinic-fw"${@}"

agent/test/petclinic-shared/message-params.bash

@@ -6,15 +6,14 @@ _test_form_data_is_recorded_as_message_parameters() {
   run _curl -sf -o /dev/null "${WS_URL}/owners/1/edit" \
     --data-raw 'firstName=Ben&lastName=Franklin&address=110+W.+Liberty+St.&city=Madison&telephone=6085551023'
   assert_success
-  stop_recording
+  local out="$BATS_TEST_TMPDIR/stop_recording_output"
+  stop_recording "${out}"
 
-  local appmap="$(npx @appland/appmap prune --output-data /dev/stdin <<< "$output")"
-  run jq -r '.events[] | select(.http_server_request.normalized_path_info == "/owners/{ownerId}/edit") | .message[] | .name' <<< "${appmap}"
-  assert_output 'firstName
-lastName
-address
-city
-telephone'
+  run npx @appland/appmap@latest prune --output-data "${out}"
+  assert_success
+
+  run jq -r '[.events[] | select(.http_server_request.normalized_path_info == "/owners/{ownerId}/edit") | .message[] | .name] | join(",")' <<< "${output}"
+  assert_output 'firstName,lastName,address,city,telephone'
 }
 
 _test_the_agent_doesnt_exhaust_theInputStream() {

agent/test/petclinic/test

@@ -1,2 +1,2 @@
 #!/bin/bash
-bats --tap test/petclinic "${@}"
+bats -x --tap test/petclinic "${@}"

agent/test/spark/test

@@ -1,2 +1,2 @@
 #!/bin/bash
-bats --tap test/spark "${@}"
+bats -x --tap test/spark "${@}"

bin/disable-gradle-daemon

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -e
+
+mkdir -p ~/.gradle
+echo "org.gradle.daemon=false" >> ~/.gradle/gradle.properties

bin/test

@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-which bash
-bash --version
-
 set -e
 
 (cd agent && bin/run_tests)