WIP 5

Author: andy-tier1app

docker-compose.test.yml

@@ -12,10 +12,10 @@ services:
         set -e
         # Install procps for pgrep (needed by healthcheck)
         apt-get update -qq && apt-get install -y -qq procps > /dev/null 2>&1
-        # Run buggyapp in foreground
-        exec java -Xms128m -Xmx256m -XX:+PrintGCDetails -Xloggc:/tmp/gc.log -jar buggyapp.jar
+        # Run buggyapp as web application in foreground with GC logging
+        exec java -Xmx2g -DlogDir=. -DuploadDir=. -XX:+PrintGCDetails -Xloggc:/tmp/gc.log -jar webapp-runner.jar --port 9010 buggyapp.war
     healthcheck:
-      test: ["CMD-SHELL", "pgrep -f 'java.*buggyapp' || exit 1"]
+      test: ["CMD-SHELL", "pgrep -f 'java.*webapp-runner' || exit 1"]
       interval: 5s
       timeout: 3s
       retries: 10

test/scripts/setup-fixtures.sh

@@ -9,38 +9,39 @@ FIXTURES_DIR="$(cd "$FIXTURES_DIR" && pwd)"
 
 echo "[INFO] Setting up test fixtures..."
 
-# Download BuggyApp if not present
-if [ ! -f "$FIXTURES_DIR/buggyapp.jar" ]; then
-    echo "[INFO] Downloading BuggyApp..."
+# Download BuggyApp distribution if not present
+if [ ! -f "$FIXTURES_DIR/launch.sh" ]; then
+    echo "[INFO] Downloading BuggyApp distribution..."
     if ! curl -sSLo "$FIXTURES_DIR/buggyapp.zip" \
         https://tier1app.com/dist/buggyapp/buggyapp-latest.zip; then
         echo "[ERROR] Failed to download BuggyApp from tier1app.com"
         exit 1
     fi
 
-    if ! unzip -q "$FIXTURES_DIR/buggyapp.zip" -d "$FIXTURES_DIR/buggyapp_temp"; then
+    echo "[INFO] Extracting BuggyApp distribution..."
+    if ! unzip -q "$FIXTURES_DIR/buggyapp.zip" -d "$FIXTURES_DIR"; then
         echo "[ERROR] Failed to unzip BuggyApp"
         rm -f "$FIXTURES_DIR/buggyapp.zip"
         exit 1
     fi
 
-    # The jar file might be buggyApp.jar or buggyapp.jar
-    if [ -f "$FIXTURES_DIR/buggyapp_temp/buggyApp.jar" ]; then
-        mv "$FIXTURES_DIR/buggyapp_temp/buggyApp.jar" "$FIXTURES_DIR/buggyapp.jar"
-    elif [ -f "$FIXTURES_DIR/buggyapp_temp/buggyapp.jar" ]; then
-        mv "$FIXTURES_DIR/buggyapp_temp/buggyapp.jar" "$FIXTURES_DIR/buggyapp.jar"
+    rm -f "$FIXTURES_DIR/buggyapp.zip"
+
+    # Make launch script executable
+    if [ -f "$FIXTURES_DIR/launch.sh" ]; then
+        chmod +x "$FIXTURES_DIR/launch.sh"
+    elif [ -f "$FIXTURES_DIR/launch.bat" ]; then
+        echo "[INFO] Windows launch script found"
     else
-        echo "[ERROR] Could not find buggyApp.jar or buggyapp.jar in downloaded archive"
-        echo "[INFO] Contents of archive:"
-        ls -la "$FIXTURES_DIR/buggyapp_temp/"
-        rm -rf "$FIXTURES_DIR/buggyapp_temp" "$FIXTURES_DIR/buggyapp.zip"
+        echo "[ERROR] Could not find launch script in downloaded archive"
+        echo "[INFO] Contents of fixtures directory:"
+        ls -la "$FIXTURES_DIR/"
         exit 1
     fi
 
-    rm -rf "$FIXTURES_DIR/buggyapp_temp" "$FIXTURES_DIR/buggyapp.zip"
-    echo "[INFO] BuggyApp downloaded successfully"
+    echo "[INFO] BuggyApp distribution downloaded successfully"
 else
-    echo "[INFO] BuggyApp already exists at $FIXTURES_DIR/buggyapp.jar"
+    echo "[INFO] BuggyApp already exists at $FIXTURES_DIR/"
 fi
 
 # Compile MyClass.java if it exists