update loader

Abdelrhman-Ellithy · Dec 9, 2024 · d15cf1a · d15cf1a
2 parents 9a9254c + 0b0fabb
commit d15cf1a
Show file tree

Hide file tree

Showing 20 changed files with 354 additions and 181 deletions.
diff --git a/TestNGRunner.xml b/TestNGRunner.xml
@@ -3,14 +3,24 @@
 <!--    <test name="ِMobile Android Test">-->
 <!--        <classes>-->
 <!--            <class name="Tests.AppiumTest"></class>-->
-<!--&lt;!&ndash;            <class name="Tests.AppiumNoonTest"></class>&ndash;&gt;-->
 <!--        </classes>-->
 <!--    </test>-->
-    <test name="Web UI Test">
+    <test name="Web UI Test Chrome">
+        <parameter name="BrowserName" value="Chrome"></parameter>
         <classes>
-        <class name="Tests.loginTests"/>
-<!--        <class name="Runner.TestRunner"></class>-->
-<!--        <class name="Tests.DetailsTests"></class>-->
+            <class name="Tests.loginTests"/>
+        </classes>
+    </test>
+    <test name="Web UI Test FireFox">
+        <parameter name="BrowserName" value="FireFox"></parameter>
+        <classes>
+            <class name="Tests.loginTests"/>
+        </classes>
+    </test>
+    <test name="Web UI Test Edge">
+        <parameter name="BrowserName" value="Edge"></parameter>
+        <classes>
+            <class name="Tests.loginTests"/>
         </classes>
     </test>
 <!--    <test name="ِDatabase Test">-->

diff --git a/pom.xml b/pom.xml
@@ -210,12 +210,36 @@
             <artifactId>cucumber-testng</artifactId>
             <version>${cucumberTsetNG}</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.testng</groupId>
+                    <artifactId>testng</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.cucumber</groupId>
+                    <artifactId>cucumber-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.cucumber</groupId>
+                    <artifactId>gherkin</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
             <version>${testNG}</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- https://mvnrepository.com/artifact/io.rest-assured/rest-assured -->
         <dependency>
@@ -308,6 +332,32 @@
             <groupId>io.appium</groupId>
             <artifactId>java-client</artifactId>
             <version>${appiumVersion}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.seleniumhq.selenium</groupId>
+                    <artifactId>selenium-java</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.seleniumhq.selenium</groupId>
+                    <artifactId>selenium-remote-driver</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.seleniumhq.selenium</groupId>
+                    <artifactId>selenium-support</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.seleniumhq.selenium</groupId>
+                    <artifactId>selenium-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
     <build>
@@ -347,7 +397,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.11.1</version>
+                <version>3.11.2</version>
                 <configuration>
                     <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
                     <sourcepath>

diff --git a/src/main/java/Ellithium/Utilities/assertion/AssertionExecutor.java b/src/main/java/Ellithium/Utilities/assertion/AssertionExecutor.java
@@ -1,12 +1,8 @@
 package Ellithium.Utilities.assertion;
 import Ellithium.core.logging.LogLevel;
 import Ellithium.core.reporting.Reporter;
-import Ellithium.core.reporting.internal.Colors;
-import Ellithium.core.logging.logsUtils;
 import org.testng.Assert;
 import org.testng.asserts.SoftAssert;
-import io.qameta.allure.Allure;
-import io.qameta.allure.model.Status;
 
 import java.util.Arrays;
 import java.util.Collection;