Merge pull request telekom#463 from telekom/feature/update-gradle-8

Feature/update gradle 8

README.md

@@ -99,11 +99,13 @@ Every module contains tests that can be run like
 gradle test
 ```
 
-The following optional properties can be set.
+Additional test properties are listed in the module's README. 
 
-| Property     | Description                           |
-|--------------|---------------------------------------|
-| `withJacoco` | Enables Jacoco code coverage analysis |
+Activate Jacoco code coverage analysis by 
+```shell
+gradle testCodeCoverageReport
+```
+instead of ``gradle test``
 
 ### License report
 

build.gradle

@@ -8,8 +8,6 @@ plugins {
 import com.github.jk1.license.filter.*
 import com.github.jk1.license.render.*
 
-def jacocoVersion = "0.8.6"
-
 apply plugin: 'io.codearte.nexus-staging'
 
 ext {
@@ -50,7 +48,7 @@ subprojects {
     archivesBaseName = "testerra"
 
     apply plugin: 'maven-publish' // tasks publish and publishToMavenLocal
-    apply plugin: 'jacoco'
+    apply plugin: 'jacoco-report-aggregation'
     apply plugin: 'signing'
 
     apply plugin: 'com.github.jk1.dependency-license-report'
@@ -63,10 +61,6 @@ subprojects {
         mavenCentral()
     }
 
-    jacoco {
-        toolVersion = jacocoVersion
-    }
-
     test {
 
         ignoreFailures = true
@@ -78,11 +72,6 @@ subprojects {
         options {
             systemProperties(System.getProperties())
         }
-
-        jacoco {
-            enabled = System.properties.containsKey("withJacoco")
-            //excludes = ['jdk.internal.*']
-        }
     }
 
     task cleanDist {
@@ -122,30 +111,3 @@ subprojects {
 
 // Do not move this integration because `group` and `version` is needed for publishing
 apply from: rootProject.file('publish.gradle')
-
-task jacocoAggregateReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
-
-    additionalSourceDirs(files(subprojects.sourceSets.main.allSource.srcDirs))
-
-    def srcdirs = files(subprojects.sourceSets.main.allSource.srcDirs)
-    def classdirs = files(subprojects.sourceSets.main.output)
-    sourceDirectories.setFrom(srcdirs)
-    classDirectories.setFrom(classdirs)
-
-    executionData(project.fileTree(dir: '.', include: '**/build/jacoco/test.exec'))
-
-    reports {
-        html.enabled = true
-        xml.enabled = true
-        csv.enabled = false
-    }
-    onlyIf = {
-        true
-    }
-
-    doFirst {
-        executionData(files(executionData.findAll {
-            it.exists()
-        }))
-    }
-}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

integration-tests/src/test/java/eu/tsystems/mms/tic/testframework/test/guielement/UiElementLayoutTests.java

@@ -275,14 +275,16 @@ private void testElementIntersectsParent(boolean test) {
         element.expect().bounds().intersects(parent).is(test);
     }
 
+    // Window size of all tests is set to 1024x768
+    // Viewport size is smaller then window size
     @Test
     public void test_viewport() {
         WebTestPage page = getPage();
         page.expect().viewport().left().is(0);
         page.expect().viewport().top().is(0);
 
         page.expect().viewport().contains(page.getOpenAgainLink()).is(true);
-        page.expect().viewport().width().is(1024);
-        page.expect().viewport().height().is(768);
+        page.expect().viewport().width().isBetween(1000, 1024);
+        page.expect().viewport().height().isBetween(570, 768);
     }
 }

report-ng-tests/build.gradle

@@ -23,6 +23,7 @@ test {
 
     def preTest = findProperty("pretestRNG")
     def preTestExtended = findProperty("pretestRNGExtended")
+    def playground = findProperty("playground")
 
     if (preTest) {
         s = ['src/test/resources/testng/GenerateReport.xml']
@@ -36,6 +37,10 @@ test {
         System.setProperty("tt.report.name", "Generated Report for Additional UI-Test")
     }
 
+    if (playground) {
+        s = ['src/test/resources/testng/Playground.xml']
+    }
+
     useTestNG() {
         suites s
 //        configFailurePolicy "continue"

report-ng-tests/src/main/java/io/testerra/report/test/pages/report/methodReport/ComparisonDialogOverlay.java

@@ -1,5 +1,6 @@
 package io.testerra.report.test.pages.report.methodReport;
 
+import eu.tsystems.mms.tic.testframework.pageobjects.AbstractComponent;
 import eu.tsystems.mms.tic.testframework.pageobjects.Check;
 import eu.tsystems.mms.tic.testframework.pageobjects.Page;
 import eu.tsystems.mms.tic.testframework.pageobjects.PreparedLocator;
@@ -10,59 +11,72 @@
 
 import java.util.HashMap;
 
-public class ComparisonDialogOverlay extends Page implements AssertProvider {
+public class ComparisonDialogOverlay extends AbstractComponent<ComparisonDialogOverlay> implements AssertProvider {
     @Check
-    private final UiElement contrastIcon = findIconInDialog("compare");
+    private final UiElement contrastIcon = find(By.xpath("//mdc-icon[text() = 'compare']"));
     @Check
-    private final UiElement switchIcon = findIconInDialog("compare_arrows");
+    private final UiElement switchIcon = find(By.xpath("//mdc-icon[text() = 'compare_arrows']"));
     @Check
     private final UiElement leftSelection = find(By.xpath("//mdc-select[@label='Left']"));
     @Check
     private final UiElement rightSelection = find(By.xpath("//mdc-select[@label='Right']"));
     @Check
     private final UiElement slider= find(By.xpath("//div[contains(@class,'slider')]"));
-    private final UiElement selectedItemLeft = leftSelection.find(By.xpath("//span[contains(@class,'selected-text')]"));
-    private final UiElement selectedItemRight = rightSelection.find(By.xpath("//span[contains(@class,'selected-text')]"));
-    PreparedLocator itemLocator = LOCATE.prepare("//span[text()='%s']");
+//    private final UiElement selectedItemLeft = leftSelection.find(By.xpath("//span[contains(@class,'selected-text')]"));
+//    private final UiElement selectedItemRight = rightSelection.find(By.xpath("//span[contains(@class,'selected-text')]"));
+//    PreparedLocator itemLocator = LOCATE.prepare("//span[text()='%s']");
 
-    public ComparisonDialogOverlay(WebDriver webDriver) {
-        super(webDriver);
-    }
+    private final UiElement content = find(By.xpath("//div[contains(@class,'img-comp-container')]"));
+
+    PreparedLocator selectedScreenshotOption = LOCATE.prepare("//mdc-select[@label='%s']//span[contains(@class,'selected-text')]//span[text()='%s']");
+
+    private final UiElement closeIcon = find(By.xpath("//button//span[text()='clear']"));
 
-    private UiElement findIconInDialog(String icon){
-        return find(By.xpath(String.format("//mdc-icon[text()='%s']",icon)));
+    public ComparisonDialogOverlay(UiElement rootElement) {
+        super(rootElement);
     }
 
     public ReportDetailsTab closeDialog() {
-        UiElement closeBtn = find(By.xpath("//button//span[text()='clear']"));
-        closeBtn.click();
+        this.closeIcon.click();
         return createPage(ReportDetailsTab.class);
     }
 
-    public void checkSelectedAndContentFromStartingMatched(String state) {
-        HashMap<String, String> stateMapping = new HashMap<String, String>();
-        stateMapping.put("Actual", "Difference");
-        stateMapping.put("Difference", "Expected");
-        stateMapping.put("Expected", "Difference");
+    public void checkContent(final ReportDetailsTab.ScreenshotType leftType, final ReportDetailsTab.ScreenshotType rightType, final String imageName) {
+        UiElement leftSelectedOption = find(selectedScreenshotOption.with("Left", leftType.toString()));
+        UiElement rightSelectedOption = find(selectedScreenshotOption.with("Right", rightType.toString()));
 
-        HashMap<String, String> screenshotMapping = new HashMap<String, String>();
-        screenshotMapping.put("Actual", "actual_difference_referenceImage");
-        screenshotMapping.put("Difference", "difference_expected_referenceImage");
-        screenshotMapping.put("Expected", "expected_difference_referenceImage");
+        leftSelectedOption.assertThat().displayed(true);
+        rightSelectedOption.assertThat().displayed(true);
 
-        CONTROL.collectAssertions(()->{
-            UiElement defaultSelectedItemLeft = selectedItemLeft.find(itemLocator.with(state));
-            UiElement imgContent = find(By.xpath("//div[contains(@class,'img-comp-container')]"));
-            defaultSelectedItemLeft.expect().displayed(true);
-            String expectedRightState = stateMapping.get(state);
-            String screenshotReference = screenshotMapping.get(state);
-            ASSERT.assertNotNull(expectedRightState);
-
-            UiElement defaultSelectedItemRight = selectedItemRight.find(itemLocator.with(expectedRightState));
-            defaultSelectedItemRight.expect().displayed(true);
-            imgContent.expect().screenshot().pixelDistance(screenshotReference).isLowerThan(10);
+        final String referenceImageName = String.format("%s_%s_%s", imageName, leftType, rightType);
+        this.content.assertThat().screenshot().pixelDistance(referenceImageName).isLowerThan(1);
+    }
 
-        });
+//    public void checkSelectedAndContentFromStartingMatched(String state) {
+//        HashMap<String, String> stateMapping = new HashMap<String, String>();
+//        stateMapping.put("Actual", "Difference");
+//        stateMapping.put("Difference", "Expected");
+//        stateMapping.put("Expected", "Difference");
+//
+//        HashMap<String, String> screenshotMapping = new HashMap<String, String>();
+//        screenshotMapping.put("Actual", "actual_difference_referenceImage");
+//        screenshotMapping.put("Difference", "difference_expected_referenceImage");
+//        screenshotMapping.put("Expected", "expected_difference_referenceImage");
+//
+//        CONTROL.collectAssertions(()->{
+//            UiElement defaultSelectedItemLeft = selectedItemLeft.find(itemLocator.with(state));
+//            UiElement imgContent = find(By.xpath("//div[contains(@class,'img-comp-container')]"));
+//            defaultSelectedItemLeft.expect().displayed(true);
+//            String expectedRightState = stateMapping.get(state);
+//            String screenshotReference = screenshotMapping.get(state);
+//            ASSERT.assertNotNull(expectedRightState);
+//
+//            UiElement defaultSelectedItemRight = selectedItemRight.find(itemLocator.with(expectedRightState));
+//            defaultSelectedItemRight.expect().displayed(true);
+//            imgContent.expect().screenshot().pixelDistance(screenshotReference).isLowerThan(10);
+//
+//        });
+//
+//    }
 
-    }
 }

report-ng-tests/src/main/java/io/testerra/report/test/pages/report/methodReport/ReportDetailsTab.java

@@ -53,6 +53,9 @@ public class ReportDetailsTab extends AbstractReportMethodPage {
     private final UiElement layoutComparison = find(By.xpath("//layout-comparison"));
     PreparedLocator imgTitleLocator = LOCATE.prepare("//img[contains(@title,'%s')]");
 
+    // Root element of every overly component
+    private final UiElement dialogRoot = find(By.xpath("//div[@class = 'mdc-dialog__container']"));
+
     public ReportDetailsTab(WebDriver driver) {
         super(driver);
     }
@@ -211,9 +214,15 @@ public boolean hasFailureAspectAScreenshotComparison(String failureMessage) {
         return this.getFailureAspectElement(failureMessage).find(By.xpath("//layout-comparison")).waitFor().present(true);
     }
 
-    public ComparisonDialogOverlay openComparisonDialogByClickingOnScreenShot(String imageTitle) {
-        UiElement image = layoutComparison.find(imgTitleLocator.with(imageTitle));
+    public ComparisonDialogOverlay openComparisonDialogByClickingOnScreenShot(final ScreenshotType screenshotType) {
+        UiElement image = layoutComparison.find(imgTitleLocator.with(screenshotType.toString()));
         image.click();
-        return createPage(ComparisonDialogOverlay.class);
+        return createComponent(ComparisonDialogOverlay.class, this.dialogRoot);
+    }
+
+    public enum ScreenshotType {
+        Actual,
+        Difference,
+        Expected;
     }
 }

report-ng-tests/src/test/java/io/testerra/report/test/report_test/common/LayoutTest.java

@@ -30,6 +30,7 @@
 import io.testerra.report.test.pages.report.sideBarPages.ReportDashBoardPage;
 import io.testerra.report.test.pages.report.sideBarPages.ReportTestsPage;
 import org.testng.annotations.Test;
+import io.testerra.report.test.pages.report.methodReport.ReportDetailsTab.ScreenshotType;
 
 public class LayoutTest extends AbstractReportTest {
 
@@ -153,27 +154,31 @@ public void testT05_checkPassedLayoutTestAndFailedAssertion() {
     }
 
     @Test
-    public void testT06_checkLayoutDialog(){
+    public void testT06_checkLayoutDialog() {
         String methodName = "layoutTest01_layoutTestFailing";
         String className = "GenerateLayoutTestsTTReportTest";
 
-        String[] imageTitles = new String[]{
-                "Actual",
-                "Difference",
-                "Expected"
-        };
-
         TestStep.begin("Navigate to details page");
         ReportDashBoardPage reportDashBoardPage = this.gotoDashBoardOnAdditionalReport(WEB_DRIVER_MANAGER.getWebDriver());
         ReportTestsPage reportTestsPage = reportDashBoardPage.gotoToReportPage(ReportSidebarPageType.TESTS, ReportTestsPage.class);
         reportTestsPage.selectClassName(className);
         ReportDetailsTab reportDetailsTab = reportTestsPage.navigateToDetailsTab(methodName);
-        TestStep.begin("Open Layout Dialog");
-        for(String title: imageTitles){
-            ComparisonDialogOverlay comparisonDialogOverlay = reportDetailsTab.openComparisonDialogByClickingOnScreenShot(title);
-            comparisonDialogOverlay.checkSelectedAndContentFromStartingMatched(title);
-            reportDetailsTab = comparisonDialogOverlay.closeDialog();
-        }
+
+        TestStep.begin("Open Layout Dialog from actual image");
+        ComparisonDialogOverlay comparisonDialogOverlay = reportDetailsTab.openComparisonDialogByClickingOnScreenShot(ScreenshotType.Actual);
+        comparisonDialogOverlay.checkContent(ScreenshotType.Actual, ScreenshotType.Difference, "layout_compare_dialog");
+        reportDetailsTab = comparisonDialogOverlay.closeDialog();
+
+        TestStep.begin("Open Layout Dialog from difference image");
+        comparisonDialogOverlay = reportDetailsTab.openComparisonDialogByClickingOnScreenShot(ScreenshotType.Difference);
+        comparisonDialogOverlay.checkContent(ScreenshotType.Difference, ScreenshotType.Expected, "layout_compare_dialog");
+        reportDetailsTab = comparisonDialogOverlay.closeDialog();
+
+        TestStep.begin("Open Layout Dialog from expected image");
+        comparisonDialogOverlay = reportDetailsTab.openComparisonDialogByClickingOnScreenShot(ScreenshotType.Expected);
+        comparisonDialogOverlay.checkContent(ScreenshotType.Expected, ScreenshotType.Difference, "layout_compare_dialog");
+        reportDetailsTab = comparisonDialogOverlay.closeDialog();
+
     }
 
 }

report-ng-tests/src/test/resources/test.properties

@@ -25,9 +25,6 @@ tt.browser.maximize=false
 tt.display.resolution=1600x1024
 
 #tt.element.timeout.seconds=3
-tt.screencaster.active=false
-
-#tt.selenium.server.host=localhost
 
 #tt.layoutcheck.takereference=true
 tt.layoutcheck.reference.path=src/test/resources/layout-references/{tt.browser}

report-ng-tests/src/test/resources/testng/Playground.xml

@@ -3,15 +3,20 @@
 <suite name="Report - Playground suite" verbose="1" parallel="methods" configfailurepolicy="continue" thread-count="10" data-provider-thread-count="10">
 
     <test name="Test1" parallel="methods">
-        <groups>
-            <run>
-                <include name="extended"/>
+<!--        <groups>-->
+<!--            <run>-->
+<!--                <include name="extended"/>-->
 <!--                <include name="extended2"/>-->
-            </run>
-        </groups>
+<!--            </run>-->
+<!--        </groups>-->
         <classes>
-            <class name="io.testerra.report.test.pretest_status.dependency.DependencySetup1Tests"/>
+<!--            <class name="io.testerra.report.test.pretest_status.dependency.DependencySetup1Tests"/>-->
 <!--            <class name="io.testerra.report.test.pretest_status.dependency.DependencySetup3Tests"/>-->
+            <class name="io.testerra.report.test.report_test.common.LayoutTest">
+                <methods>
+                    <include name="testT06_checkLayoutDialog"/>
+                </methods>
+            </class>
         </classes>
     </test>