Added local execution support, use test.sh script with local/remote/all parameters to execution

Author: Hoisko Sakari.M 10802213

Dockerfile_build

@@ -18,6 +18,7 @@ RUN apt-get -qq update && apt-get dist-upgrade -y  && apt-get install -qq --no-i
   openjdk-8-jre \
   openjfx \
   && rm -rf /var/lib/apt/lists/*
-COPY --from=builder /code/target/javafxlibrary-*-jar-with-dependencies.jar .
+COPY --from=builder /code/target/javafxlibrary-*-jar-with-dependencies.jar /.
 EXPOSE 8270
-ENTRYPOINT java -jar javafxlibrary-*-jar-with-dependencies.jar
+COPY entrypoint_build.sh /.
+ENTRYPOINT /entrypoint_build.sh

docker-compose.yml

@@ -9,6 +9,8 @@ services:
     volumes:
       - './src/test/robotframework/:/robot'
       - screen-thing:/tmp/.X11-unix
+      - './src/:/src' # ScreenCapturingTest.robot require this.
+      - javafxbinaryshare:/javafxbinary
     networks:
       - testapp
 
@@ -20,8 +22,10 @@ services:
     networks:
       - testapp
     volumes:
+      - './src/test/robotframework/:/robot' # Screen capures are saved to here "hack until remote usage copy photos to results folder"
       - './src/:/src' # ScreenCapturingTest.robot require this.
       - screen-thing:/tmp/.X11-unix
+      - javafxbinaryshare:/javafxbinary
     environment:
       - DISPLAY=:20.0
 
@@ -44,3 +48,4 @@ networks:
   testapp:
 volumes:
   screen-thing:
+  javafxbinaryshare:

docker/robot-javafx-demo/Dockerfile

@@ -17,6 +17,8 @@ RUN apt-get -qq update && apt-get dist-upgrade -y  && apt-get install -qq --no-i
   wget \
   xvfb \
   xorg \
+  openjdk-8-jre \
+  openjfx \
   && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 RUN pip install --no-cache-dir \
@@ -25,6 +27,7 @@ RUN pip install --no-cache-dir \
 RUN mkdir ~/.vnc
 RUN x11vnc -storepasswd 1234 ~/.vnc/passwd
 COPY entrypoint.sh /entrypoint.sh
+COPY test.sh /bin/test.sh
 EXPOSE 5900
 
 ENTRYPOINT ["x11vnc", "-create", "-forever", "-env", "FD_PROG=/entrypoint.sh", "-env", "X11VNC_CREATE_GEOM=${1:-1024x768x16}", "-usepw"]

docker/robot-javafx-demo/test.sh

@@ -0,0 +1,59 @@
+#!/bin/bash
+EXIT_VALUE=0
+
+function local() {
+  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
+#  $@ #just to testing script
+  if [[ "$?" != "0" ]]; then
+    EXIT_VALUE=$((EXIT_VALUE+1))
+  fi
+}
+
+function remote() {
+  echo "INFO: Remote execution:"
+  robot -d /robot/results/remote --include smoke $@ /robot/acceptance
+#  $@ #just to testing script
+  if [[ "$?" != "0" ]]; then
+    EXIT_VALUE=$((EXIT_VALUE+2))
+  fi
+}
+
+
+case $1 in
+  local | LOCAL )
+    shift
+    local $@
+    ;;
+  remote | REMOTE | demo | DEMO)
+    shift
+    remote $@
+    ;;
+  "" | all | ALL )
+    echo "INFO: All execution:"
+      shift
+      local $@
+      remote $@
+    ;;
+  * )
+    echo "ERROR:$@ is not supported parameter"
+    EXIT_VALUE=$((EXIT_VALUE+4))
+    ;;
+esac
+echo "*************************************************"
+case ${EXIT_VALUE} in
+  0 )
+    echo "INFO: All fine, tests PASS"
+    ;;
+  1 )
+    echo "ERROR: Local library tests fail"
+    ;;
+  2 )
+    echo "ERROR: Remote library tests fail"
+    ;;
+  3 )
+    echo "ERROR: Local and Remote library tests fails"
+  ;;
+esac
+exit ${EXIT_VALUE}

entrypoint_build.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+rm -rvf /javafxbinary/*
+cp -vf /javafxlibrary-*-jar-with-dependencies.jar /javafxbinary/.
+java -jar /javafxlibrary-*-jar-with-dependencies.jar