From 33627faca85f3c926685889e976ab297c6cc14a3 Mon Sep 17 00:00:00 2001 From: Quentin Monnier Date: Tue, 6 Dec 2022 17:39:37 -0500 Subject: [PATCH] update screport submodule --- app/build.gradle | 20 ++++++++------------ screport | 2 +- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8cf149296..aaee378ce 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -323,12 +323,12 @@ def embedScreenshotsTask = task('embedScreenshots', group: 'reporting') { def pt1 = failedTestCaseDescription.indexOf(".") def line = failedTestCaseDescription.substring(0, pt1) def pt2 = failedTestCaseDescription.indexOf(".", pt1+1) - def name = "" - if (pt2 != -1) { - name = failedTestCaseDescription.substring(pt1 + 1, pt2) - def pt3 = failedTestCaseDescription.indexOf(".", pt2) - name += " (${failedTestCaseDescription.substring(pt3+1)})" - } else name = failedTestCaseDescription.substring(pt1 + 1) + def name = failedTestCaseDescription.substring(pt1+1, pt2) + def pt3 = failedTestCaseDescription.indexOf(".", pt2+1) + if (pt3 != -1) { + def pt4 = failedTestCaseDescription.indexOf(".", pt3+1) + name += " (${failedTestCaseDescription.substring(pt3+1,pt4)})" + } def failedTestClassJunitReportFile = new File(reportsDirectory, "${failedTestClassName}.html") @@ -385,12 +385,8 @@ def embedScreenshotsTask = task('embedScreenshots', group: 'reporting') { def imagesrc = new File("failures", failedTestClassName + File.separator + failedTestName + File.separator + failedTestCaseDescription).toString() - screenshotReport += "display conficts detected with \"${name}\" line ${line}: (reference | capture | difference)\n" - screenshotReport += "
\n" - screenshotReport += "\n" - screenshotReport += "\n" - screenshotReport += "\n" - screenshotReport += "
" + screenshotReport += "display conficts detected with \'${name}\' line ${line}:\n" + screenshotReport += "\n" def insertIndex = failedTestJunitReportContent.indexOf("", failedTestIndex) def firstPart = failedTestJunitReportContent.substring(0, insertIndex) diff --git a/screport b/screport index a8f3e58a0..1d7df53ae 160000 --- a/screport +++ b/screport @@ -1 +1 @@ -Subproject commit a8f3e58a0043b40d57d0da925088fcfa5981f22f +Subproject commit 1d7df53aece8df01de28eb680d03d6ffab37fce0