Merge branch 'main' into bellatrix-jira-zephyr-plugin

# Conflicts:
#	bellatrix.core/src/main/java/solutions/bellatrix/core/plugins/PluginExecutionEngine.java
#	bellatrix.core/src/main/java/solutions/bellatrix/core/plugins/junit/BaseTest.java

Author: mei-kyoseva

bellatrix.android/src/main/java/solutions/bellatrix/android/infrastructure/DriverService.java

@@ -19,7 +19,6 @@
 import io.appium.java_client.remote.MobileCapabilityType;
 import lombok.SneakyThrows;
 import org.openqa.selenium.MutableCapabilities;
-import org.openqa.selenium.Platform;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import solutions.bellatrix.android.configuration.AndroidSettings;
 import solutions.bellatrix.android.configuration.GridSettings;
@@ -30,11 +29,10 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.MalformedURLException;
 import java.net.URL;
+import java.time.Duration;
 import java.util.HashMap;
 import java.util.Properties;
-import java.util.concurrent.TimeUnit;
 
 public class DriverService {
     private static final ThreadLocal<Boolean> DISPOSED;
@@ -84,7 +82,7 @@ public static AndroidDriver start(AppConfiguration configuration) {
             driver = initializeDriverGridMode(gridSettings.get(), testName);
         }
 
-        driver.manage().timeouts().implicitlyWait(androidSettings.getTimeoutSettings().getImplicitWaitTimeout(), TimeUnit.SECONDS);
+        driver.manage().timeouts().implicitlyWait(Duration.ofSeconds(androidSettings.getTimeoutSettings().getImplicitWaitTimeout()));
         WRAPPED_ANDROID_DRIVER.set(driver);
         solutions.bellatrix.web.infrastructure.DriverService.setWrappedDriver(driver);
         return driver;

bellatrix.core/pom.xml

@@ -24,7 +24,7 @@
     <version>1.0</version>
 
     <properties>
-        <selenium.version>4.8.1</selenium.version>
+        <selenium.version>4.11.0</selenium.version>
         <appium.version>8.3.0</appium.version>
         <testng.version>7.7.0</testng.version>
         <junit.version>5.9.2</junit.version>
@@ -62,19 +62,16 @@
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>textract</artifactId>
         </dependency>
-
         <dependency>
             <groupId>com.opencsv</groupId>
             <artifactId>opencsv</artifactId>
             <version>5.7.1</version>
         </dependency>
-
         <dependency>
             <groupId>com.mailslurp</groupId>
             <artifactId>mailslurp-client-java</artifactId>
             <version>15.17.1</version>
         </dependency>
-
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
@@ -83,7 +80,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>31.1-jre</version>
+            <version>33.0.0-jre</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
@@ -166,5 +163,10 @@
             <artifactId>azure-identity</artifactId>
             <version>1.2.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>1.17.2</version>
+        </dependency>
     </dependencies>
 </project>

bellatrix.core/src/main/java/solutions/bellatrix/core/assertions/EntitiesAsserter.java

@@ -61,25 +61,32 @@ private static <TEntity> List<Exception> assertAreEqualsInternal(TEntity expecte
                 try {
                     currentExpectedProperty = expectedObject.getClass().getMethod(currentRealProperty.getName());
                 } catch (NoSuchMethodException e) {
-                    failedAssertions.add(e);
+                    System.out.println(String.format("Property %s not found.", currentRealProperty));
+//                    failedAssertions.add(e);
                 }
 
                 var exceptionMessage = "The property " + currentRealProperty.getName() + " of class " + realObject.getClass().getSimpleName() + " was not as expected.";
 
                 try {
                     if (currentRealProperty.getReturnType() == LocalDateTime.class) {
                         LocalDateTimeAssert.areEqual(
-                                (LocalDateTime) currentExpectedProperty.invoke(expectedObject),
-                                (LocalDateTime) currentRealProperty.invoke(realObject),
+                                (LocalDateTime)currentExpectedProperty.invoke(expectedObject),
+                                (LocalDateTime)currentRealProperty.invoke(realObject),
                                 deltaType, deltaQuantity, exceptionMessage);
                     } else {
                         Assertions.assertEquals(
                                 currentExpectedProperty.invoke(expectedObject),
                                 currentRealProperty.invoke(realObject),
                                 exceptionMessage);
                     }
-
-                } catch (Exception ex) {
+                }
+                catch (NoSuchMethodException nsm){
+                    //ignore this case
+                }
+                catch (NullPointerException nsmex){
+                    //ignore this case
+                }
+                catch (Exception ex) {
                     failedAssertions.add(ex);
                 }
             }

bellatrix.core/src/main/java/solutions/bellatrix/core/configuration/ConfigurationService.java

@@ -30,6 +30,10 @@
 public final class ConfigurationService {
     private static String environment;
 
+    public static String getEnvironment() {
+        return environment;
+    }
+
     public static <T> T get(Class<T> configSection) {
         T mappedObject = (T)new Object();
         if (environment == null) {

bellatrix.core/src/main/java/solutions/bellatrix/core/integrations/azure/KeyVault.java

@@ -10,17 +10,10 @@ public static String getSecret(Supplier<String> getConfigValue) {
             return System.getenv(configValue.replace("env_", ""));
         }
 
-        if (configValue.startsWith("vault_")) {
-            return KeyVault.getSecret(configValue.replace("vault_", ""));
-        }
-
         return configValue;
     }
 
     public static String getSecret(String name) {
-        if (KeyVault.isAvailable) {
-            return KeyVault.getSecret(name);
-        }
 
         String environmentalVariable = System.getenv(name);
 

bellatrix.core/src/main/java/solutions/bellatrix/core/integrations/azure/SecretsResolver.java

@@ -14,11 +14,10 @@
 package solutions.bellatrix.core.plugins;
 
 import java.lang.reflect.Method;
-import java.util.LinkedHashSet;
-import java.util.Set;
+import java.util.*;
 
 public final class PluginExecutionEngine {
-    private final static Set<Plugin> PLUGINS;
+    private final static LinkedHashSet<Plugin> PLUGINS;
 
     static {
         PLUGINS = new LinkedHashSet<>();
@@ -92,7 +91,7 @@ public static void preAfterTest(TestResult result, TimeRecord timeRecord, Method
                 currentObserver.preAfterTest(result, timeRecord, memberInfo);
         }
     }
-    
+
     /**
      * Deprecated. <br>
      * Use {@link #postAfterTest(TestResult, TimeRecord, Method, Throwable)} as it offers more information about the test.

bellatrix.core/src/main/java/solutions/bellatrix/core/plugins/PluginExecutionEngine.java

@@ -13,10 +13,7 @@
 
 package solutions.bellatrix.core.plugins.junit;
 
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.*;
 import org.junit.jupiter.api.extension.ExtendWith;
 import solutions.bellatrix.core.plugins.PluginExecutionEngine;
 import solutions.bellatrix.core.plugins.TestResult;
@@ -29,6 +26,7 @@
 import java.util.List;
 
 @ExtendWith(TestResultWatcher.class)
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @ExtendWith(TestDurationWatcher.class)
 public class BaseTest extends UsesPlugins {
     static final ThreadLocal<TestResult> CURRENT_TEST_RESULT = new ThreadLocal<>();
@@ -95,7 +93,7 @@ public void afterMethodCore(TestInfo testInfo) {
         try {
             var testClass = this.getClass();
             assert testInfo.getTestMethod().isPresent();
-            var methodInfo = testClass.getMethod(testInfo.getTestMethod().get().getName());
+            var methodInfo = testClass.getMethod(testInfo.getTestMethod().get().getName(), testInfo.getTestMethod().get().getParameterTypes());
             PluginExecutionEngine.preAfterTest(CURRENT_TEST_RESULT.get(), methodInfo); // DEPRECATED, LEFT FOR COMPATIBILITY
             PluginExecutionEngine.preAfterTest(CURRENT_TEST_RESULT.get(), CURRENT_TEST_TIME_RECORD.get(), methodInfo);
             afterEach();
@@ -107,11 +105,12 @@ public void afterMethodCore(TestInfo testInfo) {
     }
 
     @AfterAll
-    public static void afterClassCore(TestInfo testInfo) {
+    public void afterClassCore(TestInfo testInfo) {
         try {
             var testClass = testInfo.getTestClass();
             if (testClass.isPresent()) {
                 PluginExecutionEngine.preAfterClass(testClass.get());
+                afterClass();
                 PluginExecutionEngine.postAfterClass(testClass.get());
             }
         } catch (Exception e) {
@@ -138,4 +137,7 @@ protected void onBeforeEachFailure() {
 
     protected void afterEach() {
     }
+
+    protected void afterClass() {
+    }
 }

bellatrix.core/src/main/java/solutions/bellatrix/core/plugins/junit/BaseTest.java

@@ -0,0 +1,26 @@
+package solutions.bellatrix.core.utilities;
+
+import java.awt.*;
+import java.awt.datatransfer.*;
+import java.io.IOException;
+
+public class ClipboardManager {
+    private static final Clipboard systemClipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
+
+    public static String getLastEntity() {
+        var lastCopiedEntity = "";
+
+        try {
+            lastCopiedEntity = (String)systemClipboard.getData(DataFlavor.stringFlavor);
+        } catch (IOException | UnsupportedFlavorException e) {
+            throw new RuntimeException(e);
+        }
+
+        return lastCopiedEntity;
+    }
+
+    public static void copyTextToClipboard(String text) {
+        Transferable transferable = new StringSelection(text);
+        systemClipboard.setContents(transferable, null);
+    }
+}

bellatrix.core/src/main/java/solutions/bellatrix/core/utilities/ClipboardManager.java

@@ -1,14 +1,33 @@
+/*
+ * Copyright 2024 Automate The Planet Ltd.
+ * Author: Miriam Kyoseva
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * You may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package solutions.bellatrix.core.utilities;
 
 import lombok.SneakyThrows;
 
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+
 public class ConverterService {
     public static <SourceT, ResultT> ResultT convert(SourceT source, int index) {
         ResultT object = InstanceFactory.createByTypeParameter(source.getClass(), index);
 
+        assert object != null;
         return convert(source, object);
     }
 
+    @SuppressWarnings("unchecked")
     public static <SourceT, ResultT> ResultT convert(SourceT source, ResultT result) {
         var object = (ResultT) InstanceFactory.create(result.getClass());
 
@@ -38,8 +57,8 @@ public static <SourceT, ResultT> ResultT convert(SourceT source, ResultT result)
     public static <SourceT, ResultT> ResultT convertToClass(SourceT source, Class<ResultT> result) {
         var object = (ResultT) InstanceFactory.create(result);
 
-        var sourceFields = source.getClass().getDeclaredFields();
-        var objectFields = object.getClass().getDeclaredFields();
+        List<Field> sourceFields = getAllFields(source.getClass());
+        List<Field> objectFields = getAllFields(object.getClass());
 
         for (var sourceField : sourceFields) {
             for (var objectField : objectFields) {
@@ -55,4 +74,19 @@ public static <SourceT, ResultT> ResultT convertToClass(SourceT source, Class<Re
 
         return object;
     }
+
+    private static List<Field> getAllFields(Class<?> clazz) {
+        List<Field> fields = new ArrayList<>();
+        Class<?> currentClass = clazz;
+
+        while (currentClass != null) {
+            var declaredFields = currentClass.getDeclaredFields();
+            for (Field field : declaredFields) {
+                fields.add(field);
+            }
+            currentClass = currentClass.getSuperclass();
+        }
+
+        return fields;
+    }
 }