Attempt to correct BrowserStack configuration (again).

Author: io7m

run-ci.sh

@@ -41,11 +41,11 @@ APK_FILE=$(realpath app.apk)
 #
 
 info "Uploading APK to BrowserStack"
-BROWSERSTACK_USERNAME=$(yq -r .userName < browserstack.yml)
-BROWSERSTACK_ACCESS_KEY=$(yq -r .accessKey < browserstack.yml)
+export PALACE_BROWSERSTACK_USERNAME=$(yq -r .userName < browserstack.yml)
+export PALACE_BROWSERSTACK_ACCESS_KEY=$(yq -r .accessKey < browserstack.yml)
 
 curl \
-  -u "$BROWSERSTACK_USERNAME:$BROWSERSTACK_ACCESS_KEY" \
+  -u "$PALACE_BROWSERSTACK_USERNAME:$PALACE_BROWSERSTACK_ACCESS_KEY" \
   -o app.json \
   -X POST "https://api-cloud.browserstack.com/app-automate/upload" \
   -F "file=@${APK_FILE}"

src/main/java/org/thepalaceproject/ait/AppiumTestContext.java

@@ -13,6 +13,7 @@
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 public final class AppiumTestContext implements AutoCloseable
 {
@@ -56,22 +57,19 @@ private static AppiumTestContext createForBrowserstack(
     try {
       LOG.debug("Opening Android driver...");
 
+      final var username =
+        System.getenv("PALACE_BROWSERSTACK_USERNAME");
+      final var accessKey =
+        System.getenv("PALACE_BROWSERSTACK_ACCESS_KEY");
+
+      Objects.requireNonNull(username, "PALACE_BROWSERSTACK_USERNAME");
+      Objects.requireNonNull(accessKey, "PALACE_BROWSERSTACK_ACCESS_KEY");
+
       final var caps = new DesiredCapabilities();
-      caps.setCapability("platformName", "Android");
+      caps.setCapability("browserstack.user", username);
+      caps.setCapability("browserstack.key", accessKey);
       caps.setCapability("app", appId);
-      caps.setCapability("automationName", "UIAutomator2");
-
-      final var bstackOpts = new HashMap<>();
-      bstackOpts.put("deviceName", "Google Pixel 7");
-      bstackOpts.put("osVersion", "13.0");
-      bstackOpts.put("projectName", "PalaceIntegrationTests");
-      bstackOpts.put("buildName", "Build XYZ");
-      bstackOpts.put("sessionName", "My test run");
-      bstackOpts.put("appiumVersion", "2.19.0");
-      bstackOpts.put("debug", true);
-      bstackOpts.put("video", true);
-
-      caps.setCapability("bstack:options", bstackOpts);
+
       driver = new AndroidDriver(new URL("https://hub.browserstack.com/wd/hub"), caps);
       LOG.debug("Opened Android driver.");
       resources.add(driver::quit);