Test report

# HG changeset patch # User Edouard Tisserant # Date 1671673568 -3600 # Node ID 51c2d434e10e442bd721e73eec03f4c2bea80178 # Parent fcf3dcc8ab3bc574e3ecd9510ec644e31b775f64 tests: IDE: own text matching logic for OCR reliability, enhanced ihtml report diff -r fcf3dcc8ab3b -r 51c2d434e10e tests/ide_tests/edit_project.sikuli/edit_project.py --- a/tests/ide_tests/edit_project.sikuli/edit_project.py Thu Dec 15 14:59:27 2022 +0100 +++ b/tests/ide_tests/edit_project.sikuli/edit_project.py Thu Dec 22 02:46:08 2022 +0100 @@ -25,7 +25,7 @@ app.WaitIdleUI() - app.doubleClick("Hello world") + app.doubleClick("Hello") app.WaitIdleUI() diff -r fcf3dcc8ab3b -r 51c2d434e10e tests/ide_tests/opcua_browse.sikuli/opcua_browse.py --- a/tests/ide_tests/opcua_browse.sikuli/opcua_browse.py Thu Dec 15 14:59:27 2022 +0100 +++ b/tests/ide_tests/opcua_browse.sikuli/opcua_browse.py Thu Dec 22 02:46:08 2022 +0100 @@ -15,7 +15,7 @@ server = AuxiliaryProcess(app, ["/bin/bash",os.path.join(getBundlePath(),"opcua_service.bash")]) - app.doubleClick("opcua_0") + app.doubleClick(["opcua_0", "opcua"]) app.WaitIdleUI() @@ -29,7 +29,7 @@ app.doubleClick("TestObject") - app.dragNdrop("TestIn", "output variables") + app.dragNdrop(["TestIn", "Testln"], "output variables") app.wait(1) diff -r fcf3dcc8ab3b -r 51c2d434e10e tests/ide_tests/opcua_browse_encrypted.sikuli/opcua_browse_encrypted.py --- a/tests/ide_tests/opcua_browse_encrypted.sikuli/opcua_browse_encrypted.py Thu Dec 15 14:59:27 2022 +0100 +++ b/tests/ide_tests/opcua_browse_encrypted.sikuli/opcua_browse_encrypted.py Thu Dec 22 02:46:08 2022 +0100 @@ -17,7 +17,7 @@ server.waitPatternInStdout("CERTS READY", 5) - app.doubleClick("opcua_0") + app.doubleClick(["opcua_0", "opcua"]) app.WaitIdleUI() @@ -31,7 +31,7 @@ app.doubleClick("TestObject") - app.dragNdrop("TestIn", "output variables") + app.dragNdrop(["TestIn", "Testln"], "output variables") app.wait(1) diff -r fcf3dcc8ab3b -r 51c2d434e10e tests/ide_tests/sikuliberemiz.py --- a/tests/ide_tests/sikuliberemiz.py Thu Dec 15 14:59:27 2022 +0100 +++ b/tests/ide_tests/sikuliberemiz.py Thu Dec 22 02:46:08 2022 +0100 @@ -5,8 +5,10 @@ import subprocess import traceback import signal +import re from threading import Thread, Event, Lock from time import time as timesec +from xml.sax.saxutils import escape as escape_xml import sikuli @@ -16,6 +18,13 @@ tessdata_path = os.environ["TESSDATAPATH"] +ansi_escape = re.compile(r'(?:\x1B[@-_]|[\x80-\x9F])[0-?]*[ -/]*[@-~]') +def escape_ansi(line): + return ansi_escape.sub('', line) + +def escape(txt): + return escape_xml(escape_ansi(txt)) + class KBDShortcut: """Send shortut to app by calling corresponding methods. @@ -59,6 +68,7 @@ app (class BeremizApp) """ self.r = sikuli.Region(self.sikuliapp.window()) + self.targetOffset = self.r.getTopLeft() self.idechanged = False @@ -199,19 +209,21 @@ Returns: Sikuli App class instance """ - sikuli.OCR.Options().dataPath(tessdata_path) - sikuli.OCR.Options().oem(0) - - self.screenshotnum = 0 + self.ocropts = sikuli.OCR.globalOptions() + self.ocropts.dataPath(tessdata_path) + self.ocropts.oem(0) + self.ocropts.smallFont() + + self.imgnum = 0 self.starttime = timesec() self.screen = sikuli.Screen() - self.report = open("report.html", "w") - self.report.write(""" - + self.report = open("report.xhtml", "w") + self.report.write("""\ + - - + + Test report @@ -273,21 +285,66 @@ stdoutIdleObserver.__init__(self) # stubs for common sikuli calls to allow adding hooks later - for name in ["click","doubleClick","type","rightClick","wait"]: - def makeMyMeth(n): + for name, takes_matches in [ + ("click", True), + ("doubleClick", True), + ("type", False), + ("rightClick", True), + ("wait", False)]: + def makeMyMeth(n,m): def myMeth(*args, **kwargs): self.ReportScreenShot("Begin: " + n + "(" + repr(args) + "," + repr(kwargs) + ")") + if m: + args = map(self.handle_PFRML_arg, args) + kwargs = dict(map(lambda k,v:(k,self.handle_PFRML_arg(v)), kwargs.items())) try: getattr(sikuli, n)(*args, **kwargs) finally: self.ReportScreenShot("end: " + n + "(" + repr(args) + "," + repr(kwargs) + ")") return myMeth - setattr(self, name, makeMyMeth(name)) + setattr(self, name, makeMyMeth(name,takes_matches)) + + def handle_PFRML_arg(self, arg): + if type(arg)==list: + return self.findBest(*arg) + if type(arg)==str and not arg.endswith(".png"): + return self.findBest(arg) + return arg + + def findBest(self, *args): + #match = self.r.findBest(*args) + match = None + matches = sikuli.OCR.readWords(self.r) + sikuli.OCR.readLines(self.r) + for m in matches: + mText = m.getText().encode('ascii', 'ignore') + for arg in args: + if arg in mText: + if match is None: + match = m + if mText == arg: + match = m + break + if match is None: + self.ReportText("Not found: " + repr(args) + " OCR content: ") + for m in matches: + self.ReportText(repr(m) + ": " + m.getText().encode('ascii', 'ignore')) + raise Exception("Not Found: " + repr(args)) + + # translate match to screen ref + #match.setTargetOffset(self.targetOffset) + match.setTopLeft(match.getTopLeft().offset(self.targetOffset)) + + self.ReportTextImage("Found for " + repr(args) + ": " + + " ".join([repr(match), repr(match.getTarget()), repr(match.getTargetOffset())]), + self.screen.capture(match)) + return match.getTarget() def dragNdrop(self, src, dst): - sikuli.drag(src) + self.ReportScreenShot("Drag: (" + repr(src) + ")") + sikuli.drag(self.handle_PFRML_arg(src)) sikuli.mouseMove(5,0) - sikuli.dropAt(dst) + sikuli.dropAt(self.handle_PFRML_arg(dst)) + self.ReportScreenShot("Drop: (" + repr(dst) + ")") def close(self): self.sikuliapp.close() @@ -304,21 +361,26 @@ stdoutIdleObserver.__del__(self) def ReportScreenShot(self, msg): + cap = self.screen.capture(self.r) + self.ReportTextImage(msg, cap) + + def ReportTextImage(self, msg, img): elapsed = "%.3fs: "%(timesec() - self.starttime) - fname = "capture"+str(self.screenshotnum)+".png" - cap = self.screen.capture(self.r) - cap.save(".", fname) - self.screenshotnum = self.screenshotnum + 1 - self.report.write( "

" + elapsed + msg + "
" + "

") + fname = "capture"+str(self.imgnum)+".png" + img.save(".", fname) + self.imgnum = self.imgnum + 1 + self.report.write( "

" + escape(elapsed + msg) + "
" + "

") def ReportText(self, text): elapsed = "%.3fs: "%(timesec() - self.starttime) - self.report.write("

" + elapsed + text + "

") + #res = u"

" + res = u"

" + escape(elapsed + text) + "

" + self.report.write(res) def ReportOutput(self, text): elapsed = "%.3fs: "%(timesec() - self.starttime) sys.stdout.write(elapsed + text) - self.report.write("

" + elapsed + text + "

") + self.report.write("

" + escape(elapsed + text) + "

") class AuxiliaryProcess(stdoutIdleObserver): diff -r fcf3dcc8ab3b -r 51c2d434e10e tests/tools/Docker/Dockerfile --- a/tests/tools/Docker/Dockerfile Thu Dec 15 14:59:27 2022 +0100 +++ b/tests/tools/Docker/Dockerfile Thu Dec 22 02:46:08 2022 +0100 @@ -17,6 +17,10 @@ RUN groupadd -g $GID $UNAME RUN useradd -m -u $UID -g $GID -s /bin/bash $UNAME +RUN apt-get install locales +RUN locale-gen en_US.UTF-8 +RUN update-locale LANG=en_US.UTF-8 + RUN set -xe \ && apt-get update \ && TZ="America/Paris" \