diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 0e977601876..18a2b70c54c 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -306,6 +306,12 @@ jobs: restore-keys: | ${{ runner.os }}-node- node- + - name: Build cldr-apps-webdriver with Maven + run: > + mvn -s .github/workflows/mvn-settings.xml -B compile install package --file tools/pom.xml -pl cldr-apps-webdriver + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Pull Images run: docker compose pull -q working-directory: tools/cldr-apps @@ -315,13 +321,10 @@ jobs: - name: Bringup Containers run: docker compose up -d cldr-apps selenium working-directory: tools/cldr-apps - - name: Build webdriver - run: docker compose run -v ~/.m2/repository:/root/.m2/repository:rw --rm webdriver mvn -B test-compile - working-directory: tools/cldr-apps - name: Test with Webdriver # See tools/cldr-apps/README.md run: > - docker compose run -v ~/.m2/repository:/root/.m2/repository:rw --rm webdriver || ( docker compose exec -it cldr-apps tail /logs/messages.log ; true ) + docker compose run --rm webdriver || ( docker compose exec -it cldr-apps tail /logs/messages.log ; true ) working-directory: tools/cldr-apps - name: Prepare client tests run: docker run --rm -v ~/.npm:/root/.npm:rw -v $(pwd)/js:/home/node/app:rw -w /home/node/app node npm ci diff --git a/tools/cldr-apps-webdriver/Dockerfile b/tools/cldr-apps-webdriver/Dockerfile index 13c954e5589..f3123ac61a9 100644 --- a/tools/cldr-apps-webdriver/Dockerfile +++ b/tools/cldr-apps-webdriver/Dockerfile @@ -1,7 +1,7 @@ FROM maven:3-eclipse-temurin-17-alpine -# TODO: copy pom.xml and predownload WORKDIR /workarea -COPY . /workarea +# COPY . /workarea COPY surveydriver-docker.properties /workarea/surveydriver.properties -CMD ["mvn", "-B", "test"] +COPY target/cldr-apps-webdriver.jar /workarea/cldr-apps-webdriver.jar +CMD ["java", "-jar", "cldr-apps-webdriver.jar"] diff --git a/tools/cldr-apps-webdriver/pom.xml b/tools/cldr-apps-webdriver/pom.xml index 9067244ed97..f4dfbcbf5c5 100644 --- a/tools/cldr-apps-webdriver/pom.xml +++ b/tools/cldr-apps-webdriver/pom.xml @@ -12,23 +12,26 @@ UTF-8 - 11 - 11 - 2.43.0 - 1.27.0 + org.unicode.cldr.surveydriver.SurveyDriver + + + org.unicode.cldr + cldr-all + 49.0-SNAPSHOT + + - junit - junit - 4.13.2 + org.junit.jupiter + junit-jupiter test org.seleniumhq.selenium selenium-java 4.32.0 - + org.apache.logging.log4j log4j-api @@ -46,30 +49,56 @@ + + + maven-jar-plugin + + + + ${mainClass} + + + + + + org.apache.maven.plugins + maven-shade-plugin + + + package + + shade + + + + + *:* + + + META-INF/MANIFEST.MF + + module-info.class + + + + false + ${project.artifactId} + + + ${mainClass} + + ${mainClass} + + + + + + + + - - com.diffplug.spotless - spotless-maven-plugin - ${spotless.version} - - - - NONE - - - - - - - - ${google-java-style.version} - - false - - - - maven-clean-plugin diff --git a/tools/cldr-apps-webdriver/src/test/java/org/unicode/cldr/surveydriver/SurveyDriver.java b/tools/cldr-apps-webdriver/src/main/java/org/unicode/cldr/surveydriver/SurveyDriver.java similarity index 99% rename from tools/cldr-apps-webdriver/src/test/java/org/unicode/cldr/surveydriver/SurveyDriver.java rename to tools/cldr-apps-webdriver/src/main/java/org/unicode/cldr/surveydriver/SurveyDriver.java index dce21c204b3..e28330b402c 100644 --- a/tools/cldr-apps-webdriver/src/test/java/org/unicode/cldr/surveydriver/SurveyDriver.java +++ b/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,10 @@ */ public class SurveyDriver { + static void assertTrue(boolean t) { + if (!t) throw new RuntimeException("Expected true but got false"); + } + /* * Enable/disable specific tests using these booleans */ @@ -99,6 +101,10 @@ public class SurveyDriver { private boolean gotComprehensiveCoverage = false; + public static void main(String args[]) { + runTests(); + } + public static void runTests() { SurveyDriver s = new SurveyDriver(); s.setUp(); diff --git a/tools/cldr-apps-webdriver/src/test/java/org/unicode/cldr/surveydriver/SurveyDriverCredentials.java b/tools/cldr-apps-webdriver/src/main/java/org/unicode/cldr/surveydriver/SurveyDriverCredentials.java similarity index 100% rename from tools/cldr-apps-webdriver/src/test/java/org/unicode/cldr/surveydriver/SurveyDriverCredentials.java rename to tools/cldr-apps-webdriver/src/main/java/org/unicode/cldr/surveydriver/SurveyDriverCredentials.java diff --git a/tools/cldr-apps-webdriver/src/test/java/org/unicode/cldr/surveydriver/SurveyDriverDashboard.java b/tools/cldr-apps-webdriver/src/main/java/org/unicode/cldr/surveydriver/SurveyDriverDashboard.java similarity index 100% rename from tools/cldr-apps-webdriver/src/test/java/org/unicode/cldr/surveydriver/SurveyDriverDashboard.java rename to tools/cldr-apps-webdriver/src/main/java/org/unicode/cldr/surveydriver/SurveyDriverDashboard.java diff --git a/tools/cldr-apps-webdriver/src/test/java/org/unicode/cldr/surveydriver/SurveyDriverData.java b/tools/cldr-apps-webdriver/src/main/java/org/unicode/cldr/surveydriver/SurveyDriverData.java similarity index 100% rename from tools/cldr-apps-webdriver/src/test/java/org/unicode/cldr/surveydriver/SurveyDriverData.java rename to tools/cldr-apps-webdriver/src/main/java/org/unicode/cldr/surveydriver/SurveyDriverData.java diff --git a/tools/cldr-apps-webdriver/src/test/java/org/unicode/cldr/surveydriver/SurveyDriverLog.java b/tools/cldr-apps-webdriver/src/main/java/org/unicode/cldr/surveydriver/SurveyDriverLog.java similarity index 100% rename from tools/cldr-apps-webdriver/src/test/java/org/unicode/cldr/surveydriver/SurveyDriverLog.java rename to tools/cldr-apps-webdriver/src/main/java/org/unicode/cldr/surveydriver/SurveyDriverLog.java diff --git a/tools/cldr-apps-webdriver/src/test/java/org/unicode/cldr/surveydriver/SurveyDriverVettingTable.java b/tools/cldr-apps-webdriver/src/main/java/org/unicode/cldr/surveydriver/SurveyDriverVettingTable.java similarity index 100% rename from tools/cldr-apps-webdriver/src/test/java/org/unicode/cldr/surveydriver/SurveyDriverVettingTable.java rename to tools/cldr-apps-webdriver/src/main/java/org/unicode/cldr/surveydriver/SurveyDriverVettingTable.java diff --git a/tools/cldr-apps-webdriver/src/test/java/org/unicode/cldr/surveydriver/SurveyDriverXMLUploader.java b/tools/cldr-apps-webdriver/src/main/java/org/unicode/cldr/surveydriver/SurveyDriverXMLUploader.java similarity index 100% rename from tools/cldr-apps-webdriver/src/test/java/org/unicode/cldr/surveydriver/SurveyDriverXMLUploader.java rename to tools/cldr-apps-webdriver/src/main/java/org/unicode/cldr/surveydriver/SurveyDriverXMLUploader.java diff --git a/tools/cldr-apps-webdriver/src/test/java/org/unicode/cldr/surveydriver/AppTest.java b/tools/cldr-apps-webdriver/src/test/java/org/unicode/cldr/surveydriver/AppTest.java deleted file mode 100644 index ac8b5829297..00000000000 --- a/tools/cldr-apps-webdriver/src/test/java/org/unicode/cldr/surveydriver/AppTest.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.unicode.cldr.surveydriver; - -import org.junit.Test; - -public class AppTest { - @Test - public void shouldDrive() { - SurveyDriver.runTests(); - } -} diff --git a/tools/cldr-apps/pom.xml b/tools/cldr-apps/pom.xml index 9e53629f661..9c0aff579fd 100644 --- a/tools/cldr-apps/pom.xml +++ b/tools/cldr-apps/pom.xml @@ -9,12 +9,6 @@ war CLDR Survey Tool - https://unicode.org/cldr - - - scm:git:https://github.com/unicode-org/cldr.git - - 8.0.0 diff --git a/tools/pom.xml b/tools/pom.xml index 84b485362c7..45f7e929ca0 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -5,6 +5,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + https://cldr.unicode.org + + + scm:git:https://github.com/unicode-org/cldr.git + + org.unicode.cldr cldr-all 49.0-SNAPSHOT @@ -83,6 +89,7 @@ cldr-apps cldr-rdf ../docs/charts/keyboards + cldr-apps-webdriver