Skip to content

Commit

Permalink
Update version 1.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
vothaian committed Jun 2, 2022
1 parent 80d9ba5 commit acf2667
Show file tree
Hide file tree
Showing 25 changed files with 597 additions and 649 deletions.
15 changes: 7 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

## **SYSTEM REQUIREMENTS**

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

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

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

**9. Base function in the package**
Expand Down Expand Up @@ -149,8 +148,6 @@
┃ ┃ ┃ ┃ ┃ ┃ ┗ 📜Configuration.java
┃ ┃ ┃ ┃ ┃ ┣ 📂constants
┃ ┃ ┃ ┃ ┃ ┃ ┗ 📜FrameworkConstants.java
┃ ┃ ┃ ┃ ┃ ┣ 📂data
┃ ┃ ┃ ┃ ┃ ┃ ┗ 📜DataProviderManager.java
┃ ┃ ┃ ┃ ┃ ┣ 📂driver
┃ ┃ ┃ ┃ ┃ ┃ ┣ 📜BrowserFactory.java
┃ ┃ ┃ ┃ ┃ ┃ ┣ 📜DriverManager.java
Expand Down Expand Up @@ -181,9 +178,6 @@
┃ ┃ ┃ ┃ ┃ ┣ 📂mail
┃ ┃ ┃ ┃ ┃ ┃ ┣ 📜EmailAttachmentsSender.java
┃ ┃ ┃ ┃ ┃ ┃ ┗ 📜EmailConfig.java
┃ ┃ ┃ ┃ ┃ ┣ 📂models
┃ ┃ ┃ ┃ ┃ ┃ ┣ 📜Client.java
┃ ┃ ┃ ┃ ┃ ┃ ┗ 📜SignIn.java
┃ ┃ ┃ ┃ ┃ ┣ 📂report
┃ ┃ ┃ ┃ ┃ ┃ ┣ 📜AllureManager.java
┃ ┃ ┃ ┃ ┃ ┃ ┣ 📜ExtentReportManager.java
Expand Down Expand Up @@ -218,6 +212,11 @@
┃ ┃ ┃ ┃ ┃ ┗ 📂projects
┃ ┃ ┃ ┃ ┃ ┃ ┗ 📂website
┃ ┃ ┃ ┃ ┃ ┃ ┃ ┗ 📂crm
┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┣ 📂dataprovider
┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┗ 📜DataProviderManager.java
┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┣ 📂models
┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┣ 📜ClientModel.java
┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┗ 📜SignInModel.java
┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┣ 📂pages
┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┣ 📂Clients
┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┗ 📜ClientPage.java
Expand Down
20 changes: 6 additions & 14 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@

<groupId>anhtester.com</groupId>
<artifactId>AutomationFrameworkSelenium</artifactId>
<version>1.4</version>
<version>1.5.0</version>
<name>AutomationFrameworkSelenium</name>
<url>https://github.com/anhtester/AutomationFrameworkSelenium</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java-compiler.version>11</java-compiler.version>
<java-compiler.version>8</java-compiler.version>
<maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>

<selenium.version>4.1.4</selenium.version>
<testng.version>7.5</testng.version>
<webdrivermanager.version>5.1.1</webdrivermanager.version>
<selenium.version>4.2.1</selenium.version>
<testng.version>7.4.0</testng.version>
<webdrivermanager.version>5.2.0</webdrivermanager.version>
<aspectjweaver.version>1.9.9.1</aspectjweaver.version>
<ashot.version>1.5.4</ashot.version>
<log4j.version>2.17.2</log4j.version>
Expand Down Expand Up @@ -81,14 +81,6 @@
<version>${jackson.version}</version>
</dependency>


<!-- https://mvnrepository.com/artifact/io.github.sskorol/test-data-supplier -->
<dependency>
<groupId>io.github.sskorol</groupId>
<artifactId>test-data-supplier</artifactId>
<version>${data.supplier.version}</version>
</dependency>

<!--https://mvnrepository.com/artifact/com.sun.mail/javax.mail/ -->
<dependency>
<groupId>com.sun.mail</groupId>
Expand Down Expand Up @@ -301,7 +293,7 @@
<argLine>
-javaagent:"${settings.localRepository}/org/aspectj/aspectjweaver/${aspectjweaver.version}/aspectjweaver-${aspectjweaver.version}.jar"
</argLine>
<testFailureIgnore>false</testFailureIgnore>
<testFailureIgnore>true</testFailureIgnore>
<systemPropertyVariables>
<allure.results.directory>target/allure-results</allure.results.directory>
</systemPropertyVariables>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ private FrameworkConstants() {

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

public static final String BROWSER = PropertiesHelpers.getValue("browser");
Expand Down
101 changes: 0 additions & 101 deletions src/main/java/anhtester/com/data/DataProviderManager.java

This file was deleted.

Loading

0 comments on commit acf2667

Please sign in to comment.