Update version 2.4.5 (optimize)

anhtester · Sep 6, 2024 · 2fc95c1 · 2fc95c1
1 parent 926ff9d
commit 2fc95c1
Show file tree

Hide file tree

Showing 17 changed files with 339 additions and 402 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,9 @@
+v2.4.5
+======
+Sep 07, 2024
+* Optimize method in WebUI keyword
+* Remove handle QR Code (google.zxing)
+
 v2.4.4
 ======
 Sep 05, 2024

diff --git a/docs/com/anhtester/helpers/Helpers.html b/docs/com/anhtester/helpers/Helpers.html
@@ -73,7 +73,7 @@
 <h1 title="Class Helpers" class="title">Class Helpers</h1>
 </div>
 <div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
-<div class="inheritance">com.anhtester.helpers.Helpers</div>
+<div class="inheritance">com.anhtester.helpers.SystemHelpers</div>
 </div>
 <section class="class-description" id="class-description">
 <hr>

diff --git a/docs/com/anhtester/helpers/class-use/Helpers.html b/docs/com/anhtester/helpers/class-use/Helpers.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (17) on Wed May 22 19:39:35 ICT 2024 -->
-<title>Uses of Class com.anhtester.helpers.Helpers</title>
+<title>Uses of Class com.anhtester.helpers.SystemHelpers</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=utf8">
 <meta name="dc.created" content="2024-05-22">
@@ -49,9 +49,9 @@
 <div class="flex-content">
 <main role="main">
 <div class="header">
-<h1 title="Uses of Class com.anhtester.helpers.Helpers" class="title">Uses of Class<br>com.anhtester.helpers.Helpers</h1>
+<h1 title="Uses of Class com.anhtester.helpers.SystemHelpers" class="title">Uses of Class<br>com.anhtester.helpers.SystemHelpers</h1>
 </div>
-No usage of com.anhtester.helpers.Helpers</main>
+No usage of com.anhtester.helpers.SystemHelpers</main>
 </div>
 </div>
 </body>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.anhtester</groupId>
     <artifactId>anhtester-selenium-java</artifactId>
-    <version>2.4.4</version>
+    <version>2.4.5</version>
     <name>AutomationFrameworkSelenium</name>
     <url>https://github.com/anhtester/AutomationFrameworkSelenium</url>
     <description>Test Automation Framework Selenium Java with TestNG building by Anh Tester</description>
@@ -31,7 +31,7 @@
         <aspectjweaver.version>1.9.22.1</aspectjweaver.version>
         <ashot.version>1.5.4</ashot.version>
         <log4j.version>2.23.1</log4j.version>
-        <slf4j.version>2.0.13</slf4j.version>
+        <slf4j.version>2.0.16</slf4j.version>
         <allure-testng.version>2.29.0</allure-testng.version>
         <allure-plugin-api.version>2.30.0</allure-plugin-api.version>
         <allure-maven.version>2.13.0</allure-maven.version>
@@ -47,7 +47,6 @@
         <datafaker.version>2.3.1</datafaker.version>
         <monte-screen-recorder.version>0.7.7.0</monte-screen-recorder.version>
         <mysql-connector-java.version>8.0.33</mysql-connector-java.version>
-        <google.zxing.version>3.5.3</google.zxing.version>
         <lombok.version>1.18.34</lombok.version>
         <google.guava.version>33.3.0-jre</google.guava.version>
         <javax.mail.version>1.6.2</javax.mail.version>
@@ -283,19 +282,6 @@
             <version>${mysql-connector-java.version}</version>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/com.google.zxing/javase -->
-        <dependency>
-            <groupId>com.google.zxing</groupId>
-            <artifactId>javase</artifactId>
-            <version>${google.zxing.version}</version>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/com.google.zxing/core -->
-        <dependency>
-            <groupId>com.google.zxing</groupId>
-            <artifactId>core</artifactId>
-            <version>${google.zxing.version}</version>
-        </dependency>
-
         <!-- https://mvnrepository.com/artifact/org.aspectj/aspectjweaver -->
         <dependency>
             <groupId>org.aspectj</groupId>

diff --git a/src/main/java/com/anhtester/constants/FrameworkConstants.java b/src/main/java/com/anhtester/constants/FrameworkConstants.java
@@ -5,7 +5,7 @@
 
 package com.anhtester.constants;
 
-import com.anhtester.helpers.Helpers;
+import com.anhtester.helpers.SystemHelpers;
 import com.anhtester.helpers.PropertiesHelpers;
 import com.anhtester.utils.ReportUtils;
 
@@ -20,7 +20,7 @@ private FrameworkConstants() {
         PropertiesHelpers.loadAllFiles();
     }
 
-    public static final String PROJECT_PATH = Helpers.getCurrentDir();
+    public static final String PROJECT_PATH = SystemHelpers.getCurrentDir();
     public static final String EXCEL_DATA_FILE_PATH = PropertiesHelpers.getValue("EXCEL_DATA_FILE_PATH");
     public static final String JSON_DATA_FILE_PATH = PropertiesHelpers.getValue("JSON_DATA_FILE_PATH");
     public static final String EXCEL_CMS_LOGIN = PropertiesHelpers.getValue("EXCEL_CMS_LOGIN");

diff --git a/src/main/java/com/anhtester/helpers/CaptureHelpers.java b/src/main/java/com/anhtester/helpers/CaptureHelpers.java
@@ -92,7 +92,7 @@ public static void stopRecord() {
 
     public static void captureScreenshot(WebDriver driver, String screenName) {
         try {
-            String path = Helpers.getCurrentDir() + FrameworkConstants.EXPORT_CAPTURE_PATH;
+            String path = SystemHelpers.getCurrentDir() + FrameworkConstants.EXPORT_CAPTURE_PATH;
             File file = new File(path);
             if (!file.exists()) {
                 LogUtils.info("No Folder: " + path);
@@ -124,7 +124,7 @@ public static File getScreenshotFile(String screenshotName) {
             throw new RuntimeException(e);
         }
 
-        String path = Helpers.getCurrentDir() + FrameworkConstants.EXTENT_REPORT_FOLDER + File.separator + "images";
+        String path = SystemHelpers.getCurrentDir() + FrameworkConstants.EXTENT_REPORT_FOLDER + File.separator + "images";
         File folder = new File(path);
         if (!folder.exists()) {
             folder.mkdir();
@@ -151,7 +151,7 @@ public static String getScreenshotRelativePath(String screenshotName) {
             throw new RuntimeException(e);
         }
 
-        String path = Helpers.getCurrentDir() + FrameworkConstants.EXTENT_REPORT_FOLDER + File.separator + "images";
+        String path = SystemHelpers.getCurrentDir() + FrameworkConstants.EXTENT_REPORT_FOLDER + File.separator + "images";
 
         File folder = new File(path);
         if (!folder.exists()) {
@@ -182,7 +182,7 @@ public static String getScreenshotAbsolutePath(String screenshotName) {
             throw new RuntimeException(e);
         }
 
-        String path = Helpers.getCurrentDir() + FrameworkConstants.EXTENT_REPORT_FOLDER + File.separator + "images";
+        String path = SystemHelpers.getCurrentDir() + FrameworkConstants.EXTENT_REPORT_FOLDER + File.separator + "images";
 
         File folder = new File(path);
         if (!folder.exists()) {

diff --git a/src/main/java/com/anhtester/helpers/JsonHelpers.java b/src/main/java/com/anhtester/helpers/JsonHelpers.java
@@ -14,11 +14,11 @@ public class JsonHelpers {
     private StringBuffer stringBuffer;
     private DocumentContext jsonContext;
     private String lines;
-    private String jsonFilePathDefault = Helpers.getCurrentDir() + "src/test/resources/datajson/store.json";
+    private String jsonFilePathDefault = SystemHelpers.getCurrentDir() + "src/test/resources/datajson/store.json";
 
     public void setJsonFile(String jsonPath) {
         try {
-            bufferedReader = new BufferedReader(new FileReader(Helpers.getCurrentDir() + jsonPath));
+            bufferedReader = new BufferedReader(new FileReader(SystemHelpers.getCurrentDir() + jsonPath));
             stringBuffer = new StringBuffer();
             while ((lines = bufferedReader.readLine()) != null) {
                 stringBuffer.append(lines);

diff --git a/src/main/java/com/anhtester/helpers/PropertiesHelpers.java b/src/main/java/com/anhtester/helpers/PropertiesHelpers.java
@@ -34,7 +34,7 @@ public static Properties loadAllFiles() {
 
             for (String f : files) {
                 Properties tempProp = new Properties();
-                linkFile = Helpers.getCurrentDir() + f;
+                linkFile = SystemHelpers.getCurrentDir() + f;
                 file = new FileInputStream(linkFile);
                 tempProp.load(file);
                 properties.putAll(tempProp);
@@ -56,7 +56,7 @@ public static Properties getProperties() {
     public static void setFile(String relPropertiesFilePath) {
         properties = new Properties();
         try {
-            linkFile = Helpers.getCurrentDir() + relPropertiesFilePath;
+            linkFile = SystemHelpers.getCurrentDir() + relPropertiesFilePath;
             file = new FileInputStream(linkFile);
             properties.load(file);
             file.close();
@@ -68,7 +68,7 @@ public static void setFile(String relPropertiesFilePath) {
     public static void setDefaultFile() {
         properties = new Properties();
         try {
-            linkFile = Helpers.getCurrentDir() + relPropertiesFilePathDefault;
+            linkFile = SystemHelpers.getCurrentDir() + relPropertiesFilePathDefault;
             file = new FileInputStream(linkFile);
             properties.load(file);
             file.close();
@@ -82,7 +82,7 @@ public static String getValue(String key) {
         try {
             if (file == null && properties == null) {
                 properties = new Properties();
-                linkFile = Helpers.getCurrentDir() + relPropertiesFilePathDefault;
+                linkFile = SystemHelpers.getCurrentDir() + relPropertiesFilePathDefault;
                 file = new FileInputStream(linkFile);
                 properties.load(file);
                 file.close();
@@ -101,10 +101,10 @@ public static void setValue(String key, String keyValue) {
         try {
             if (file == null) {
                 properties = new Properties();
-                file = new FileInputStream(Helpers.getCurrentDir() + relPropertiesFilePathDefault);
+                file = new FileInputStream(SystemHelpers.getCurrentDir() + relPropertiesFilePathDefault);
                 properties.load(file);
                 file.close();
-                out = new FileOutputStream(Helpers.getCurrentDir() + relPropertiesFilePathDefault);
+                out = new FileOutputStream(SystemHelpers.getCurrentDir() + relPropertiesFilePathDefault);
             }
             //Write to the same Prop file as the extracted file
             out = new FileOutputStream(linkFile);

diff --git a/...n/java/com/anhtester/helpers/Helpers.java → .../com/anhtester/helpers/SystemHelpers.java b/...n/java/com/anhtester/helpers/Helpers.java → .../com/anhtester/helpers/SystemHelpers.java
@@ -12,9 +12,9 @@
 import java.util.Locale;
 import java.util.regex.Pattern;
 
-public final class Helpers {
+public final class SystemHelpers {
 
-    public Helpers() {
+    public SystemHelpers() {
         super();
     }