Parameterize tests by devices.

Author: io7m

pom.xml

@@ -30,7 +30,7 @@
     <mdep.analyze.skip>true</mdep.analyze.skip>
 
     <!-- Dependencies. -->
-    <org.junit.version>5.11.1</org.junit.version>
+    <org.junit.version>6.0.1</org.junit.version>
     <io.appium.version>10.0.0</io.appium.version>
   </properties>
 
@@ -84,6 +84,10 @@
       <groupId>org.junit.platform</groupId>
       <artifactId>junit-platform-launcher</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>com.io7m.jmulticlose</groupId>

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

@@ -0,0 +1,15 @@
+package org.thepalaceproject.ait;
+
+/**
+ * A single device configuration.
+ *
+ * @param deviceName The device name. For example, "Samsung Galaxy S22".
+ * @param osVersion  The OS version. For example, "12.0".
+ */
+
+public record AppiumDeviceConfiguration(
+  String deviceName,
+  String osVersion)
+{
+
+}

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

@@ -0,0 +1,25 @@
+package org.thepalaceproject.ait;
+
+import java.util.stream.Stream;
+
+/**
+ * The set of device configurations we use to run each test.
+ */
+
+public final class AppiumDeviceConfigurations
+{
+  private AppiumDeviceConfigurations()
+  {
+
+  }
+
+  public static Stream<AppiumDeviceConfiguration> deviceConfigurations()
+  {
+    return Stream.of(
+      new AppiumDeviceConfiguration(
+        "Samsung Galaxy S22",
+        "12.0"
+      )
+    );
+  }
+}

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

@@ -30,29 +30,39 @@ private AppiumTestContext(
   }
 
   public static AppiumTestContext createForTestInfo(
-    final TestInfo testInfo)
+    final TestInfo testInfo,
+    final AppiumDeviceConfiguration deviceConfiguration)
     throws Exception
   {
-    return create(AppiumTestContext.createTestName(testInfo));
+    return create(
+      AppiumTestContext.createTestName(testInfo),
+      deviceConfiguration
+    );
   }
 
   public static AppiumTestContext create(
-    final String testName)
+    final String testName,
+    final AppiumDeviceConfiguration deviceConfiguration)
     throws Exception
   {
     LOG.debug("Setting up Appium context...");
 
     final var browserstackAppId =
       System.getenv("PALACE_BROWSERSTACK_APP_URL");
     if (browserstackAppId != null) {
-      return createForBrowserstack(testName, browserstackAppId);
+      return createForBrowserstack(
+        testName,
+        browserstackAppId,
+        deviceConfiguration
+      );
     }
     return createForLocal(testName);
   }
 
   private static AppiumTestContext createForBrowserstack(
     final String testName,
-    final String appId)
+    final String appId,
+    final AppiumDeviceConfiguration deviceConfiguration)
     throws Exception
   {
     final var resources =
@@ -81,8 +91,8 @@ private static AppiumTestContext createForBrowserstack(
       browserstackOptions.put("sessionName", testName);
 
       final var caps = new DesiredCapabilities();
-      caps.setCapability("appium:deviceName", "Samsung Galaxy S22");
-      caps.setCapability("appium:os_version", "12.0");
+      caps.setCapability("appium:deviceName", deviceConfiguration.deviceName());
+      caps.setCapability("appium:os_version", deviceConfiguration.osVersion());
       caps.setCapability("appium:app", appId);
       caps.setCapability("platformName", "Android");
       caps.setCapability("bstack:options", browserstackOptions);

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

@@ -1,35 +1,32 @@
 package org.thepalaceproject.ait;
 
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.MethodOrderer;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInfo;
 import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 @TestMethodOrder(MethodOrderer.DisplayName.class)
 public final class StartupTest
 {
   private AppiumTestContext context;
 
-  @BeforeEach
-  public void setUp(
-    final TestInfo testInfo)
-    throws Exception
-  {
-    this.context = AppiumTestContext.createForTestInfo(testInfo);
-  }
-
   @AfterEach
   public void tearDown()
     throws Exception
   {
     this.context.close();
   }
 
-  @Test
-  void testHelloWorld()
+  @ParameterizedTest
+  @MethodSource("org.thepalaceproject.ait.AppiumDeviceConfigurations#deviceConfigurations")
+  void testHelloWorld(
+    final AppiumDeviceConfiguration device,
+    final TestInfo testInfo)
+    throws Exception
   {
+    this.context = AppiumTestContext.createForTestInfo(testInfo, device);
     SplashScreen.waitForAndCompleteSplashScreen(this.context);
   }
 }