Skip to content

Commit bb498b7

Browse files
KMariuszKMariusz
committed
Version 2023.01.03: console logs colors, handle environments.csv files issues
1 parent 2184a79 commit bb498b7

File tree

11 files changed

+53
-45
lines changed

11 files changed

+53
-45
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>2022.12.29</version>
9+
<version>2023.01.03</version>
1010
</parent>
1111

1212
<artifactId>mrchecker-cli-module</artifactId>
13-
<version>2022.12.29</version>
13+
<version>2023.01.03</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>2022.12.29</version>
63+
<version>2023.01.03</version>
6464
</dependency>
6565
</dependencies>
6666

‎mrchecker-framework-modules/mrchecker-core-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>2022.12.29</version>
10+
<version>2023.01.03</version>
1111
</parent>
1212

1313
<artifactId>mrchecker-core-module</artifactId>
14-
<version>2022.12.29</version>
14+
<version>2023.01.03</version>
1515
<packaging>jar</packaging>
1616
<name>MrChecker - Test core - Module</name>
1717
<description>MrChecker Test Framework Core is responsible for:
@@ -257,4 +257,4 @@
257257
</plugins>
258258
</build>
259259

260-
</project>
260+
</project>

‎mrchecker-framework-modules/mrchecker-core-module/src/main/java/com/capgemini/mrchecker/test/core/base/environment/providers/SpreadsheetEnvironmentService.java

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,9 @@ public String getValue(String serviceName) {
8585
return value;
8686
}
8787

88-
@SuppressWarnings({"resource", "deprecation"})
8988
private void fetchEnvData(String csvData) throws BFInputDataException {
90-
try {
91-
CSVParser parser = CSVParser.parse(csvData, CSVFormat.RFC4180.withIgnoreSurroundingSpaces());
89+
CSVFormat csvFormat = CSVFormat.RFC4180.builder().setIgnoreSurroundingSpaces(true).setIgnoreEmptyLines(true).build();
90+
try (CSVParser parser = CSVParser.parse(csvData, csvFormat)) {
9291
records = parser.getRecords();
9392
} catch (IOException e) {
9493
throw new BFInputDataException("Unable to parse CSV data: " + csvData);
@@ -99,12 +98,17 @@ private void updateServicesMapBasedOn() {
9998
services.clear();
10099

101100
Iterator<CSVRecord> it = records.iterator();
102-
it.next(); // first row contains table headers, so skip it
101+
CSVRecord headers = it.next();
102+
int columns = headers.size();
103103
while (it.hasNext()) {
104104
CSVRecord record = it.next();
105105
String key = record.get(0);
106-
String value = record.get(envColumnNumber)
107-
.trim();
106+
String value = "";
107+
if (record.size() != columns) {
108+
BFLogger.logError("Invalid number of columns [" + record.size() + ", expected " + columns + "] in the environment file row.\n" + record);
109+
} else {
110+
value = record.get(envColumnNumber).trim();
111+
}
108112
value = optionalDecrypt(value);
109113
services.put(key, value);
110114
}
@@ -138,4 +142,4 @@ public void setDataEncryptionService(IDataEncryptionService dataEncryptionServic
138142
encryptionService = Optional.ofNullable(dataEncryptionService);
139143
updateServicesMapBasedOn();
140144
}
141-
}
145+
}

‎mrchecker-framework-modules/mrchecker-core-module/src/test/resources/log4j2.xml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,12 @@
2727
</Routes>
2828
</Routing>
2929
<Console name="MyConsole" target="SYSTEM_OUT" follow="true">
30-
<PatternLayout>
31-
<Pattern>%d{yyyy-MM-dd 'at' HH:mm:ss z} [%t] %BFLL - %m%n</Pattern>
30+
<PatternLayout disableAnsi="false">
31+
<!-- Old pattern without colors -->
32+
<!-- <Pattern>%d{yyyy-MM-dd 'at' HH:mm:ss z} [%t] %BFLL - %m%n</Pattern> -->
33+
<Pattern>%d{yyyy-MM-dd 'at' HH:mm:ss z} [%t] %highlight{%BFLL}{FATAL=red, ERROR=red, WARN=yellow,
34+
INFO=green, DEBUG=blue, TRACE=black} - %m%n
35+
</Pattern>
3236
</PatternLayout>
3337
</Console>
3438
<Async name="MyAsync">
@@ -46,4 +50,4 @@
4650
<appender-ref ref="MyConsole"/>
4751
</Logger>
4852
</Loggers>
49-
</Configuration>
53+
</Configuration>

‎mrchecker-framework-modules/mrchecker-database-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>2022.12.29</version>
9+
<version>2023.01.03</version>
1010
</parent>
1111

1212
<artifactId>mrchecker-database-module</artifactId>
13-
<version>2022.12.29</version>
13+
<version>2023.01.03</version>
1414
<packaging>jar</packaging>
1515
<name>MrChecker - Database - Module</name>
1616
<description>MrChecker Database Module:
@@ -80,7 +80,7 @@
8080
<dependency>
8181
<groupId>${project.groupId}</groupId>
8282
<artifactId>mrchecker-core-module</artifactId>
83-
<version>2022.12.29</version>
83+
<version>2023.01.03</version>
8484
</dependency>
8585

8686
<!-- JPA dependencies -->

‎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>2022.12.29</version>
10+
<version>2023.01.03</version>
1111
</parent>
1212

1313
<artifactId>mrchecker-mobile-module</artifactId>
14-
<version>2022.12.29</version>
14+
<version>2023.01.03</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>2022.12.29</version>
55+
<version>2023.01.03</version>
5656
</dependency>
5757
<dependency>
5858
<groupId>${project.groupId}</groupId>
5959
<artifactId>mrchecker-selenium-module</artifactId>
60-
<version>2022.12.29</version>
60+
<version>2023.01.03</version>
6161
</dependency>
6262

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

‎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>2022.12.29</version>
10+
<version>2023.01.03</version>
1111
</parent>
1212

1313
<artifactId>mrchecker-security-module</artifactId>
14-
<version>2022.12.29</version>
14+
<version>2023.01.03</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>2022.12.29</version>
66+
<version>2023.01.03</version>
6767
</dependency>
6868

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

‎mrchecker-framework-modules/mrchecker-selenium-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>2022.12.29</version>
10+
<version>2023.01.03</version>
1111
</parent>
1212

1313
<artifactId>mrchecker-selenium-module</artifactId>
14-
<version>2022.12.29</version>
14+
<version>2023.01.03</version>
1515
<packaging>jar</packaging>
1616
<name>MrChecker - Selenium - Module</name>
1717
<description>MrChecker Test Framework Selenium supports:
@@ -98,7 +98,7 @@
9898
<dependency>
9999
<groupId>${project.groupId}</groupId>
100100
<artifactId>mrchecker-core-module</artifactId>
101-
<version>2022.12.29</version>
101+
<version>2023.01.03</version>
102102
</dependency>
103103

104104
<!--This dependency is necessary for Selenium plugin. -->
@@ -128,4 +128,4 @@
128128
<!-- Plugins are taken from parent pom.xml -->
129129
</plugins>
130130
</build>
131-
</project>
131+
</project>

‎mrchecker-framework-modules/mrchecker-selenium-module/src/main/java/com/capgemini/mrchecker/selenium/core/newDrivers/DriverManager.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public static void closeDriver() {
121121
BFLogger.logDebug("Closing WebDriver for this thread. " + RuntimeParametersSelenium.BROWSER.getValue());
122122
driver.quit();
123123
} catch (WebDriverException e) {
124-
BFLogger.logDebug("Ooops! Something went wrong while closing the driver: ");
124+
BFLogger.logError("Ooops! Something went wrong while closing the driver: ");
125125
e.printStackTrace();
126126
} finally {
127127
DRIVERS.remove();
@@ -176,7 +176,7 @@ private static <T extends RemoteWebDriver> void downloadNewestOrGivenVersionOfWe
176176
BFLogger.logDebug("Downloaded version of driver=" + WebDriverManager.getInstance(webDriverType).getDownloadedDriverVersion());
177177

178178
} catch (WebDriverManagerException e) {
179-
BFLogger.logInfo("Unable to download driver automatically. "
179+
BFLogger.logError("Unable to download driver automatically. "
180180
+ "Please try to set up the proxy in properties file. "
181181
+ "If you want to download them manually, go to the "
182182
+ "http://www.seleniumhq.org/projects/webdriver/ site.");
@@ -190,7 +190,7 @@ public static ChromeOptions getChromeOptions() {
190190
chromePrefs.put("profile.default_content_setting_values.notifications", 2);
191191

192192
RuntimeParametersSelenium.BROWSER_OPTIONS.getValues().forEach((key, value) -> {
193-
BFLogger.logInfo("Add to Chrome prefs: " + key + " = " + value.toString());
193+
BFLogger.logDebug("Add to Chrome prefs: " + key + " = " + value.toString());
194194
chromePrefs.put(key, value.toString());
195195
});
196196

@@ -209,7 +209,7 @@ public static ChromeOptions getChromeOptions() {
209209
options.setHeadless(Boolean.parseBoolean(System.getProperty("headless", "false")));
210210

211211
RuntimeParametersSelenium.BROWSER_OPTIONS.getValues().forEach((key, value) -> {
212-
BFLogger.logInfo("Add to Chrome options: " + key + " = " + value.toString());
212+
BFLogger.logDebug("Add to Chrome options: " + key + " = " + value.toString());
213213
String item = (value.toString().isEmpty()) ? key : key + "=" + value;
214214
options.addArguments(item);
215215
options.setCapability(key, value.toString());
@@ -225,7 +225,7 @@ public static EdgeOptions getEdgeOptions() {
225225
edgePrefs.put("profile.default_content_setting_values.notifications", 2);
226226

227227
RuntimeParametersSelenium.BROWSER_OPTIONS.getValues().forEach((key, value) -> {
228-
BFLogger.logInfo("Add to Edge prefs: " + key + " = " + value.toString());
228+
BFLogger.logDebug("Add to Edge prefs: " + key + " = " + value.toString());
229229
edgePrefs.put(key, value.toString());
230230
});
231231

@@ -244,7 +244,7 @@ public static EdgeOptions getEdgeOptions() {
244244
options.setHeadless(Boolean.parseBoolean(System.getProperty("headless", "false")));
245245

246246
RuntimeParametersSelenium.BROWSER_OPTIONS.getValues().forEach((key, value) -> {
247-
BFLogger.logInfo("Add to Edge options: " + key + " = " + value.toString());
247+
BFLogger.logDebug("Add to Edge options: " + key + " = " + value.toString());
248248
String item = (value.toString().isEmpty()) ? key : key + "=" + value;
249249
options.addArguments(item);
250250
options.setCapability(key, value.toString());
@@ -277,7 +277,7 @@ public static FirefoxOptions getFirefoxOptions() {
277277
profile.setPreference("network.http.use-cache", false);
278278

279279
RuntimeParametersSelenium.BROWSER_OPTIONS.getValues().forEach((key, value) -> {
280-
BFLogger.logInfo("Add to Firefox profile: " + key + " = " + value.toString());
280+
BFLogger.logDebug("Add to Firefox profile: " + key + " = " + value.toString());
281281
profile.setPreference(key, value.toString());
282282
});
283283

@@ -294,7 +294,7 @@ public static FirefoxOptions getFirefoxOptions() {
294294
options.setHeadless(Boolean.parseBoolean(System.getProperty("headless", "false")));
295295

296296
RuntimeParametersSelenium.BROWSER_OPTIONS.getValues().forEach((key, value) -> {
297-
BFLogger.logInfo("Add to Firefox options: " + key + " = " + value.toString());
297+
BFLogger.logDebug("Add to Firefox options: " + key + " = " + value.toString());
298298
String item = (value.toString().isEmpty()) ? key : key + "=" + value;
299299
options.addArguments(item);
300300
options.setCapability(key, value.toString());
@@ -311,7 +311,7 @@ public static InternetExplorerOptions getInternetExplorerOptions() {
311311
options.setCapability("acceptSslCerts", true);
312312

313313
RuntimeParametersSelenium.BROWSER_OPTIONS.getValues().forEach((key, value) -> {
314-
BFLogger.logInfo("Add to Internet Explorer options: " + key + " = " + value.toString());
314+
BFLogger.logDebug("Add to Internet Explorer options: " + key + " = " + value.toString());
315315
options.setCapability(key, value.toString());
316316
});
317317

@@ -475,7 +475,7 @@ private static INewWebDriver getRemoteDriver(MutableCapabilities options) {
475475
}
476476

477477
RuntimeParametersSelenium.BROWSER_OPTIONS.getValues().forEach((key, value) -> {
478-
BFLogger.logInfo("Browser option: " + key + " " + value.toString());
478+
BFLogger.logDebug("Browser option: " + key + " " + value.toString());
479479
capabilities.setCapability(key, value.toString());
480480
});
481481

‎mrchecker-framework-modules/mrchecker-webapi-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>2022.12.29</version>
10+
<version>2023.01.03</version>
1111
</parent>
1212

1313
<artifactId>mrchecker-webapi-module</artifactId>
14-
<version>2022.12.29</version>
14+
<version>2023.01.03</version>
1515
<packaging>jar</packaging>
1616
<name>MrChecker - WebApi - Module</name>
1717
<description>
@@ -80,7 +80,7 @@
8080
<dependency>
8181
<groupId>${project.groupId}</groupId>
8282
<artifactId>mrchecker-core-module</artifactId>
83-
<version>2022.12.29</version>
83+
<version>2023.01.03</version>
8484
</dependency>
8585

8686
<!-- Dependency to REST and SOAP lib -->

‎mrchecker-framework-modules/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.capgemini.mrchecker</groupId>
77
<artifactId>mrchecker-test-framework</artifactId>
8-
<version>2022.12.29</version>
8+
<version>2023.01.03</version>
99
<name>MrChecker</name>
1010
<description>MrChecker Test Framework is an automated testing framework for functional testing of web applications,
1111
native mobile apps, webservices and database.
@@ -729,4 +729,4 @@
729729
</plugins>
730730
</reporting>
731731

732-
</project>
732+
</project>

0 commit comments

Comments
 (0)