Merge branch 'master' of https://github.com/eficode/JavaFXLibrary

Author: psaikkonen

docker-compose.yml

@@ -5,14 +5,17 @@ services:
     build:
       context: ./docker/robot-javafx-demo
     ports:
-      - '5900:5900'
+      #- '5900:5900'
+      - '80:80'
     volumes:
       - './src/test/robotframework/:/robot'
       - screen-thing:/tmp/.X11-unix
       - './src/:/src' # ScreenCapturingTest.robot require this.
       - javafxbinaryshare:/javafxbinary
     networks:
       - testapp
+    environment:
+      - RESOLUTION=1920x1080
 
   javafxcompile:
     build:
@@ -27,7 +30,7 @@ services:
       - screen-thing:/tmp/.X11-unix
       - javafxbinaryshare:/javafxbinary
     environment:
-      - DISPLAY=:20.0
+      - DISPLAY=:1
 
 #  javafxrelease:
 #    build:

docker/robot-javafx-demo/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM dorowu/ubuntu-desktop-lxde-vnc
 
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -21,12 +21,14 @@ RUN apt-get -qq update && apt-get dist-upgrade -y  && apt-get install -qq --no-i
   openjfx \
   && apt-get clean && rm -rf /var/lib/apt/lists/*
 
+COPY test.sh /bin/test.sh
 RUN pip install --no-cache-dir \
-  robotframework
+  robotframework && chmod 555 /bin/test.sh
 
-COPY entrypoint.sh /entrypoint.sh
-COPY test.sh /bin/test.sh
-RUN mkdir ~/.vnc && x11vnc -storepasswd 1234 ~/.vnc/passwd && chmod 555 /entrypoint.sh /bin/test.sh
-EXPOSE 5900
+# JUST VNC
+#COPY entrypoint.sh /entrypoint.sh
+#RUN mkdir ~/.vnc && x11vnc -storepasswd 1234 ~/.vnc/passwd && chmod 555 /entrypoint.sh /bin/test.sh
+#ENTRYPOINT ["x11vnc", "-create", "-forever", "-env", "FD_PROG=/entrypoint.sh", "-env", "X11VNC_CREATE_GEOM=${1:-1024x768x16}", "-usepw"]
 
-ENTRYPOINT ["x11vnc", "-create", "-forever", "-env", "FD_PROG=/entrypoint.sh", "-env", "X11VNC_CREATE_GEOM=${1:-1024x768x16}", "-usepw"]
+EXPOSE 5900 80
+ENTRYPOINT ["/startup.sh"]

src/main/java/javafxlibrary/testapps/controllers/ImageDemoController.java

@@ -32,15 +32,15 @@ public class ImageDemoController implements Initializable {
 
     private @FXML TextField search;
     private @FXML VBox rowWrapper;
-    private List<File> files;
+    //private List<File> files;
     private List<File> imageFiles;
     private List<ImageFile> images;
 
     @Override
     public void initialize(URL location, ResourceBundle resources) {
-        File folder = new File("src/main/resources/ScreenCapturing/comparison");
-        files = Arrays.asList(folder.listFiles());
-        imageFiles = new ArrayList<>(files);
+        //File folder = new File("src/main/resources/ScreenCapturing/comparison");
+        //files = Arrays.asList(folder.listFiles());
+        imageFiles = new ArrayList<>(/*files*/);
         imageFiles.add(new File("src/main/resources/fxml/javafxlibrary/ui/uiresources/ejlogo.png"));
         images = new ArrayList<>();
         Collections.shuffle(imageFiles);

src/test/robotframework/acceptance/ScreenCapturingTest.robot

@@ -1,13 +1,14 @@
 *** Settings ***
-Documentation     Tests to test javafxlibrary.keywords.ScreenCapturing related keywords
-Resource          ../resource.robot
-Suite Setup       Setup all tests
-Suite Teardown    Teardown all tests
-Force Tags        set-screencapturing
+Documentation       Tests to test javafxlibrary.keywords.ScreenCapturing related keywords
+Library             String
+Resource            ../resource.robot
+Suite Setup         Setup all tests
+Suite Teardown      Teardown all tests
+Force Tags          set-screencapturing
 
 *** Variables ***
 ${TEST_APPLICATION}     javafxlibrary.testapps.TestScreenCapturing
-${COMPARISON}           src/main/resources/screencapturing/comparison/
+${COMPARISON}           ${EMPTY}
 
 *** Test Cases ***
 Capture Node
@@ -95,6 +96,12 @@ Setup all tests
     Set Timeout                     0
     Launch Javafx Application       ${TEST_APPLICATION}
     Set Screenshot Directory        ${OUTPUT_DIR}${/}report-images
+    Set comparison path
 
 Teardown all tests
     Close Javafx Application
+
+Set comparison path
+    ${dir_path}             Fetch From Left     ${CURDIR}           acceptance
+    ${comparison_path}      Catenate            SEPARATOR=          ${dir_path}    resources/screencapturingtest/
+    Set Suite Variable      ${COMPARISON}       ${comparison_path}