diff --git a/.gitattributes b/.gitattributes index 35efda5..08b6e8e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,3 @@ -# https://git-scm.com/docs/gitattributes -# unix line feeds to every file (if dos linefeeds needed can be overridden) +# https://git-scm.com/docs/gitattributes +# unix line feeds to every file (if dos linefeeds needed can be overridden) * -text \ No newline at end of file diff --git a/.gitignore b/.gitignore index 7243480..889580c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ JavaFXLib-*.png .idea *.iml report-images +*.DS_Store # temporary pom file by shade plugin dependency-reduced-pom.xml diff --git a/AUTHORS.txt b/AUTHORS.txt index 582711d..9a5e4bc 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -8,4 +8,4 @@ Tatu Lahtela Find All With Pseudo Class and Find Class keywords Sakari Hoisko Dockerized linux env with X Juho Lehtonen Optimized docker environment. Juho Saarinen Package improvements, initial monocle support, screenshot bug fix - +Turo Soisenniemi Initial java agent support diff --git a/BUILD.md b/BUILD.md index 7265cc9..34497f5 100644 --- a/BUILD.md +++ b/BUILD.md @@ -25,6 +25,7 @@ JavaFXLibrary uses Apache Maven as a build tool. * update library version to x.x.x in pom.xml * run tests ``mvn clean verify`` * copy target/robotframework/libdoc/javafxlibrary.html under docs directory (check that README.md links to correct file) +* update links in README.md to point correct version in maven central * ``git commit -m "version to x.x.x" pom.xml docs/javafxlibrary.html`` * create tag ``git tag -a x.x.x`` * push ``git push origin master`` and ``git push origin x.x.x`` diff --git a/Dockerfile_build b/Dockerfile_build index 6086fa9..834ae4e 100644 --- a/Dockerfile_build +++ b/Dockerfile_build @@ -14,8 +14,8 @@ RUN mvn package # ENTRYPOINT java -jar /code/target/javafxlibrary-*-SNAPSHOT-jar-with-dependencies.jar FROM ubuntu:16.04 -COPY --from=builder /code/target/javafxlibrary-*-jar-with-dependencies.jar /. -COPY --from=builder /code/target/javafxlibrary-*-tests.jar /. +COPY --from=builder /code/target/javafxlibrary-*-jar-with-dependencies.jar / +COPY --from=builder /code/target/javafxlibrary-*-tests.jar / RUN echo "Built following jar files" && ls -latr /*.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 \ diff --git a/README.md b/README.md index aea0021..6d74771 100644 --- a/README.md +++ b/README.md @@ -4,12 +4,12 @@ JavaFXLibrary works with both Jython (local and remote use) and Python (remote only) versions of Robot Framework. This means JavaFXLibrary can be used with Jython incompatible test libraries too by importing it as a remote library. -JavaFXLibrary is tested to work with Robot Framework 3.0.2 or later. +JavaFXLibrary is tested to work with Java 8 and Robot Framework 3.2.1 or later. ## Keyword documentation -See keyword [documentation](https://repo1.maven.org/maven2/org/robotframework/javafxlibrary/0.5.4/javafxlibrary-0.5.4.html). +See keyword [documentation](https://repo1.maven.org/maven2/org/robotframework/javafxlibrary/0.7.1/javafxlibrary-0.7.1.html). -For editors (IDEs) keyword documentation can be obtained from [here](https://repo1.maven.org/maven2/org/robotframework/javafxlibrary/0.5.4/javafxlibrary-0.5.4.xml). +For editors (IDEs) keyword documentation can be obtained from [here](https://repo1.maven.org/maven2/org/robotframework/javafxlibrary/0.7.1/javafxlibrary-0.7.1.xml). ## Taking the library into use ### As a local library @@ -75,7 +75,7 @@ Executing _test.sh_ runs the acceptance suite twice: first using JavaFXLibrary a If you want the suite to run only once, you can define which type of library to use by including **local** or **remote** as an argument. For example command `test.sh remote` will execute the suite only in remote mode. ## Experimental: Headless support -Library supports headless operation utilizing [Monocle](https://wiki.openjdk.java.net/display/OpenJFX/Monocle). The support for this is still at experimental level. +Library supports headless operation utilizing [Monocle](https://wiki.openjdk.java.net/display/OpenJFX/Monocle). The support for this is still at experimental level. ### Main issues with headless function * Scrolling doesn't work same way as with screen @@ -97,4 +97,7 @@ Remote: ``` *** Settings *** Library Remote http://127.0.0.1:8270 ${True} WITH NAME JavaFXLibrary -``` \ No newline at end of file +``` + +## Experimental: Java agent support +Library can be used as java agent. Launch application with `-javaagent:/path/to/javafxlibrary-.jar`. Default port is 8270 and can be changed with adding `=` to java agent command. Only remote library is supported. Using launch keyword is still required but instead of starting new application keyword initializes Stage for library. diff --git a/docker/robot-javafx-demo/Dockerfile b/docker/robot-javafx-demo/Dockerfile index 81e3eea..0e75a4a 100644 --- a/docker/robot-javafx-demo/Dockerfile +++ b/docker/robot-javafx-demo/Dockerfile @@ -1,4 +1,4 @@ -FROM dorowu/ubuntu-desktop-lxde-vnc +FROM dorowu/ubuntu-desktop-lxde-vnc:bionic ENV DEBIAN_FRONTEND noninteractive diff --git a/docs/javafxlibrary.html b/docs/javafxlibrary.html index 6f66307..b2179aa 100644 --- a/docs/javafxlibrary.html +++ b/docs/javafxlibrary.html @@ -5,7 +5,7 @@ - +