Skip to content

Commit

Permalink
Bumped all - before Selenium 4 (#73)
Browse files Browse the repository at this point in the history
  • Loading branch information
KMariusz authored Dec 15, 2022
1 parent 22f3ff4 commit 34b97d9
Show file tree
Hide file tree
Showing 43 changed files with 935 additions and 3,010 deletions.
30 changes: 3 additions & 27 deletions mrchecker-framework-modules/mrchecker-cli-module/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<parent>
<artifactId>mrchecker-test-framework</artifactId>
<groupId>com.capgemini.mrchecker</groupId>
<version>3.3.4</version>
<version>2022.12.14</version>
</parent>

<artifactId>mrchecker-cli-module</artifactId>
<version>1.0.5</version>
<version>2022.12.14</version>
<packaging>jar</packaging>
<name>MrChecker - CLI - Module</name>
<description>MrChecker CLI Module supports:
Expand Down Expand Up @@ -53,45 +53,21 @@

<properties>
<project.build.sourceEncoding>UTF8</project.build.sourceEncoding>
<mrchecker-core-module.version>5.7.0.7</mrchecker-core-module.version>
</properties>

<dependencies>

<!-- Dependency to other MrChecker Test Framework modules -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mrchecker-core-module</artifactId>
<version>${mrchecker-core-module.version}</version>
</dependency>

<!--This dependency is necessary for Allure generator plugin. -->
<dependency>
<!-- Test listener. Binds Junit exec to Allure annotation -->
<groupId>io.qameta.allure</groupId>
<artifactId>allure-junit5</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>io.qameta.allure</groupId>
<artifactId>allure-junit-platform</artifactId>
<version>2022.12.14</version>
</dependency>

<dependency>
<groupId>io.qameta.allure</groupId>
<artifactId>allure-java-commons</artifactId>
</dependency>

</dependencies>


<!-- Build goals/actions -->
<build>
<plugins>
<!-- Plugins are taken from parent pom.xml -->
</plugins>
</build>


</project>
32 changes: 24 additions & 8 deletions mrchecker-framework-modules/mrchecker-core-module/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<parent>
<artifactId>mrchecker-test-framework</artifactId>
<groupId>com.capgemini.mrchecker</groupId>
<version>3.3.4</version>
<version>2022.12.14</version>
</parent>

<artifactId>mrchecker-core-module</artifactId>
<version>5.7.0.7</version>
<version>2022.12.14</version>
<packaging>jar</packaging>
<name>MrChecker - Test core - Module</name>
<description>MrChecker Test Framework Core is responsible for:
Expand Down Expand Up @@ -59,14 +59,18 @@
<project.build.sourceEncoding>UTF8</project.build.sourceEncoding>

<!-- Logger -->
<log4j.version>2.17.1</log4j.version>
<slf4j.version>1.7.30</slf4j.version>
<log4j.version>2.19.0</log4j.version>
<slf4j.version>2.0.5</slf4j.version>

<!-- Cucumber version -->
<cucumber.version>6.7.0</cucumber.version>
<gherkin.cucumber.version>15.0.2</gherkin.cucumber.version>
<cucumber-reporting.version>5.3.1</cucumber-reporting.version>
<cucumber.version>7.8.1</cucumber.version>
<gherkin.cucumber.version>25.0.2</gherkin.cucumber.version>
<cucumber-reporting.version>5.7.4</cucumber-reporting.version>

<!--GSON-->
<gson.version>2.10</gson.version>
<!--ASSERTJ-->
<assertj.core.version>3.23.1</assertj.core.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -172,7 +176,18 @@
<version>3.17.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${assertj.core.version}</version>
</dependency>

<!--GSON-->
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson.version}</version>
</dependency>
</dependencies>

<!-- Build goals/actions -->
Expand All @@ -197,7 +212,8 @@
</includes>
</artifactSet>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>com.capgemini.mrchecker.test.core.utils.DataEncryptionApp</mainClass>
</transformer>
</transformers>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,68 +1,62 @@
package com.capgemini.mrchecker.test.core.utils.datadriven;

import com.capgemini.mrchecker.test.core.logger.BFLogger;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonArray;
import com.google.gson.JsonParser;

import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.io.Reader;

import com.capgemini.mrchecker.test.core.logger.BFLogger;

import io.cucumber.messages.internal.com.google.gson.GsonBuilder;
import io.cucumber.messages.internal.com.google.gson.JsonArray;
import io.cucumber.messages.internal.com.google.gson.JsonParser;

/**
* @author is an utility to handle JSON deserialization boilerplate for JParamRunner data driven cases. It has no state,
* therefore is not instantiable nor extendible.
* therefore is not instantiable nor extendible.
*/
public final class JsonDriven {

private JsonDriven() {
// NOP
}

/**
* @param <T>
* is inferred from class, has no meaning, just suppresses warnings
* @param filename
* of json file
* @param clazz
* of deserialized object, typically some form of container (array) for test configuration
* @return deserialized object array
*/
public static <T> T provide(String filename, Class<T> clazz) {
return new GsonBuilder().create()
.fromJson(fileToJson(filename), clazz);
}

public static <T> T provide(Reader reader, Class<T> clazz) {
return new GsonBuilder().create()
.fromJson(readerToJson(reader), clazz);
}

/**
* @param fileName
* fileName
* @return json from file or empty object when parsing file failed
*/
private static JsonArray fileToJson(String fileName) {
try (Reader reader = new FileReader(fileName)) {
return readerToJson(reader);
} catch (FileNotFoundException e) {
BFLogger.logError("Json file not found: " + fileName);
} catch (IOException e) {
BFLogger.logError("Json file could not be read: " + fileName);
}
return new JsonArray();
}

/**
* @param reader
* reader
* @return json from reader
*/
private static JsonArray readerToJson(Reader reader) {
return new JsonParser().parse(reader)
.getAsJsonArray();
}

private JsonDriven() {
// NOP
}

/**
* @param <T> is inferred from class, has no meaning, just suppresses warnings
* @param filename of json file
* @param clazz of deserialized object, typically some form of container (array) for test configuration
* @return deserialized object array
*/
public static <T> T provide(String filename, Class<T> clazz) {
return new GsonBuilder().create()
.fromJson(fileToJson(filename), clazz);
}

public static <T> T provide(Reader reader, Class<T> clazz) {
return new GsonBuilder().create()
.fromJson(readerToJson(reader), clazz);
}

/**
* @param fileName fileName
* @return json from file or empty object when parsing file failed
*/
private static JsonArray fileToJson(String fileName) {
try (Reader reader = new FileReader(fileName)) {
return readerToJson(reader);
} catch (FileNotFoundException e) {
BFLogger.logError("Json file not found: " + fileName);
} catch (IOException e) {
BFLogger.logError("Json file could not be read: " + fileName);
}
return new JsonArray();
}

/**
* @param reader reader
* @return json from reader
*/
private static JsonArray readerToJson(Reader reader) {
return new JsonParser().parse(reader)
.getAsJsonArray();
}
}
Loading

0 comments on commit 34b97d9

Please sign in to comment.