Skip to content

Commit 930d712

Browse files
vothaianvothaian
committed
Update version 1.6.0 PREVIEW
1 parent ddb256e commit 930d712

19 files changed

Lines changed: 742 additions & 395 deletions

File tree

‎pom.xml‎

Lines changed: 42 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>anhtester.com</groupId>
88
<artifactId>AutomationFrameworkSelenium</artifactId>
9-
<version>1.5.1</version>
9+
<version>1.6.0</version>
1010
<name>AutomationFrameworkSelenium</name>
1111
<url>https://github.com/anhtester/AutomationFrameworkSelenium</url>
1212

@@ -17,12 +17,12 @@
1717
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
1818
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
1919

20-
<selenium.version>4.2.2</selenium.version>
21-
<testng.version>7.4.0</testng.version>
22-
<webdrivermanager.version>5.2.0</webdrivermanager.version>
20+
<selenium.version>4.3.0</selenium.version>
21+
<testng.version>7.6.1</testng.version>
22+
<webdrivermanager.version>5.2.1</webdrivermanager.version>
2323
<aspectjweaver.version>1.9.9.1</aspectjweaver.version>
2424
<ashot.version>1.5.4</ashot.version>
25-
<log4j.version>2.17.2</log4j.version>
25+
<log4j.version>2.18.0</log4j.version>
2626
<allure-testng.version>2.18.1</allure-testng.version>
2727
<allure-maven.version>2.10.0</allure-maven.version>
2828
<allure-environment-writer.version>1.0.0</allure-environment-writer.version>
@@ -48,6 +48,10 @@
4848
<suite.signin.simple>src/test/resources/suites/SignIn-simple.xml</suite.signin.simple>
4949
<suite.client.parallel>src/test/resources/suites/Clients-parallel.xml</suite.client.parallel>
5050
<suite.client.simple>src/test/resources/suites/Clients-simple.xml</suite.client.simple>
51+
52+
<maven.test.skip>false</maven.test.skip>
53+
<maven.test.failure.ignore>true</maven.test.failure.ignore>
54+
5155
</properties>
5256

5357
<dependencies>
@@ -275,6 +279,38 @@
275279
<suiteXmlFiles>
276280
<suiteXmlFile>${suite.client.parallel}</suiteXmlFile>
277281
</suiteXmlFiles>
282+
<argLine>
283+
-javaagent:"${settings.localRepository}/org/aspectj/aspectjweaver/${aspectjweaver.version}/aspectjweaver-${aspectjweaver.version}.jar"
284+
</argLine>
285+
<testFailureIgnore>true</testFailureIgnore>
286+
<systemPropertyVariables>
287+
<allure.results.directory>target/allure-results</allure.results.directory>
288+
</systemPropertyVariables>
289+
</configuration>
290+
</plugin>
291+
</plugins>
292+
</build>
293+
</profile>
294+
295+
<profile>
296+
<id>clients-simple</id>
297+
<build>
298+
<plugins>
299+
<plugin>
300+
<groupId>org.apache.maven.plugins</groupId>
301+
<artifactId>maven-surefire-plugin</artifactId>
302+
<version>${maven-surefire-plugin.version}</version>
303+
<configuration>
304+
<suiteXmlFiles>
305+
<suiteXmlFile>${suite.client.simple}</suiteXmlFile>
306+
</suiteXmlFiles>
307+
<argLine>
308+
-javaagent:"${settings.localRepository}/org/aspectj/aspectjweaver/${aspectjweaver.version}/aspectjweaver-${aspectjweaver.version}.jar"
309+
</argLine>
310+
<testFailureIgnore>true</testFailureIgnore>
311+
<systemPropertyVariables>
312+
<allure.results.directory>target/allure-results</allure.results.directory>
313+
</systemPropertyVariables>
278314
</configuration>
279315
</plugin>
280316
</plugins>
@@ -285,6 +321,7 @@
285321
<build>
286322
<pluginManagement>
287323
<plugins>
324+
288325
<plugin>
289326
<groupId>org.apache.maven.plugins</groupId>
290327
<artifactId>maven-surefire-plugin</artifactId>
@@ -293,7 +330,6 @@
293330
<suiteXmlFiles>
294331
<!-- Call Suite name global set up above -->
295332
<suiteXmlFile>${suite.client.simple}</suiteXmlFile>
296-
<!--<suiteXmlFile>${suite.client.parallel}</suiteXmlFile>-->
297333
</suiteXmlFiles>
298334

299335
<argLine>

‎src/main/java/anhtester/com/helpers/CaptureHelpers.java‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
import anhtester.com.constants.FrameworkConstants;
99
import anhtester.com.utils.Log;
1010
import org.apache.commons.io.FileUtils;
11+
import org.monte.media.Format;
12+
import org.monte.media.FormatKeys.MediaType;
13+
import org.monte.media.Registry;
14+
import org.monte.media.math.Rational;
15+
import org.monte.screenrecorder.ScreenRecorder;
1116
import org.openqa.selenium.OutputType;
1217
import org.openqa.selenium.TakesScreenshot;
1318
import org.openqa.selenium.WebDriver;
@@ -18,13 +23,12 @@
1823
import java.text.SimpleDateFormat;
1924
import java.util.Date;
2025

21-
import org.monte.media.Format;
22-
import org.monte.media.FormatKeys.MediaType;
23-
import org.monte.media.Registry;
24-
import org.monte.media.math.Rational;
25-
import org.monte.screenrecorder.ScreenRecorder;
26-
27-
import static org.monte.media.AudioFormatKeys.*;
26+
import static org.monte.media.AudioFormatKeys.EncodingKey;
27+
import static org.monte.media.AudioFormatKeys.FrameRateKey;
28+
import static org.monte.media.AudioFormatKeys.KeyFrameIntervalKey;
29+
import static org.monte.media.AudioFormatKeys.MediaTypeKey;
30+
import static org.monte.media.AudioFormatKeys.MimeTypeKey;
31+
import static org.monte.media.VideoFormatKeys.MIME_AVI;
2832
import static org.monte.media.VideoFormatKeys.*;
2933

3034
public class CaptureHelpers extends ScreenRecorder {

‎src/main/java/anhtester/com/report/AllureManager.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import com.github.automatedowl.tools.AllureEnvironmentWriter;
1313
import com.google.common.collect.ImmutableMap;
1414
import io.qameta.allure.Attachment;
15+
import io.qameta.allure.model.Status;
1516
import org.openqa.selenium.TakesScreenshot;
1617

1718
import static org.openqa.selenium.OutputType.BYTES;
@@ -59,6 +60,7 @@ public static String addBrowserInformationOnAllureReport() {
5960
return BrowserInfoUtils.getOSInfo();
6061
}
6162

63+
6264
//Text attachments for Allure
6365
@Attachment(value = "{0}", type = "text/plain")
6466
public static String saveTextLog(String message) {

‎src/main/java/anhtester/com/report/ExtentReportManager.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,4 +161,8 @@ public static void info(String message) {
161161
ExtentTestManager.getExtentTest().info(message);
162162
}
163163

164+
public static void warning(String message) {
165+
ExtentTestManager.getExtentTest().log(Status.WARNING, message);
166+
}
167+
164168
}

‎src/main/java/anhtester/com/utils/Log.java‎

Lines changed: 35 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,54 +10,62 @@
1010

1111
public class Log {
1212
//Initialize Log4j2 instance
13-
private static final Logger Log = LogManager.getLogger(Log.class);
13+
private static final Logger LOGGER = LogManager.getLogger(Log.class);
1414

1515
//Info Level Logs
16-
public static void info (String message) {
17-
Log.info(message);
16+
public static void info(String message) {
17+
LOGGER.info(message);
1818
}
19-
public static void info (Object message) {
20-
Log.info(message);
19+
20+
public static void info(Object message) {
21+
LOGGER.info(message);
2122
}
22-
public static void info (String message, Throwable throwable) {
23-
Log.info(message);
23+
24+
public static void info(String message, Throwable throwable) {
25+
LOGGER.info(message);
2426
}
2527

2628
//Warn Level Logs
27-
public static void warn (String message) {
28-
Log.warn(message);
29+
public static void warn(String message) {
30+
LOGGER.warn(message);
2931
}
30-
public static void warn (Object message) {
31-
Log.warn(message);
32+
33+
public static void warn(Object message) {
34+
LOGGER.warn(message);
3235
}
3336

3437
//Error Level Logs
35-
public static void error (String message) {
36-
Log.error(message);
38+
public static void error(String message) {
39+
LOGGER.error(message);
3740
}
38-
public static void error (String message, Throwable throwable) {
39-
Log.error(message);
41+
42+
public static void error(String message, Throwable throwable) {
43+
LOGGER.error(message);
4044
}
41-
public static void error (Object message) {
42-
Log.error(message);
45+
46+
public static void error(Object message) {
47+
LOGGER.error(message);
4348
}
44-
public static void error (Object message, Throwable throwable) {
45-
Log.error(message);
49+
50+
public static void error(Object message, Throwable throwable) {
51+
LOGGER.error(message);
4652
}
4753

4854
//Fatal Level Logs
49-
public static void fatal (String message) {
50-
Log.fatal(message);
55+
public static void fatal(String message) {
56+
LOGGER.fatal(message);
5157
}
52-
public static void fatal (Object message) {
53-
Log.fatal(message);
58+
59+
public static void fatal(Object message) {
60+
LOGGER.fatal(message);
5461
}
5562

5663
//Debug Level Logs
57-
public static void debug (String message) {
58-
Log.debug(message);
64+
public static void debug(String message) {
65+
LOGGER.debug(message);
5966
}
60-
public static void debug (Object message) {
61-
Log.debug(message);
67+
68+
public static void debug(Object message) {
69+
LOGGER.debug(message);
6270
}
6371
}

‎src/main/java/anhtester/com/utils/ObjectUtils.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ public static By getObject(String elementName) {
2525
}
2626

2727
// extract the locator type and value from the object
28-
String locatorType = locator.split(":")[0];
29-
String locatorValue = locator.split(":")[1];
28+
String locatorType = locator.split("&&")[0];
29+
String locatorValue = locator.split("&&")[1];
3030

3131
Log.info("Retrieving object of type '" + locatorType + "' and locator '" + locatorValue + "' from the object repository");
3232

0 commit comments

Comments
 (0)