diff --git a/release/RunOpenFin.sh b/release/RunOpenFin.sh new file mode 100755 index 0000000..dc63c04 --- /dev/null +++ b/release/RunOpenFin.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +DEVTOOLS_PORT=0 + +for var in "$@" +do + if [[ $var == --remote-debugging-port* ]] ; + then + DEVTOOLS_PORT=${var#*=} + echo "devtools_port=$DEVTOOLS_PORT" + fi +done + +openfin -l -c openfin_selenium.json -p $DEVTOOLS_PORT + diff --git a/release/chromedriver.exe b/release/chromedriver.exe index 9746454..6d9ffb9 100644 Binary files a/release/chromedriver.exe and b/release/chromedriver.exe differ diff --git a/release/chromedriver_linux64 b/release/chromedriver_linux64 new file mode 100755 index 0000000..d72e949 Binary files /dev/null and b/release/chromedriver_linux64 differ diff --git a/release/chromedriver_mac64 b/release/chromedriver_mac64 new file mode 100755 index 0000000..65356c7 Binary files /dev/null and b/release/chromedriver_mac64 differ diff --git a/release/openfin_selenium.json b/release/openfin_selenium.json new file mode 100644 index 0000000..e9c2196 --- /dev/null +++ b/release/openfin_selenium.json @@ -0,0 +1,29 @@ +{ + "startup_app": { + "name": "Hello OpenFin", + "url": "https://demoappdirectory.openf.in/desktop/config/apps/OpenFin/HelloOpenFin/index.html", + "urlxx": "https://httpbin.org/basic-auth/user/passwd", + "uuid": "OpenFinHelloWorld", + "applicationIcon": "http://demoappdirectory.openf.in/desktop/config/apps/OpenFin/HelloOpenFin/img/openfin.ico", + "autoShow": false, + "defaultHeight": 525, + "defaultWidth": 395, + "maxWidth": 395, + "maxHeight": 525, + "defaultTop": 50, + "defaultLeft": 10, + "resizable": false, + "maximizable": false, + "frame": false, + "cornerRounding": { + "width": 5, + "height": 5 + } + }, + "runtime": { + "arguments": "--v=1", + "version": "stable-v8" + }, + "splashScreenImage": "https://cdn.openfin.co/demos/hello/splashscreen/splash_hello.png", + "shortcut": {} +} diff --git a/release/testHelloOpenFin.bat b/release/testHelloOpenFin.bat index 3fddc25..f74995f 100644 --- a/release/testHelloOpenFin.bat +++ b/release/testHelloOpenFin.bat @@ -3,4 +3,4 @@ REM start tests with Selenium Grid running on http://10.37.129.2:8818/wd/hub REM java -DRemoteDriverURL=http://10.37.129.2:8818/wd/hub -DExecPath=RunOpenFin.bat -DExecArgs=--config="https://demoappdirectory.openf.in/desktop/config/apps/OpenFin/HelloOpenFin/selenium.json" -jar hello-openfin-selenium-jar-with-dependencies.jar com.openfin.HelloOpenFinTest REM start tests with standalone ChromeDrive.exe running on localhost:9515 -java -DRemoteDriverURL=http://localhost:9515 -DExecPath=RunOpenFin.bat -DExecArgs=--config="https://demoappdirectory.openf.in/desktop/config/apps/OpenFin/HelloOpenFin/selenium.json" -DSecurityRealm=realm1 -jar hello-openfin-selenium-jar-with-dependencies.jar com.openfin.HelloOpenFinTest +java -DRemoteDriverURL=http://localhost:9515 -DExecPath=RunOpenFin.bat -DExecArgs="--config=%~dp0\openfin_selenium.json" -DSecurityRealm=realm1 -jar hello-openfin-selenium-jar-with-dependencies.jar com.openfin.HelloOpenFinTest diff --git a/release/testHelloOpenFin.sh b/release/testHelloOpenFin.sh new file mode 100755 index 0000000..0a8efe9 --- /dev/null +++ b/release/testHelloOpenFin.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +java -DRemoteDriverURL=http://localhost:9515 -DExecPath=./RunOpenFin.sh -DExecArgs="--config=./openfin_selenium.json" -DSecurityRealm=realm1 -jar hello-openfin-selenium-jar-with-dependencies.jar com.openfin.HelloOpenFinTest diff --git a/src/main/java/com/openfin/HelloOpenFinTest.java b/src/main/java/com/openfin/HelloOpenFinTest.java index aab07d4..a5184c3 100644 --- a/src/main/java/com/openfin/HelloOpenFinTest.java +++ b/src/main/java/com/openfin/HelloOpenFinTest.java @@ -54,7 +54,6 @@ public static void main(String[] args) throws Exception { ChromeOptions options = new ChromeOptions(); options.setBinary(execPath); options.addArguments(execArgs); -// options.setExperimentalOption("forceDevToolsScreenshot", Boolean.TRUE); don't need to set this since default is true in v2.29 of ChromeDriver if (securityRealm != null) { options.addArguments(String.format("--security-realm=%s", securityRealm)); }