Skip to content

Commit acf2667

Browse files
committed
Update version 1.5.0
1 parent 80d9ba5 commit acf2667

File tree

25 files changed

+597
-649
lines changed

25 files changed

+597
-649
lines changed

README.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
## **SYSTEM REQUIREMENTS**
1919

20-
- **JDK 11, 15, 16** (not run with 8, 17, 18)
20+
- **JDK All Version**
2121
- Chrome Browser, Edge Browser
2222
- Setup **Allure**:
2323
https://mvnrepository.com/artifact/io.qameta.allure/allure-java-commons
@@ -103,8 +103,7 @@
103103

104104
**8. Read data test from Excel file**
105105

106-
- Create function with annotaion **DataSupplier** on **_src/main/java/anhtester/com/utils/DataProviderUtils.java_**
107-
- Call the name of **DataSupplier** above in the test cases as DataProvider of TestNG
106+
- Create function with annotaion **DataProvider** on **src/test/java/anhtester/com/projects/website/crm/dataprovider/DataProviderManager.java**
108107
- Read excel with Map and Hashtable
109108

110109
**9. Base function in the package**
@@ -149,8 +148,6 @@
149148
┃ ┃ ┃ ┃ ┃ ┃ ┗ 📜Configuration.java
150149
┃ ┃ ┃ ┃ ┃ ┣ 📂constants
151150
┃ ┃ ┃ ┃ ┃ ┃ ┗ 📜FrameworkConstants.java
152-
┃ ┃ ┃ ┃ ┃ ┣ 📂data
153-
┃ ┃ ┃ ┃ ┃ ┃ ┗ 📜DataProviderManager.java
154151
┃ ┃ ┃ ┃ ┃ ┣ 📂driver
155152
┃ ┃ ┃ ┃ ┃ ┃ ┣ 📜BrowserFactory.java
156153
┃ ┃ ┃ ┃ ┃ ┃ ┣ 📜DriverManager.java
@@ -181,9 +178,6 @@
181178
┃ ┃ ┃ ┃ ┃ ┣ 📂mail
182179
┃ ┃ ┃ ┃ ┃ ┃ ┣ 📜EmailAttachmentsSender.java
183180
┃ ┃ ┃ ┃ ┃ ┃ ┗ 📜EmailConfig.java
184-
┃ ┃ ┃ ┃ ┃ ┣ 📂models
185-
┃ ┃ ┃ ┃ ┃ ┃ ┣ 📜Client.java
186-
┃ ┃ ┃ ┃ ┃ ┃ ┗ 📜SignIn.java
187181
┃ ┃ ┃ ┃ ┃ ┣ 📂report
188182
┃ ┃ ┃ ┃ ┃ ┃ ┣ 📜AllureManager.java
189183
┃ ┃ ┃ ┃ ┃ ┃ ┣ 📜ExtentReportManager.java
@@ -218,6 +212,11 @@
218212
┃ ┃ ┃ ┃ ┃ ┗ 📂projects
219213
┃ ┃ ┃ ┃ ┃ ┃ ┗ 📂website
220214
┃ ┃ ┃ ┃ ┃ ┃ ┃ ┗ 📂crm
215+
┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┣ 📂dataprovider
216+
┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┗ 📜DataProviderManager.java
217+
┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┣ 📂models
218+
┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┣ 📜ClientModel.java
219+
┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┗ 📜SignInModel.java
221220
┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┣ 📂pages
222221
┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┣ 📂Clients
223222
┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┗ 📜ClientPage.java

pom.xml

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

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

1313
<properties>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1515
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
16-
<java-compiler.version>11</java-compiler.version>
16+
<java-compiler.version>8</java-compiler.version>
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.1.4</selenium.version>
21-
<testng.version>7.5</testng.version>
22-
<webdrivermanager.version>5.1.1</webdrivermanager.version>
20+
<selenium.version>4.2.1</selenium.version>
21+
<testng.version>7.4.0</testng.version>
22+
<webdrivermanager.version>5.2.0</webdrivermanager.version>
2323
<aspectjweaver.version>1.9.9.1</aspectjweaver.version>
2424
<ashot.version>1.5.4</ashot.version>
2525
<log4j.version>2.17.2</log4j.version>
@@ -81,14 +81,6 @@
8181
<version>${jackson.version}</version>
8282
</dependency>
8383

84-
85-
<!-- https://mvnrepository.com/artifact/io.github.sskorol/test-data-supplier -->
86-
<dependency>
87-
<groupId>io.github.sskorol</groupId>
88-
<artifactId>test-data-supplier</artifactId>
89-
<version>${data.supplier.version}</version>
90-
</dependency>
91-
9284
<!--https://mvnrepository.com/artifact/com.sun.mail/javax.mail/ -->
9385
<dependency>
9486
<groupId>com.sun.mail</groupId>
@@ -301,7 +293,7 @@
301293
<argLine>
302294
-javaagent:"${settings.localRepository}/org/aspectj/aspectjweaver/${aspectjweaver.version}/aspectjweaver-${aspectjweaver.version}.jar"
303295
</argLine>
304-
<testFailureIgnore>false</testFailureIgnore>
296+
<testFailureIgnore>true</testFailureIgnore>
305297
<systemPropertyVariables>
306298
<allure.results.directory>target/allure-results</allure.results.directory>
307299
</systemPropertyVariables>

src/main/java/anhtester/com/constants/FrameworkConstants.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ private FrameworkConstants() {
1818

1919
public static final String PROJECT_PATH = Helpers.getCurrentDir();
2020
public static final String EXCEL_DATA_PATH = PropertiesHelpers.getValue("excelDataFilePath");
21-
public static final String EXCEL_DATA_PATH_FULL = PropertiesHelpers.getValue("excelDataFilePathFull");
2221
public static final String JSON_CONFIG_FILE_PATH = Helpers.getCurrentDir() + "src/test/resources/config/config.json";
2322

2423
public static final String BROWSER = PropertiesHelpers.getValue("browser");

src/main/java/anhtester/com/data/DataProviderManager.java

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

0 commit comments

Comments
 (0)