From 06b9819d47ca8d31f18b4db27db2c1036f0377aa Mon Sep 17 00:00:00 2001
From: Juan Ayala <19715035+juan-ayala@users.noreply.github.com>
Date: Thu, 12 Sep 2024 20:28:23 +0000
Subject: [PATCH] make minor test improvements to aem-sdk

---
 test/aem-sdk/defaults-with-sdk.sh                   |   6 +++---
 test/aem-sdk/options-with-sdk.sh                    |   8 ++++----
 .../{sdksfolder => }/aem-sdk-mock-2024.01.01.zip    |   0
 .../{sdksfolder => }/aem-sdk-mock-2024.02.01.zip    | Bin
 .../{sdksfolder => }/aem-sdk-mock-2024.03.01.zip    |   0
 test/aem-sdk/scenarios.json                         |   2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename test/aem-sdk/options-with-sdk/{sdksfolder => }/aem-sdk-mock-2024.01.01.zip (100%)
 rename test/aem-sdk/options-with-sdk/{sdksfolder => }/aem-sdk-mock-2024.02.01.zip (100%)
 rename test/aem-sdk/options-with-sdk/{sdksfolder => }/aem-sdk-mock-2024.03.01.zip (100%)

diff --git a/test/aem-sdk/defaults-with-sdk.sh b/test/aem-sdk/defaults-with-sdk.sh
index 67d7d09..ac0a955 100644
--- a/test/aem-sdk/defaults-with-sdk.sh
+++ b/test/aem-sdk/defaults-with-sdk.sh
@@ -21,10 +21,10 @@ check "start-aem is +x" \
     stat -c '%A' $(which start-aem) | grep 'x.*x.*x'
 # Check that author/publish/dispatcher installs and starts
 check "can install & run author" \
-    bash -c "start-aem author | grep 'hello, world'"
+    start-aem author | grep 'hello, world'
 check "can install & run publish" \
-    bash -c "start-aem publish | grep 'hello, world'"
+    start-aem publish | grep 'hello, world'
 check "can install & run dispatcher" \
-    bash -c "start-aem dispatcher | grep 'All your base are belong to us'"
+    start-aem dispatcher | grep 'All your base are belong to us'
 
 reportResults
diff --git a/test/aem-sdk/options-with-sdk.sh b/test/aem-sdk/options-with-sdk.sh
index 36e8f9c..c4e8c98 100644
--- a/test/aem-sdk/options-with-sdk.sh
+++ b/test/aem-sdk/options-with-sdk.sh
@@ -7,7 +7,7 @@ source dev-container-features-test-lib
 # Check options file created with defaults
 source ${AEM_SDK_FEATURE_DIR}/options.sh
 check "sdks directory default" \
-    echo "${AEM_SDK_SDKS_DIRECTORY}" | grep -E "^/workspaces/[0-9]+/.devcontainer/sdksfolder$"
+    echo "${AEM_SDK_SDKS_DIRECTORY}" | grep -E "^/workspaces/[0-9]+/.devcontainer$"
 check "sdk version default" \
     [ "${AEM_SDK_VERSION}" = "mock-2024.02.01" ]
 check "author port default" \
@@ -21,10 +21,10 @@ check "start-aem is +x" \
     stat -c '%A' $(which start-aem) | grep 'x.*x.*x'
 # Check that author/publish/dispatcher installs and starts
 check "can install & run author" \
-    bash -c "start-aem author | grep 'hello, world'"
+    start-aem author | grep 'hello, world'
 check "can install & run publish" \
-    bash -c "start-aem publish | grep 'hello, world'"
+    start-aem publish | grep 'hello, world'
 check "can install & run dispatcher" \
-    bash -c "start-aem dispatcher | grep 'All your base are belong to us'"
+    start-aem dispatcher | grep 'All your base are belong to us'
 
 reportResults
diff --git a/test/aem-sdk/options-with-sdk/sdksfolder/aem-sdk-mock-2024.01.01.zip b/test/aem-sdk/options-with-sdk/aem-sdk-mock-2024.01.01.zip
similarity index 100%
rename from test/aem-sdk/options-with-sdk/sdksfolder/aem-sdk-mock-2024.01.01.zip
rename to test/aem-sdk/options-with-sdk/aem-sdk-mock-2024.01.01.zip
diff --git a/test/aem-sdk/options-with-sdk/sdksfolder/aem-sdk-mock-2024.02.01.zip b/test/aem-sdk/options-with-sdk/aem-sdk-mock-2024.02.01.zip
similarity index 100%
rename from test/aem-sdk/options-with-sdk/sdksfolder/aem-sdk-mock-2024.02.01.zip
rename to test/aem-sdk/options-with-sdk/aem-sdk-mock-2024.02.01.zip
diff --git a/test/aem-sdk/options-with-sdk/sdksfolder/aem-sdk-mock-2024.03.01.zip b/test/aem-sdk/options-with-sdk/aem-sdk-mock-2024.03.01.zip
similarity index 100%
rename from test/aem-sdk/options-with-sdk/sdksfolder/aem-sdk-mock-2024.03.01.zip
rename to test/aem-sdk/options-with-sdk/aem-sdk-mock-2024.03.01.zip
diff --git a/test/aem-sdk/scenarios.json b/test/aem-sdk/scenarios.json
index c62ca76..1863235 100644
--- a/test/aem-sdk/scenarios.json
+++ b/test/aem-sdk/scenarios.json
@@ -13,7 +13,7 @@
         "features": {
             "ghcr.io/devcontainers/features/java:1": {},
             "aem-sdk": {
-                "sdksDirectory": "${containerWorkspaceFolder}/.devcontainer/sdksfolder",
+                "sdksDirectory": "${containerWorkspaceFolder}/.devcontainer",
                 "sdkVersion": "mock-2024.02.01",
                 "authorPort": "3001",
                 "publishPort": "3002",