From ffa9303ea5313b34ffd2d86b15e6ce183a9a3d99 Mon Sep 17 00:00:00 2001
From: Juho Saarinen <juho.saarinen@gmail.com>
Date: Tue, 27 Nov 2018 09:18:28 +0200
Subject: [PATCH 1/2] Moved test app to test code

Updated some dependencies

Testing what's delivered in containers

Surefire update because of https://issues.apache.org/jira/browse/SUREFIRE-1588 / https://stackoverflow.com/questions/53010200/maven-surefire-could-not-find-forkedbooter-class
---
 Dockerfile_build                              |  1 +
 docker/robot-javafx-demo/test.sh              |  6 ++-
 entrypoint_build.sh                           |  3 +-
 pom.xml                                       | 45 +++++++++++++++++--
 .../javafxlibrary/testapps/DatePickerApp.java |  0
 .../java/javafxlibrary/testapps/DemoApp.java  |  0
 .../javafxlibrary/testapps/FinderApp.java     |  0
 .../java/javafxlibrary/testapps/MenuApp.java  |  0
 .../testapps/SwingApplication.java            |  0
 .../testapps/SwingApplicationWrapper.java     |  0
 .../testapps/TestBoundsLocation.java          |  0
 .../testapps/TestClickRobot.java              |  0
 .../javafxlibrary/testapps/TestDragRobot.java |  0
 .../testapps/TestKeyboardRobot.java           |  0
 .../testapps/TestMultipleWindows.java         |  0
 .../testapps/TestPointLocation.java           |  0
 .../testapps/TestScreenCapturing.java         |  0
 .../testapps/TestScrollRobot.java             |  0
 .../testapps/TestScrollRobot2.java            |  0
 .../testapps/TestSleepRobot.java              |  0
 .../testapps/TestTableManagement.java         |  0
 .../testapps/TestWindowManagement.java        |  0
 .../controllers/DemoAppController.java        |  0
 .../controllers/ImageDemoController.java      |  0
 .../controllers/MenuAppController.java        |  0
 .../TestBoundsLocationController.java         |  0
 .../controllers/TestClickRobotController.java |  0
 .../controllers/TestDragRobotController.java  |  0
 .../TestKeyboardRobotController.java          |  0
 .../TestMultipleWindowsController.java        |  0
 .../TestPointLocationController.java          |  0
 .../TestScreenCapturingController.java        |  0
 .../TestScrollRobot2Controller.java           |  0
 .../TestScrollRobotController.java            |  0
 .../controllers/TestSleepRobotController.java |  0
 .../TestWindowManagementController.java       |  0
 .../controllers/TextListController.java       |  0
 .../ColorChangingRectangle.java               |  0
 .../testapps/customcomponents/ImageDemo.java  |  0
 .../testapps/customcomponents/Statistic.java  |  0
 .../testapps/customcomponents/TextList.java   |  0
 .../testapps/customcomponents/TextRow.java    |  0
 src/test/robotframework/resource.robot        |  4 ++
 43 files changed, 52 insertions(+), 7 deletions(-)
 rename src/{main => test}/java/javafxlibrary/testapps/DatePickerApp.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/DemoApp.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/FinderApp.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/MenuApp.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/SwingApplication.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/SwingApplicationWrapper.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/TestBoundsLocation.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/TestClickRobot.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/TestDragRobot.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/TestKeyboardRobot.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/TestMultipleWindows.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/TestPointLocation.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/TestScreenCapturing.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/TestScrollRobot.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/TestScrollRobot2.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/TestSleepRobot.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/TestTableManagement.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/TestWindowManagement.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/controllers/DemoAppController.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/controllers/ImageDemoController.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/controllers/MenuAppController.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/controllers/TestBoundsLocationController.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/controllers/TestClickRobotController.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/controllers/TestDragRobotController.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/controllers/TestKeyboardRobotController.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/controllers/TestMultipleWindowsController.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/controllers/TestPointLocationController.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/controllers/TestScreenCapturingController.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/controllers/TestScrollRobot2Controller.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/controllers/TestScrollRobotController.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/controllers/TestSleepRobotController.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/controllers/TestWindowManagementController.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/controllers/TextListController.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/customcomponents/ColorChangingRectangle.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/customcomponents/ImageDemo.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/customcomponents/Statistic.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/customcomponents/TextList.java (100%)
 rename src/{main => test}/java/javafxlibrary/testapps/customcomponents/TextRow.java (100%)

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 @@
                             </execution>
                         </executions>
                     </plugin>
+                    <!-- Upload also documentation -->
+                    <plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>build-helper-maven-plugin</artifactId>
+						<version>1.10</version>
+						<executions>
+							<execution>
+								<id>attach-artifacts</id>
+								<phase>package</phase>
+								<goals>
+									<goal>attach-artifact</goal>
+								</goals>
+								<configuration>
+									<artifacts>
+										<artifact>
+											<file>${project.build.directory}/${project.artifactId}.html</file>
+											<type>html</type>
+										</artifact>
+										<artifact>
+											<file>${project.build.directory}/${project.artifactId}.xml</file>
+											<type>xml</type>
+										</artifact>
+									</artifacts>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
@@ -138,6 +165,11 @@
 
     <build>
         <plugins>
+        			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>3.0.0-M1</version>
+			</plugin>
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
@@ -219,6 +251,9 @@
                             </excludes>
                             <logLevel>TRACE:INFO</logLevel>
                             <dryrun>false</dryrun>
+                            <variables>
+                            	<variable>appJar:${project.build.directory}/${project.artifactId}*tests.jar</variable>
+                            </variables>
                         </configuration>
                     </execution>
                     <execution>
@@ -229,6 +264,7 @@
                         </goals>
                         <configuration>
                             <libdoc>
+                                <outputDirectory>${project.build.directory}</outputDirectory>
                                 <outputFile>${project.artifactId}.html</outputFile>
                                 <libraryOrResourceFile>JavaFXLibrary</libraryOrResourceFile>
                                 <version>${project.version}</version>
@@ -243,6 +279,7 @@
                         </goals>
                         <configuration>
                             <libdoc>
+                                <outputDirectory>${project.build.directory}</outputDirectory>
                                 <outputFile>${project.artifactId}.xml</outputFile>
                                 <libraryOrResourceFile>JavaFXLibrary</libraryOrResourceFile>
                                 <version>${project.version}</version>
@@ -299,7 +336,7 @@
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-model</artifactId>
-            <version>3.3.9</version>
+            <version>3.6.0</version>
         </dependency>
         <dependency>
             <groupId>org.jmockit</groupId>
@@ -315,7 +352,7 @@
         <dependency>
             <groupId>org.testfx</groupId>
             <artifactId>testfx-core</artifactId>
-            <version>4.0.14-alpha</version>
+            <version>4.0.15-alpha</version>
         </dependency>
         <dependency>
             <groupId>org.testfx</groupId>
@@ -331,7 +368,7 @@
         <dependency>
             <groupId>org.robotframework</groupId>
             <artifactId>robotframework</artifactId>
-            <version>3.0.2</version>
+            <version>3.0.4</version>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
@@ -341,7 +378,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>23.0</version>
+            <version>27.0.1-jre</version>
         </dependency>
         <dependency>
             <groupId>com.github.ombre42</groupId>
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}

From f86b9bbc73eeeb6ea3e819765d5d19156b677970 Mon Sep 17 00:00:00 2001
From: Juho Saarinen <juho.saarinen@gmail.com>
Date: Tue, 27 Nov 2018 09:50:28 +0200
Subject: [PATCH 2/2] Continuing to use awt robot with library

---
 src/main/java/JavaFXLibrary.java | 3 +++
 1 file changed, 3 insertions(+)

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