# HG changeset patch # User Edouard Tisserant # Date 1668965773 -3600 # Node ID b6bca75bf3faeb0e639a9062a717a4713dba8333 # Parent 6c496a8ed2a94d0d1e4bcfd43ca2992cdb6bea64 Tests: force bigger fonts and flat theme in GTK to make OCR more reliable. diff -r 6c496a8ed2a9 -r b6bca75bf3fa tests/ide_tests/debug_project.sikuli/1646062660770.png Binary file tests/ide_tests/debug_project.sikuli/1646062660770.png has changed diff -r 6c496a8ed2a9 -r b6bca75bf3fa tests/ide_tests/debug_project.sikuli/debug_project.py --- a/tests/ide_tests/debug_project.sikuli/debug_project.py Fri Nov 18 07:34:29 2022 +0100 +++ b/tests/ide_tests/debug_project.sikuli/debug_project.py Sun Nov 20 18:36:13 2022 +0100 @@ -29,7 +29,7 @@ app.waitForChangeAndIdleStdout() - app.click("1646062660770.png") + app.click("main") app.WaitIdleUI() diff -r 6c496a8ed2a9 -r b6bca75bf3fa tests/ide_tests/edit_project.sikuli/1646062660770.png Binary file tests/ide_tests/edit_project.sikuli/1646062660770.png has changed diff -r 6c496a8ed2a9 -r b6bca75bf3fa tests/ide_tests/edit_project.sikuli/edit_project.py --- a/tests/ide_tests/edit_project.sikuli/edit_project.py Fri Nov 18 07:34:29 2022 +0100 +++ b/tests/ide_tests/edit_project.sikuli/edit_project.py Sun Nov 20 18:36:13 2022 +0100 @@ -13,7 +13,7 @@ def test(app): - app.doubleClick("1646062660770.png") + app.doubleClick("main") app.WaitIdleUI() diff -r 6c496a8ed2a9 -r b6bca75bf3fa tests/ide_tests/opcua_browse.sikuli/opcua_browse.py --- a/tests/ide_tests/opcua_browse.sikuli/opcua_browse.py Fri Nov 18 07:34:29 2022 +0100 +++ b/tests/ide_tests/opcua_browse.sikuli/opcua_browse.py Sun Nov 20 18:36:13 2022 +0100 @@ -14,14 +14,12 @@ def test(app): server = AuxiliaryProcess(app, ["/bin/bash",os.path.join(getBundlePath(),"opcua_service.bash")]) - #server = AuxiliaryProcess(app, ["/bin/bash","-c","echo $PWD"]) - app.doubleClick("opcua_node.png") + app.doubleClick("opcua_0") app.WaitIdleUI() - # app.click("Browse Server") # OCR didn't work because of gradient in button... - app.click("opcua_browse_server.png") + app.click("Server") app.WaitIdleUI() diff -r 6c496a8ed2a9 -r b6bca75bf3fa tests/ide_tests/opcua_browse.sikuli/opcua_node.png Binary file tests/ide_tests/opcua_browse.sikuli/opcua_node.png has changed diff -r 6c496a8ed2a9 -r b6bca75bf3fa tests/ide_tests/opcua_browse_encrypted.sikuli/opcua_browse_encrypted.py --- a/tests/ide_tests/opcua_browse_encrypted.sikuli/opcua_browse_encrypted.py Fri Nov 18 07:34:29 2022 +0100 +++ b/tests/ide_tests/opcua_browse_encrypted.sikuli/opcua_browse_encrypted.py Sun Nov 20 18:36:13 2022 +0100 @@ -14,16 +14,14 @@ def test(app): server = AuxiliaryProcess(app, ["/bin/bash",os.path.join(getBundlePath(),"opcua_service.bash")]) - #server = AuxiliaryProcess(app, ["/bin/bash","-c","echo $PWD"]) server.waitPatternInStdout("CERTS READY", 5) - app.doubleClick("opcua_node.png") + app.doubleClick("opcua_0") app.WaitIdleUI() - # app.click("Browse Server") # OCR didn't work because of gradient in button... - app.click("opcua_browse_server.png") + app.click("Server") app.WaitIdleUI() diff -r 6c496a8ed2a9 -r b6bca75bf3fa tests/ide_tests/opcua_browse_encrypted.sikuli/opcua_node.png Binary file tests/ide_tests/opcua_browse_encrypted.sikuli/opcua_node.png has changed diff -r 6c496a8ed2a9 -r b6bca75bf3fa tests/ide_tests/sikuliberemiz.py --- a/tests/ide_tests/sikuliberemiz.py Fri Nov 18 07:34:29 2022 +0100 +++ b/tests/ide_tests/sikuliberemiz.py Sun Nov 20 18:36:13 2022 +0100 @@ -200,8 +200,6 @@ Sikuli App class instance """ - sikuli.OCR.Options().smallFont() - self.screenshotnum = 0 self.starttime = timesec() self.screen = sikuli.Screen() diff -r 6c496a8ed2a9 -r b6bca75bf3fa tests/tools/Docker/beremiz-sikuli/Dockerfile --- a/tests/tools/Docker/beremiz-sikuli/Dockerfile Fri Nov 18 07:34:29 2022 +0100 +++ b/tests/tools/Docker/beremiz-sikuli/Dockerfile Sun Nov 20 18:36:13 2022 +0100 @@ -22,15 +22,16 @@ && TZ="America/Paris" \ DEBIAN_FRONTEND="noninteractive" \ apt-get install -y --no-install-recommends \ - `# run sikuli` \ + `# to run sikuli` \ wget \ libopencv4.2-java \ openjdk-11-jre \ \ - `# run X based tests` \ + `# to run X based tests` \ fluxbox \ wmctrl xdotool xvfb \ x11vnc xterm xnest \ + materia-gtk-theme \ \ `# to build tested apps` \ build-essential automake flex bison mercurial \ @@ -38,6 +39,11 @@ libpython2.7-dev libssl-dev \ python2 virtualenv cmake + +# force bigger font and flat theme for GTK in order to make OCR more reliable +RUN mkdir -p /etc/gtk-3.0 +RUN env echo -e '[Settings]\ngtk-font-name=FreeSans,12\ngtk-theme-name=Materia\n' > /etc/gtk-3.0/settings.ini + # link obtained from https://raiman.github.io/SikuliX1/downloads.html RUN set -xe && \ wget -qP /usr/local/bin \