Skip to content

Commit aa78a77

Browse files
KMariuszKMariusz
committed
Version 2023.04.04: CustomStrategy on core, dependencies for WebAPI module
1 parent 9d6e1f7 commit aa78a77

File tree

11 files changed

+101
-102
lines changed

11 files changed

+101
-102
lines changed

‎mrchecker-framework-modules/mrchecker-cli-module/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<parent>
77
<artifactId>mrchecker-test-framework</artifactId>
88
<groupId>com.capgemini.mrchecker</groupId>
9-
<version>2023.04.03</version>
9+
<version>2023.04.04</version>
1010
</parent>
1111

1212
<artifactId>mrchecker-cli-module</artifactId>
13-
<version>2023.04.03</version>
13+
<version>2023.04.04</version>
1414
<packaging>jar</packaging>
1515
<name>MrChecker - CLI - Module</name>
1616
<description>MrChecker CLI Module supports:
@@ -60,7 +60,7 @@
6060
<dependency>
6161
<groupId>${project.groupId}</groupId>
6262
<artifactId>mrchecker-core-module</artifactId>
63-
<version>2023.04.03</version>
63+
<version>2023.04.04</version>
6464
</dependency>
6565
</dependencies>
6666

‎mrchecker-framework-modules/mrchecker-core-module/pom.xml‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<artifactId>mrchecker-test-framework</artifactId>
99
<groupId>com.capgemini.mrchecker</groupId>
10-
<version>2023.04.03</version>
10+
<version>2023.04.04</version>
1111
</parent>
1212

1313
<artifactId>mrchecker-core-module</artifactId>
14-
<version>2023.04.03</version>
14+
<version>2023.04.04</version>
1515
<packaging>jar</packaging>
1616
<name>MrChecker - Test core - Module</name>
1717
<description>MrChecker Test Framework Core is responsible for:
@@ -40,6 +40,18 @@
4040
<organization>Capgemini - Software Solution Center</organization>
4141
<organizationUrl>https://capgeminisoftware.pl</organizationUrl>
4242
</developer>
43+
<developer>
44+
<name>Mariusz Kowalski</name>
45+
<email>mariusz.kowalski@capgemini.com</email>
46+
<organization>Capgemini - Nearshore Test Center - Poland</organization>
47+
<organizationUrl>http://nsc.capgemini.com/nearshoretestcenter</organizationUrl>
48+
</developer>
49+
<developer>
50+
<name>Michal Babiarz</name>
51+
<email>michal.babiarz@capgemini.com</email>
52+
<organization>Capgemini - Nearshore Test Center - Poland</organization>
53+
<organizationUrl>http://nsc.capgemini.com/nearshoretestcenter</organizationUrl>
54+
</developer>
4355
</developers>
4456

4557
<licenses>
@@ -58,6 +70,9 @@
5870
<properties>
5971
<project.build.sourceEncoding>UTF8</project.build.sourceEncoding>
6072

73+
<!-- Guava is a set of core libraries -->
74+
<google.guava.version>31.1-jre</google.guava.version>
75+
6176
<!-- Logger -->
6277
<log4j.version>2.20.0</log4j.version>
6378
<slf4j.version>2.0.6</slf4j.version>
@@ -74,6 +89,15 @@
7489
</properties>
7590

7691
<dependencies>
92+
<!-- Guava is a set of core libraries -->
93+
<!-- NOTE: given Guava lib is not backward compatible, therefore
94+
must be used as first dependency import to overwrite any other imports -->
95+
<dependency>
96+
<groupId>com.google.guava</groupId>
97+
<artifactId>guava</artifactId>
98+
<version>${google.guava.version}</version>
99+
</dependency>
100+
77101
<!--This dependency is necessary for Logger. -->
78102
<dependency>
79103
<groupId>org.apache.logging.log4j</groupId>

mrchecker-framework-modules/mrchecker-selenium-module/src/main/java/com/capgemini/mrchecker/selenium/junit/CustomStrategy.java renamed to mrchecker-framework-modules/mrchecker-core-module/src/main/java/com/capgemini/mrchecker/test/core/junit/CustomStrategy.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package com.capgemini.mrchecker.selenium.junit;
1+
package com.capgemini.mrchecker.test.core.junit;
22

33
import org.junit.platform.engine.ConfigurationParameters;
44
import org.junit.platform.engine.support.hierarchical.ParallelExecutionConfiguration;
55
import org.junit.platform.engine.support.hierarchical.ParallelExecutionConfigurationStrategy;
66

7-
//Used in Selenium test project pom surefire config to properly run tests parallel on JUnit 5 + Selenium 4
7+
//Used in test project pom surefire config to properly run tests parallel on JUnit 5
88
//junit.jupiter.execution.parallel.config.strategy = custom
9-
//junit.jupiter.execution.parallel.config.custom.class=com.capgemini.mrchecker.selenium.junit.CustomStrategy
9+
//junit.jupiter.execution.parallel.config.custom.class=com.capgemini.mrchecker.test.core.junit.CustomStrategy
1010
public class CustomStrategy implements ParallelExecutionConfiguration, ParallelExecutionConfigurationStrategy {
11-
private int threadCount = Integer.parseInt(System.getProperty("thread.count", "1"));
11+
private final int threadCount = Integer.parseInt(System.getProperty("thread.count", "1"));
1212

1313
@Override
1414
public int getParallelism() {

‎mrchecker-framework-modules/mrchecker-database-module/pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<parent>
77
<artifactId>mrchecker-test-framework</artifactId>
88
<groupId>com.capgemini.mrchecker</groupId>
9-
<version>2023.04.03</version>
9+
<version>2023.04.04</version>
1010
</parent>
1111

1212
<artifactId>mrchecker-database-module</artifactId>
13-
<version>2023.04.03</version>
13+
<version>2023.04.04</version>
1414
<packaging>jar</packaging>
1515
<name>MrChecker - Database - Module</name>
1616
<description>MrChecker Database Module:
@@ -71,7 +71,7 @@
7171

7272
<jpa.version>2.2</jpa.version>
7373
<hibernate-core.version>6.1.7.Final</hibernate-core.version>
74-
<mysql-connector-java.version>8.0.32</mysql-connector-java.version>
74+
<mysql-connector-j.version>8.0.32</mysql-connector-j.version>
7575
<byte-buddy.version>1.14.0</byte-buddy.version>
7676
</properties>
7777

@@ -80,7 +80,7 @@
8080
<dependency>
8181
<groupId>${project.groupId}</groupId>
8282
<artifactId>mrchecker-core-module</artifactId>
83-
<version>2023.04.03</version>
83+
<version>2023.04.04</version>
8484
</dependency>
8585

8686
<!-- JPA dependencies -->
@@ -97,9 +97,9 @@
9797
</dependency>
9898

9999
<dependency>
100-
<groupId>mysql</groupId>
101-
<artifactId>mysql-connector-java</artifactId>
102-
<version>${mysql-connector-java.version}</version>
100+
<groupId>com.mysql</groupId>
101+
<artifactId>mysql-connector-j</artifactId>
102+
<version>${mysql-connector-j.version}</version>
103103
</dependency>
104104

105105
<dependency>

‎mrchecker-framework-modules/mrchecker-mobile-module/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<artifactId>mrchecker-test-framework</artifactId>
99
<groupId>com.capgemini.mrchecker</groupId>
10-
<version>2023.04.03</version>
10+
<version>2023.04.04</version>
1111
</parent>
1212

1313
<artifactId>mrchecker-mobile-module</artifactId>
14-
<version>2023.04.03</version>
14+
<version>2023.04.04</version>
1515
<packaging>jar</packaging>
1616
<name>MrChecker - Mobile - Module</name>
1717
<description>MrChecker Test Framework name supports:
@@ -52,12 +52,12 @@
5252
<dependency>
5353
<groupId>${project.groupId}</groupId>
5454
<artifactId>mrchecker-core-module</artifactId>
55-
<version>2023.04.03</version>
55+
<version>2023.04.04</version>
5656
</dependency>
5757
<dependency>
5858
<groupId>${project.groupId}</groupId>
5959
<artifactId>mrchecker-selenium-module</artifactId>
60-
<version>2023.04.03</version>
60+
<version>2023.04.04</version>
6161
</dependency>
6262

6363
<!--This dependency is necessary for Appium plugin. -->

‎mrchecker-framework-modules/mrchecker-playwright-module/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<artifactId>mrchecker-test-framework</artifactId>
99
<groupId>com.capgemini.mrchecker</groupId>
10-
<version>2023.04.03</version>
10+
<version>2023.04.04</version>
1111
</parent>
1212

1313
<artifactId>mrchecker-playwright-module</artifactId>
14-
<version>2023.04.03</version>
14+
<version>2023.04.04</version>
1515
<packaging>jar</packaging>
1616
<name>MrChecker - Playwright - Module</name>
1717
<description>MrChecker Test Framework Playwright</description>
@@ -68,7 +68,7 @@
6868
<dependency>
6969
<groupId>${project.groupId}</groupId>
7070
<artifactId>mrchecker-core-module</artifactId>
71-
<version>2023.04.03</version>
71+
<version>2023.04.04</version>
7272
</dependency>
7373

7474
<!--This dependency is necessary for Playwright plugin. -->

‎mrchecker-framework-modules/mrchecker-playwright-module/src/main/java/com/capgemini/mrchecker/playwright/junit/CustomStrategy.java‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎mrchecker-framework-modules/mrchecker-security-module/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<artifactId>mrchecker-test-framework</artifactId>
99
<groupId>com.capgemini.mrchecker</groupId>
10-
<version>2023.04.03</version>
10+
<version>2023.04.04</version>
1111
</parent>
1212

1313
<artifactId>mrchecker-security-module</artifactId>
14-
<version>2023.04.03</version>
14+
<version>2023.04.04</version>
1515
<packaging>jar</packaging>
1616
<name>MrChecker - Security - Module</name>
1717
<description>MrChecker Test Framework Security supports:
@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>${project.groupId}</groupId>
6565
<artifactId>mrchecker-core-module</artifactId>
66-
<version>2023.04.03</version>
66+
<version>2023.04.04</version>
6767
</dependency>
6868

6969
<!-- Needed to perform all API calls -->

‎mrchecker-framework-modules/mrchecker-selenium-module/pom.xml‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<artifactId>mrchecker-test-framework</artifactId>
99
<groupId>com.capgemini.mrchecker</groupId>
10-
<version>2023.04.03</version>
10+
<version>2023.04.04</version>
1111
</parent>
1212

1313
<artifactId>mrchecker-selenium-module</artifactId>
14-
<version>2023.04.03</version>
14+
<version>2023.04.04</version>
1515
<packaging>jar</packaging>
1616
<name>MrChecker - Selenium - Module</name>
1717
<description>MrChecker Test Framework Selenium supports:
@@ -80,28 +80,17 @@
8080
<!-- Selenium settings -->
8181
<selenium.version>4.8.3</selenium.version>
8282

83-
<!-- Guava is a set of core libraries -->
84-
<google.guava.version>31.1-jre</google.guava.version>
8583

8684
<webdrivermanager.version>5.3.2</webdrivermanager.version>
8785
<google-api-client.version>2.2.0</google-api-client.version>
8886
</properties>
8987

9088
<dependencies>
91-
<!-- Guava is a set of core libraries -->
92-
<!-- NOTE: given Guava lib is not backward compatible, therefore
93-
must be used as first dependency import to overwrite any other imports -->
94-
<dependency>
95-
<groupId>com.google.guava</groupId>
96-
<artifactId>guava</artifactId>
97-
<version>${google.guava.version}</version>
98-
</dependency>
99-
10089
<!-- Dependency to other MrChecker Test Framework modules -->
10190
<dependency>
10291
<groupId>${project.groupId}</groupId>
10392
<artifactId>mrchecker-core-module</artifactId>
104-
<version>2023.04.03</version>
93+
<version>2023.04.04</version>
10594
</dependency>
10695

10796
<!--This dependency is necessary for Selenium plugin. -->

‎mrchecker-framework-modules/mrchecker-webapi-module/pom.xml‎

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<artifactId>mrchecker-test-framework</artifactId>
99
<groupId>com.capgemini.mrchecker</groupId>
10-
<version>2023.04.03</version>
10+
<version>2023.04.04</version>
1111
</parent>
1212

1313
<artifactId>mrchecker-webapi-module</artifactId>
14-
<version>2023.04.03</version>
14+
<version>2023.04.04</version>
1515
<packaging>jar</packaging>
1616
<name>MrChecker - WebApi - Module</name>
1717
<description>
@@ -73,14 +73,18 @@
7373
<wiremock-body-transformer.version>1.1.6</wiremock-body-transformer.version>
7474
<java-xmlbuilder.version>1.3</java-xmlbuilder.version>
7575

76+
<!-- Allure reporting -->
77+
<allure.version>2.21.0</allure.version>
78+
79+
<jackson.version>2.14.2</jackson.version>
7680
</properties>
7781

7882
<dependencies>
7983
<!-- Dependency to other MrChecker Test Framework modules -->
8084
<dependency>
8185
<groupId>${project.groupId}</groupId>
8286
<artifactId>mrchecker-core-module</artifactId>
83-
<version>2023.04.03</version>
87+
<version>2023.04.04</version>
8488
</dependency>
8589

8690
<!-- Dependency to REST and SOAP lib -->
@@ -89,6 +93,36 @@
8993
<artifactId>rest-assured</artifactId>
9094
</dependency>
9195

96+
<dependency>
97+
<groupId>io.qameta.allure</groupId>
98+
<artifactId>allure-rest-assured</artifactId>
99+
<version>${allure.version}</version>
100+
</dependency>
101+
102+
<dependency>
103+
<groupId>com.fasterxml.jackson.core</groupId>
104+
<artifactId>jackson-core</artifactId>
105+
<version>${jackson.version}</version>
106+
</dependency>
107+
108+
<dependency>
109+
<groupId>com.fasterxml.jackson.core</groupId>
110+
<artifactId>jackson-annotations</artifactId>
111+
<version>${jackson.version}</version>
112+
</dependency>
113+
114+
<dependency>
115+
<groupId>com.fasterxml.jackson.core</groupId>
116+
<artifactId>jackson-databind</artifactId>
117+
<version>${jackson.version}</version>
118+
</dependency>
119+
120+
<dependency>
121+
<groupId>com.fasterxml.jackson.dataformat</groupId>
122+
<artifactId>jackson-dataformat-xml</artifactId>
123+
<version>${jackson.version}</version>
124+
</dependency>
125+
92126
<!-- Dependency to start mock API -->
93127
<dependency>
94128
<!-- http://wiremock.org/docs/ -->

0 commit comments

Comments
 (0)