CLDR-14409 Make cldr-apps-webdriver a project module; minor fixes

tools/cldr-apps-webdriver/.gitignore

@@ -1,4 +1,3 @@
 .DS_Store
 /target
-surveydriver.properties
 scripts/selenium-server.jar

tools/cldr-apps-webdriver/Dockerfile

@@ -4,4 +4,4 @@ FROM maven:3-eclipse-temurin-17-alpine
 WORKDIR /workarea
 COPY . /workarea
 COPY surveydriver-docker.properties /workarea/surveydriver.properties
-CMD ["mvn", "-B", "test"]
+CMD ["mvn", "compile", "exec:java", "-Dexec.mainClass=org.unicode.cldr.surveydriver.SurveyDriver"]

tools/cldr-apps-webdriver/README.md

@@ -4,6 +4,11 @@
 
 https://www.w3.org/TR/webdriver/ “WebDriver is a remote control interface that enables introspection and control of user agents”
 
+to run the webdriver, execute:
+
+	mvn --file=tools/pom.xml -pl cldr-apps-webdriver exec:java -Dexec.mainClass=org.unicode.cldr.surveydriver.SurveyDriver
+
+
 ### Copyright & Licenses
 
 Copyright © 2018-2024 Unicode, Inc. Unicode and the Unicode Logo are registered trademarks of Unicode, Inc. in the United States and other countries.

tools/cldr-apps-webdriver/pom.xml

@@ -4,7 +4,7 @@
   <groupId>org.unicode.cldr.surveydriver</groupId>
   <artifactId>cldr-apps-webdriver</artifactId>
   <version>1.0-SNAPSHOT</version>
-  <name>cldr-apps-webdriver</name>
+  <name>CLDR Apps Webdriver</name>
   <licenses>
     <license>
       <name>Unicode-3.0</name>
@@ -16,14 +16,9 @@
     <maven.compiler.target>11</maven.compiler.target>
     <spotless.version>2.35.0</spotless.version>
     <google-java-style.version>1.15.0</google-java-style.version>
+    <mainClass>org.unicode.cldr.surveydriver.SurveyDriver</mainClass>
   </properties>
   <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.13.2</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.seleniumhq.selenium</groupId>
       <artifactId>selenium-java</artifactId>
@@ -91,14 +86,32 @@
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
           <version>3.3.0</version>
+          <configuration>
+            <archive>
+              <manifest>
+                <addClasspath>true</addClasspath>
+                <mainClass>${mainClass}</mainClass>
+              </manifest>
+            </archive>
+          </configuration>
         </plugin>
+      <!--  <plugin>
+          <artifactId>exec-maven-plugin</artifactId>
+          <version>3.5.1</version>
+        </plugin> -->
         <plugin>
           <artifactId>maven-install-plugin</artifactId>
           <version>2.5.2</version>
+           <configuration>
+            <skipIfEmpty>true</skipIfEmpty>
+          </configuration>
         </plugin>
         <plugin>
           <artifactId>maven-deploy-plugin</artifactId>
           <version>2.8.2</version>
+          <configuration>
+            <skipIfEmpty>true</skipIfEmpty>
+          </configuration>
         </plugin>
         <!-- site lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle -->
         <plugin>
@@ -111,5 +124,22 @@
         </plugin>
       </plugins>
     </pluginManagement>
+    <plugins>
+	  <!--
+      <plugin>
+        <artifactId>exec-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>java</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <mainClass>${mainClass}</mainClass>
+        </configuration>
+		</plugin>
+		-->
+    </plugins>
   </build>
 </project>

tools/cldr-apps-webdriver/src/test/java/org/unicode/cldr/surveydriver/SurveyDriver.java → tools/cldr-apps-webdriver/src/main/java/org/unicode/cldr/surveydriver/SurveyDriver.java

@@ -1,7 +1,5 @@
 package org.unicode.cldr.surveydriver;
 
-import static org.junit.Assert.assertTrue;
-
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.time.Duration;
@@ -56,6 +54,9 @@
  */
 public class SurveyDriver {
 
+    static void assertTrue(boolean b) {
+        if (!b) throw new RuntimeException("Expected true but got " + b);
+    }
     /*
      * Enable/disable specific tests using these booleans
      */
@@ -126,6 +127,10 @@ public static void runTests() {
         }
     }
 
+    public static void main(String args[]) {
+        runTests();
+    }
+
     /** Set up the driver and its "wait" object. */
     private void setUp() {
         LoggingPreferences logPrefs = new LoggingPreferences();

tools/cldr-apps-webdriver/src/test/java/org/unicode/cldr/surveydriver/SurveyDriverCredentials.java → tools/cldr-apps-webdriver/src/main/java/org/unicode/cldr/surveydriver/SurveyDriverCredentials.java

@@ -15,15 +15,15 @@ public class SurveyDriverCredentials {
     private static final String EMAIL_PREFIX = "driver-";
 
     /**
-     * cldr-apps-webdriver/src/test/resources/org/unicode/cldr/surveydriver/surveydriver.properties
-     * -- not in version control; contains a line WEBDRIVER_PASSWORD=...
+     * A file should exist: cldr-apps-webdriver/surveydriver.properties -- not in version control;
+     * contains WEBDRIVER_PASSWORD=..., etc.
      */
     private static final String PROPS_FILENAME = "surveydriver.properties";
 
     private static final String PROPS_PASSWORD_KEY = "WEBDRIVER_PASSWORD";
     private static final String PROPS_URL_KEY = "SURVEYTOOL_URL";
-
-    private static final Object PROPS_WEBDRIVER_KEY = "WEBDRIVER_URL";
+    private static final String PROPS_WEBDRIVER_KEY = "WEBDRIVER_URL";
+    private static final String PROPS_TIME_OUT_SECONDS_KEY = "TIME_OUT_SECONDS";
     private static String webdriverPassword = null;
 
     private final String email;
@@ -98,7 +98,8 @@ public String getPassword() {
     }
 
     public static String getUrl() {
-        String host = getProperties().get(PROPS_URL_KEY).toString();
+        Object prop = getProperties().get(PROPS_URL_KEY);
+        String host = prop == null ? null : prop.toString();
         if (host == null || host.isEmpty()) {
             host = "http://localhost:9080";
         }
@@ -107,7 +108,8 @@ public static String getUrl() {
     }
 
     public static String getWebdriverUrl() {
-        String host = getProperties().get(PROPS_WEBDRIVER_KEY).toString();
+        Object prop = getProperties().get(PROPS_WEBDRIVER_KEY);
+        String host = prop == null ? null : prop.toString();
         if (host == null || host.isEmpty()) {
             host = "http://localhost:4444";
         }
@@ -116,11 +118,12 @@ public static String getWebdriverUrl() {
     }
 
     public static int getTimeOut() {
-        String s = getProperties().get("TIME_OUT_SECONDS").toString();
+        Object prop = getProperties().get(PROPS_TIME_OUT_SECONDS_KEY);
+        String s = prop == null ? null : prop.toString();
         if (s == null || s.isEmpty()) {
             s = "60";
         }
-        System.out.println("TIME_OUT_SECONDS=" + s);
+        System.out.println(PROPS_TIME_OUT_SECONDS_KEY + "=" + s);
         return Integer.parseInt(s);
     }
 }

tools/cldr-apps-webdriver/surveydriver.properties

@@ -0,0 +1,4 @@
+WEBDRIVER_PASSWORD=pw-for-docker-webdriver
+SURVEYTOOL_URL=http://cldr-apps:9080
+WEBDRIVER_URL=http://selenium:4444
+TIME_OUT_SECONDS=60

tools/pom.xml

@@ -41,6 +41,7 @@
 	<modules>
 		<module>cldr-code</module>
 		<module>cldr-apps</module>
+		<module>cldr-apps-webdriver</module>
 		<module>cldr-rdf</module>
 		<module>../docs/charts/keyboards</module>
 	</modules>