diff --git a/Dockerfile_build b/Dockerfile_build index c472fa7..d34c660 100644 --- a/Dockerfile_build +++ b/Dockerfile_build @@ -15,6 +15,7 @@ RUN mvn package FROM ubuntu:16.04 COPY --from=builder /code/target/javafxlibrary-*-SNAPSHOT-jar-with-dependencies.jar /. +COPY --from=builder /code/target/javafxlibrary-*-SNAPSHOT-tests.jar /. COPY entrypoint_build.sh /. RUN apt-get -qq update && apt-get dist-upgrade -y && apt-get install -qq --no-install-recommends --allow-unauthenticated -y \ openjdk-8-jre \ diff --git a/docker/robot-javafx-demo/test.sh b/docker/robot-javafx-demo/test.sh index b7572bc..59d1baf 100644 --- a/docker/robot-javafx-demo/test.sh +++ b/docker/robot-javafx-demo/test.sh @@ -5,7 +5,8 @@ function local() { echo "**********************" echo "INFO: Local execution:" file=$(ls -1 /javafxbinary/javafxlibrary-*-jar-with-dependencies.jar) - java -cp ${file} org.robotframework.RobotFramework -d /robot/results/local --include smoke $@ /robot/acceptance + testJar=$(ls -1 /javafxbinary/javafxlibrary-*-tests.jar) + java -cp ${file} org.robotframework.RobotFramework -d /robot/results/local --include smoke --variable appJar:${testJar} $@ /robot/acceptance # $@ #just to testing script if [[ "$?" != "0" ]]; then EXIT_VALUE=$((EXIT_VALUE+1)) @@ -15,7 +16,8 @@ function local() { function remote() { echo "***********************" echo "INFO: Remote execution:" - robot -d /robot/results/remote --include smoke $@ /robot/acceptance + testJar=$(ls -1 /javafxbinary/javafxlibrary-*-tests.jar) + robot -d /robot/results/remote --include smoke --variable appJar:${testJar} $@ /robot/acceptance # $@ #just to testing script if [[ "$?" != "0" ]]; then EXIT_VALUE=$((EXIT_VALUE+2)) diff --git a/entrypoint_build.sh b/entrypoint_build.sh index 1c61959..a4ba273 100644 --- a/entrypoint_build.sh +++ b/entrypoint_build.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash rm -rvf /javafxbinary/* cp -vf /javafxlibrary-*-jar-with-dependencies.jar /javafxbinary/. -chmod 555 /javafxbinary/javafxlibrary-*-jar-with-dependencies.jar +cp -vf /javafxlibrary-*-tests.jar /javafxbinary/. +chmod 555 /javafxbinary/* java -jar /javafxlibrary-*-jar-with-dependencies.jar diff --git a/pom.xml b/pom.xml index 72ac47c..5566f19 100644 --- a/pom.xml +++ b/pom.xml @@ -102,6 +102,33 @@ + + + org.codehaus.mojo + build-helper-maven-plugin + 1.10 + + + attach-artifacts + package + + attach-artifact + + + + + ${project.build.directory}/${project.artifactId}.html + html + + + ${project.build.directory}/${project.artifactId}.xml + xml + + + + + + org.apache.maven.plugins maven-gpg-plugin @@ -138,6 +165,11 @@ + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M1 + org.sonatype.plugins nexus-staging-maven-plugin @@ -219,6 +251,9 @@ TRACE:INFO false + + appJar:${project.build.directory}/${project.artifactId}*tests.jar + @@ -229,6 +264,7 @@ + ${project.build.directory} ${project.artifactId}.html JavaFXLibrary ${project.version} @@ -243,6 +279,7 @@ + ${project.build.directory} ${project.artifactId}.xml JavaFXLibrary ${project.version} @@ -299,7 +336,7 @@ org.apache.maven maven-model - 3.3.9 + 3.6.0 org.jmockit @@ -315,7 +352,7 @@ org.testfx testfx-core - 4.0.14-alpha + 4.0.15-alpha org.testfx @@ -331,7 +368,7 @@ org.robotframework robotframework - 3.0.2 + 3.0.4 org.hamcrest @@ -341,7 +378,7 @@ com.google.guava guava - 23.0 + 27.0.1-jre com.github.ombre42 diff --git a/src/main/java/JavaFXLibrary.java b/src/main/java/JavaFXLibrary.java index da646a5..c80b415 100644 --- a/src/main/java/JavaFXLibrary.java +++ b/src/main/java/JavaFXLibrary.java @@ -60,6 +60,9 @@ public class JavaFXLibrary extends AnnotationLibrary { public JavaFXLibrary() { super(includePatterns); deleteScreenshotsFrom("report-images/imagecomparison"); + //v4.0.15-alpha sets default robot as glass, which breaks rolling + //Forcing usage of awt robot as previous versions + System.setProperty("testfx.robot", "awt"); } @Autowired diff --git a/src/main/java/javafxlibrary/testapps/DatePickerApp.java b/src/test/java/javafxlibrary/testapps/DatePickerApp.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/DatePickerApp.java rename to src/test/java/javafxlibrary/testapps/DatePickerApp.java diff --git a/src/main/java/javafxlibrary/testapps/DemoApp.java b/src/test/java/javafxlibrary/testapps/DemoApp.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/DemoApp.java rename to src/test/java/javafxlibrary/testapps/DemoApp.java diff --git a/src/main/java/javafxlibrary/testapps/FinderApp.java b/src/test/java/javafxlibrary/testapps/FinderApp.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/FinderApp.java rename to src/test/java/javafxlibrary/testapps/FinderApp.java diff --git a/src/main/java/javafxlibrary/testapps/MenuApp.java b/src/test/java/javafxlibrary/testapps/MenuApp.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/MenuApp.java rename to src/test/java/javafxlibrary/testapps/MenuApp.java diff --git a/src/main/java/javafxlibrary/testapps/SwingApplication.java b/src/test/java/javafxlibrary/testapps/SwingApplication.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/SwingApplication.java rename to src/test/java/javafxlibrary/testapps/SwingApplication.java diff --git a/src/main/java/javafxlibrary/testapps/SwingApplicationWrapper.java b/src/test/java/javafxlibrary/testapps/SwingApplicationWrapper.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/SwingApplicationWrapper.java rename to src/test/java/javafxlibrary/testapps/SwingApplicationWrapper.java diff --git a/src/main/java/javafxlibrary/testapps/TestBoundsLocation.java b/src/test/java/javafxlibrary/testapps/TestBoundsLocation.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/TestBoundsLocation.java rename to src/test/java/javafxlibrary/testapps/TestBoundsLocation.java diff --git a/src/main/java/javafxlibrary/testapps/TestClickRobot.java b/src/test/java/javafxlibrary/testapps/TestClickRobot.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/TestClickRobot.java rename to src/test/java/javafxlibrary/testapps/TestClickRobot.java diff --git a/src/main/java/javafxlibrary/testapps/TestDragRobot.java b/src/test/java/javafxlibrary/testapps/TestDragRobot.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/TestDragRobot.java rename to src/test/java/javafxlibrary/testapps/TestDragRobot.java diff --git a/src/main/java/javafxlibrary/testapps/TestKeyboardRobot.java b/src/test/java/javafxlibrary/testapps/TestKeyboardRobot.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/TestKeyboardRobot.java rename to src/test/java/javafxlibrary/testapps/TestKeyboardRobot.java diff --git a/src/main/java/javafxlibrary/testapps/TestMultipleWindows.java b/src/test/java/javafxlibrary/testapps/TestMultipleWindows.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/TestMultipleWindows.java rename to src/test/java/javafxlibrary/testapps/TestMultipleWindows.java diff --git a/src/main/java/javafxlibrary/testapps/TestPointLocation.java b/src/test/java/javafxlibrary/testapps/TestPointLocation.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/TestPointLocation.java rename to src/test/java/javafxlibrary/testapps/TestPointLocation.java diff --git a/src/main/java/javafxlibrary/testapps/TestScreenCapturing.java b/src/test/java/javafxlibrary/testapps/TestScreenCapturing.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/TestScreenCapturing.java rename to src/test/java/javafxlibrary/testapps/TestScreenCapturing.java diff --git a/src/main/java/javafxlibrary/testapps/TestScrollRobot.java b/src/test/java/javafxlibrary/testapps/TestScrollRobot.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/TestScrollRobot.java rename to src/test/java/javafxlibrary/testapps/TestScrollRobot.java diff --git a/src/main/java/javafxlibrary/testapps/TestScrollRobot2.java b/src/test/java/javafxlibrary/testapps/TestScrollRobot2.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/TestScrollRobot2.java rename to src/test/java/javafxlibrary/testapps/TestScrollRobot2.java diff --git a/src/main/java/javafxlibrary/testapps/TestSleepRobot.java b/src/test/java/javafxlibrary/testapps/TestSleepRobot.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/TestSleepRobot.java rename to src/test/java/javafxlibrary/testapps/TestSleepRobot.java diff --git a/src/main/java/javafxlibrary/testapps/TestTableManagement.java b/src/test/java/javafxlibrary/testapps/TestTableManagement.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/TestTableManagement.java rename to src/test/java/javafxlibrary/testapps/TestTableManagement.java diff --git a/src/main/java/javafxlibrary/testapps/TestWindowManagement.java b/src/test/java/javafxlibrary/testapps/TestWindowManagement.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/TestWindowManagement.java rename to src/test/java/javafxlibrary/testapps/TestWindowManagement.java diff --git a/src/main/java/javafxlibrary/testapps/controllers/DemoAppController.java b/src/test/java/javafxlibrary/testapps/controllers/DemoAppController.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/controllers/DemoAppController.java rename to src/test/java/javafxlibrary/testapps/controllers/DemoAppController.java diff --git a/src/main/java/javafxlibrary/testapps/controllers/ImageDemoController.java b/src/test/java/javafxlibrary/testapps/controllers/ImageDemoController.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/controllers/ImageDemoController.java rename to src/test/java/javafxlibrary/testapps/controllers/ImageDemoController.java diff --git a/src/main/java/javafxlibrary/testapps/controllers/MenuAppController.java b/src/test/java/javafxlibrary/testapps/controllers/MenuAppController.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/controllers/MenuAppController.java rename to src/test/java/javafxlibrary/testapps/controllers/MenuAppController.java diff --git a/src/main/java/javafxlibrary/testapps/controllers/TestBoundsLocationController.java b/src/test/java/javafxlibrary/testapps/controllers/TestBoundsLocationController.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/controllers/TestBoundsLocationController.java rename to src/test/java/javafxlibrary/testapps/controllers/TestBoundsLocationController.java diff --git a/src/main/java/javafxlibrary/testapps/controllers/TestClickRobotController.java b/src/test/java/javafxlibrary/testapps/controllers/TestClickRobotController.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/controllers/TestClickRobotController.java rename to src/test/java/javafxlibrary/testapps/controllers/TestClickRobotController.java diff --git a/src/main/java/javafxlibrary/testapps/controllers/TestDragRobotController.java b/src/test/java/javafxlibrary/testapps/controllers/TestDragRobotController.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/controllers/TestDragRobotController.java rename to src/test/java/javafxlibrary/testapps/controllers/TestDragRobotController.java diff --git a/src/main/java/javafxlibrary/testapps/controllers/TestKeyboardRobotController.java b/src/test/java/javafxlibrary/testapps/controllers/TestKeyboardRobotController.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/controllers/TestKeyboardRobotController.java rename to src/test/java/javafxlibrary/testapps/controllers/TestKeyboardRobotController.java diff --git a/src/main/java/javafxlibrary/testapps/controllers/TestMultipleWindowsController.java b/src/test/java/javafxlibrary/testapps/controllers/TestMultipleWindowsController.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/controllers/TestMultipleWindowsController.java rename to src/test/java/javafxlibrary/testapps/controllers/TestMultipleWindowsController.java diff --git a/src/main/java/javafxlibrary/testapps/controllers/TestPointLocationController.java b/src/test/java/javafxlibrary/testapps/controllers/TestPointLocationController.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/controllers/TestPointLocationController.java rename to src/test/java/javafxlibrary/testapps/controllers/TestPointLocationController.java diff --git a/src/main/java/javafxlibrary/testapps/controllers/TestScreenCapturingController.java b/src/test/java/javafxlibrary/testapps/controllers/TestScreenCapturingController.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/controllers/TestScreenCapturingController.java rename to src/test/java/javafxlibrary/testapps/controllers/TestScreenCapturingController.java diff --git a/src/main/java/javafxlibrary/testapps/controllers/TestScrollRobot2Controller.java b/src/test/java/javafxlibrary/testapps/controllers/TestScrollRobot2Controller.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/controllers/TestScrollRobot2Controller.java rename to src/test/java/javafxlibrary/testapps/controllers/TestScrollRobot2Controller.java diff --git a/src/main/java/javafxlibrary/testapps/controllers/TestScrollRobotController.java b/src/test/java/javafxlibrary/testapps/controllers/TestScrollRobotController.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/controllers/TestScrollRobotController.java rename to src/test/java/javafxlibrary/testapps/controllers/TestScrollRobotController.java diff --git a/src/main/java/javafxlibrary/testapps/controllers/TestSleepRobotController.java b/src/test/java/javafxlibrary/testapps/controllers/TestSleepRobotController.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/controllers/TestSleepRobotController.java rename to src/test/java/javafxlibrary/testapps/controllers/TestSleepRobotController.java diff --git a/src/main/java/javafxlibrary/testapps/controllers/TestWindowManagementController.java b/src/test/java/javafxlibrary/testapps/controllers/TestWindowManagementController.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/controllers/TestWindowManagementController.java rename to src/test/java/javafxlibrary/testapps/controllers/TestWindowManagementController.java diff --git a/src/main/java/javafxlibrary/testapps/controllers/TextListController.java b/src/test/java/javafxlibrary/testapps/controllers/TextListController.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/controllers/TextListController.java rename to src/test/java/javafxlibrary/testapps/controllers/TextListController.java diff --git a/src/main/java/javafxlibrary/testapps/customcomponents/ColorChangingRectangle.java b/src/test/java/javafxlibrary/testapps/customcomponents/ColorChangingRectangle.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/customcomponents/ColorChangingRectangle.java rename to src/test/java/javafxlibrary/testapps/customcomponents/ColorChangingRectangle.java diff --git a/src/main/java/javafxlibrary/testapps/customcomponents/ImageDemo.java b/src/test/java/javafxlibrary/testapps/customcomponents/ImageDemo.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/customcomponents/ImageDemo.java rename to src/test/java/javafxlibrary/testapps/customcomponents/ImageDemo.java diff --git a/src/main/java/javafxlibrary/testapps/customcomponents/Statistic.java b/src/test/java/javafxlibrary/testapps/customcomponents/Statistic.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/customcomponents/Statistic.java rename to src/test/java/javafxlibrary/testapps/customcomponents/Statistic.java diff --git a/src/main/java/javafxlibrary/testapps/customcomponents/TextList.java b/src/test/java/javafxlibrary/testapps/customcomponents/TextList.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/customcomponents/TextList.java rename to src/test/java/javafxlibrary/testapps/customcomponents/TextList.java diff --git a/src/main/java/javafxlibrary/testapps/customcomponents/TextRow.java b/src/test/java/javafxlibrary/testapps/customcomponents/TextRow.java similarity index 100% rename from src/main/java/javafxlibrary/testapps/customcomponents/TextRow.java rename to src/test/java/javafxlibrary/testapps/customcomponents/TextRow.java diff --git a/src/test/robotframework/resource.robot b/src/test/robotframework/resource.robot index 2802640..bff1e77 100644 --- a/src/test/robotframework/resource.robot +++ b/src/test/robotframework/resource.robot @@ -1,7 +1,11 @@ +*** Variables *** +${appJar} javafxlibrary-*-tests.jar + *** Keywords *** Import JavaFXLibrary Run Keyword If sys.platform.startswith('java') Import Library JavaFXLibrary ... ELSE Import Library Remote http://javafxcompile:8270 WITH NAME RemoteJavaFXLibrary + Set To Classpath ${appJar} Disable Embedded Image Logging For Negative Tests :FOR ${tag} IN @{TEST TAGS}