property init fixes (#1620)

* enhance property files structure * fix openCV initialization * reposition allure listener meta file creation * disabled new feature, reload props with any prop call * hardcode the testNG listener
ShaftHQ · May 23, 2024 · 2bd00b6 · 2bd00b6
1 parent 64732d3
commit 2bd00b6
Show file tree

Hide file tree

Showing 26 changed files with 41 additions and 31 deletions.
diff --git a/src/main/java/com/shaft/driver/DriverFactory.java b/src/main/java/com/shaft/driver/DriverFactory.java
@@ -42,7 +42,7 @@ private static void readLastMinuteUpdatedProperties() {
         }
     }
 
-    public static void reloadProperties() {
+    public static boolean reloadProperties() {
         if (SHAFT.Properties.platform == null) {
             System.out.println("Execution Listeners are not loaded properly... Self-Healing... Initializing minimalistic test run...");
             var runType = TestNGListener.identifyRunType();
@@ -53,6 +53,7 @@ public static void reloadProperties() {
             }
             TestNGListener.engineSetup(runType);
         }
+        return true;
     }
 
     /**

diff --git a/src/main/java/com/shaft/gui/internal/image/ImageProcessingActions.java b/src/main/java/com/shaft/gui/internal/image/ImageProcessingActions.java
@@ -139,9 +139,13 @@ public static void compareImageFolders(String referenceFolderPath, String testFo
 
     public static byte[] highlightElementInScreenshot(byte[] targetScreenshot,
                                                       org.openqa.selenium.Rectangle elementLocation, Color highlightColor) {
-
-//        loadOpenCV();
-        Mat img = Imgcodecs.imdecode(new MatOfByte(targetScreenshot), Imgcodecs.IMREAD_COLOR);
+        Mat img;
+        try {
+            img = Imgcodecs.imdecode(new MatOfByte(targetScreenshot), Imgcodecs.IMREAD_COLOR);
+        } catch (java.lang.UnsatisfiedLinkError unsatisfiedLinkError){
+            loadOpenCV();
+            img = Imgcodecs.imdecode(new MatOfByte(targetScreenshot), Imgcodecs.IMREAD_COLOR);
+        }
 
         int outlineThickness = 5;
         double elementHeight = elementLocation.getHeight(),

diff --git a/src/main/java/com/shaft/properties/internal/BrowserStack.java b/src/main/java/com/shaft/properties/internal/BrowserStack.java
@@ -10,7 +10,7 @@
         "file:src/main/resources/properties/default/browserStack.properties",
         "classpath:browserStack.properties",
 })
-public interface BrowserStack extends EngineProperties {
+public interface BrowserStack extends EngineProperties<BrowserStack> {
     //Based on BrowserStack capability builder
     // For Mobile Native https://www.browserstack.com/app-automate/capabilities?tag=w3c
     // For Web https://www.browserstack.com/automate/capabilities?tag=selenium-4

diff --git a/src/main/java/com/shaft/properties/internal/Cucumber.java b/src/main/java/com/shaft/properties/internal/Cucumber.java
@@ -4,7 +4,7 @@
 
 @SuppressWarnings("unused")
 @Config.Sources({"system:properties", "file:src/main/resources/properties/cucumber.properties", "file:src/main/resources/properties/default/cucumber.properties", "classpath:cucumber.properties"})
-public interface Cucumber extends EngineProperties {
+public interface Cucumber extends EngineProperties<Cucumber> {
 
     @Key("cucumber.ansi-colors.disabled")
     @DefaultValue("false")

diff --git a/src/main/java/com/shaft/properties/internal/EngineProperties.java b/src/main/java/com/shaft/properties/internal/EngineProperties.java
@@ -8,7 +8,7 @@
 // https://matteobaccan.github.io/owner/
 @HotReload(type = HotReloadType.ASYNC)
 @LoadPolicy(Config.LoadType.MERGE)
-public interface EngineProperties extends Config {
+public interface EngineProperties<T> extends Config {
     SetProperty set();
 
     interface SetProperty {

diff --git a/src/main/java/com/shaft/properties/internal/Flags.java b/src/main/java/com/shaft/properties/internal/Flags.java
@@ -6,7 +6,7 @@
 
 @SuppressWarnings("unused")
 @Sources({"system:properties", "file:src/main/resources/properties/PlatformFlags.properties", "file:src/main/resources/properties/default/PlatformFlags.properties", "classpath:PlatformFlags.properties",})
-public interface Flags extends EngineProperties {
+public interface Flags extends EngineProperties<Flags> {
     private static void setProperty(String key, String value) {
         var updatedProps = new java.util.Properties();
         updatedProps.setProperty(key, value);

diff --git a/src/main/java/com/shaft/properties/internal/Healenium.java b/src/main/java/com/shaft/properties/internal/Healenium.java
@@ -6,7 +6,7 @@
 
 @SuppressWarnings("unused")
 @Sources({"system:properties", "file:src/main/resources/properties/healenium.properties", "file:src/main/resources/properties/default/healenium.properties", "classpath:healenium.properties",})
-public interface Healenium extends EngineProperties {
+public interface Healenium extends EngineProperties<Healenium> {
     private static void setProperty(String key, String value) {
         var updatedProps = new java.util.Properties();
         updatedProps.setProperty(key, value);

diff --git a/src/main/java/com/shaft/properties/internal/Internal.java b/src/main/java/com/shaft/properties/internal/Internal.java
@@ -8,7 +8,7 @@
         "file:src/main/resources/properties/default/internal.properties",
         "classpath:internal.properties",
 })
-public interface Internal extends EngineProperties {
+public interface Internal extends EngineProperties<Internal> {
     @Key("shaftEngineVersion")
     @DefaultValue("8.2.20240411")
     String shaftEngineVersion();

diff --git a/src/main/java/com/shaft/properties/internal/Jira.java b/src/main/java/com/shaft/properties/internal/Jira.java
@@ -6,7 +6,7 @@
 
 @SuppressWarnings("unused")
 @Sources({"system:properties", "file:src/main/resources/properties/JiraXRay.properties", "file:src/main/resources/properties/default/JiraXRay.properties", "classpath:JiraXRay.properties"})
-public interface Jira extends EngineProperties {
+public interface Jira extends EngineProperties<Jira> {
     private static void setProperty(String key, String value) {
         var updatedProps = new java.util.Properties();
         updatedProps.setProperty(key, value);

diff --git a/src/main/java/com/shaft/properties/internal/LambdaTest.java b/src/main/java/com/shaft/properties/internal/LambdaTest.java
@@ -6,7 +6,7 @@
 
 @SuppressWarnings({"unused"})
 @Config.Sources({"system:properties", "file:src/main/resources/properties/LambdaTest.properties", "file:src/main/resources/properties/default/LambdaTest.properties", "classpath:LambdaTest.properties",})
-public interface LambdaTest extends EngineProperties {
+public interface LambdaTest extends EngineProperties<LambdaTest> {
     //Based on LambdaTest capability builder
     // For Web and Mobile Native https://www.lambdatest.com/capabilities-generator/
 

diff --git a/src/main/java/com/shaft/properties/internal/Log4j.java b/src/main/java/com/shaft/properties/internal/Log4j.java
@@ -4,7 +4,7 @@
 
 @SuppressWarnings("unused")
 @Sources({"system:properties", "file:src/main/resources/properties/log4j2.properties", "file:src/main/resources/properties/default/log4j2.properties", "classpath:log4j2.properties"})
-public interface Log4j extends EngineProperties {
+public interface Log4j extends EngineProperties<Log4j> {
 
     @Key("name")
     @DefaultValue("PropertiesConfig")

diff --git a/src/main/java/com/shaft/properties/internal/Mobile.java b/src/main/java/com/shaft/properties/internal/Mobile.java
@@ -11,7 +11,7 @@
         "file:src/main/resources/properties/default/MobileCapabilities.properties",
         "classpath:MobileCapabilities.properties",
 })
-public interface Mobile extends EngineProperties {
+public interface Mobile extends EngineProperties<Mobile> {
 
     private static void setProperty(String key, String value) {
         var updatedProps = new java.util.Properties();

diff --git a/src/main/java/com/shaft/properties/internal/Paths.java b/src/main/java/com/shaft/properties/internal/Paths.java
@@ -10,7 +10,7 @@
         "file:src/main/resources/properties/default/path.properties",
         "classpath:path.properties",
 })
-public interface Paths extends EngineProperties {
+public interface Paths extends EngineProperties<Paths> {
     private static void setProperty(String key, String value) {
         var updatedProps = new java.util.Properties();
         updatedProps.setProperty(key, value);

diff --git a/src/main/java/com/shaft/properties/internal/Pattern.java b/src/main/java/com/shaft/properties/internal/Pattern.java
@@ -6,7 +6,7 @@
 
 @SuppressWarnings("unused")
 @Sources({"system:properties", "file:src/main/resources/properties/pattern.properties", "file:src/main/resources/properties/default/pattern.properties", "classpath:pattern.properties",})
-public interface Pattern extends EngineProperties {
+public interface Pattern extends EngineProperties<Pattern> {
     private static void setProperty(String key, String value) {
         var updatedProps = new java.util.Properties();
         updatedProps.setProperty(key, value);

diff --git a/src/main/java/com/shaft/properties/internal/Performance.java b/src/main/java/com/shaft/properties/internal/Performance.java
@@ -10,7 +10,7 @@
         "file:src/main/resources/properties/default/performance.properties",
         "classpath:performance.properties",
 })
-public interface Performance extends EngineProperties {
+public interface Performance extends EngineProperties<Performance> {
     private static void setProperty(String key, String value) {
         var updatedProps = new java.util.Properties();
         updatedProps.setProperty(key, value);

diff --git a/src/main/java/com/shaft/properties/internal/Platform.java b/src/main/java/com/shaft/properties/internal/Platform.java
@@ -9,7 +9,7 @@
         "file:src/main/resources/properties/default/ExecutionPlatform.properties",
         "classpath:ExecutionPlatform.properties",
 })
-public interface Platform extends EngineProperties {
+public interface Platform extends EngineProperties<Platform> {
     private static void setProperty(String key, String value) {
         var updatedProps = new java.util.Properties();
         updatedProps.setProperty(key, value);

diff --git a/src/main/java/com/shaft/properties/internal/Properties.java b/src/main/java/com/shaft/properties/internal/Properties.java
@@ -1,6 +1,9 @@
 package com.shaft.properties.internal;
 
+import com.shaft.driver.DriverFactory;
+
 public class Properties {
+//    private static final boolean reloadProperties = DriverFactory.reloadProperties();
     public static BrowserStack browserStack;
     public static Cucumber cucumber;
     public static Platform platform;

diff --git a/src/main/java/com/shaft/properties/internal/Reporting.java b/src/main/java/com/shaft/properties/internal/Reporting.java
@@ -6,7 +6,7 @@
 
 @SuppressWarnings("unused")
 @Sources({"system:properties", "file:src/main/resources/properties/Reporting.properties", "file:src/main/resources/properties/default/Reporting.properties", "classpath:Reporting.properties"})
-public interface Reporting extends EngineProperties {
+public interface Reporting extends EngineProperties<Reporting> {
     private static void setProperty(String key, String value) {
         var updatedProps = new java.util.Properties();
         updatedProps.setProperty(key, value);

diff --git a/src/main/java/com/shaft/properties/internal/TestNG.java b/src/main/java/com/shaft/properties/internal/TestNG.java
@@ -4,7 +4,7 @@
 
 @SuppressWarnings("unused")
 @Sources({"system:properties", "file:src/main/resources/properties/TestNG.properties", "file:src/main/resources/properties/default/TestNG.properties", "classpath:TestNG.properties",})
-public interface TestNG extends EngineProperties {
+public interface TestNG extends EngineProperties<TestNG> {
 
     @Key("setParallel")
     @DefaultValue("NONE")

diff --git a/src/main/java/com/shaft/properties/internal/Timeouts.java b/src/main/java/com/shaft/properties/internal/Timeouts.java
@@ -6,7 +6,7 @@
 
 @SuppressWarnings("unused")
 @Sources({"system:properties", "file:src/main/resources/properties/Timeouts.properties", "file:src/main/resources/properties/default/Timeouts.properties", "classpath:Timeouts.properties"})
-public interface Timeouts extends EngineProperties {
+public interface Timeouts extends EngineProperties<Timeouts> {
     private static void setProperty(String key, String value) {
         var updatedProps = new java.util.Properties();
         updatedProps.setProperty(key, value);

diff --git a/src/main/java/com/shaft/properties/internal/Tinkey.java b/src/main/java/com/shaft/properties/internal/Tinkey.java
@@ -6,7 +6,7 @@
 
 @SuppressWarnings("unused")
 @Sources({"system:properties", "file:src/main/resources/properties/tinkey.properties", "file:src/main/resources/properties/default/tinkey.properties", "classpath:tinkey.properties"})
-public interface Tinkey extends EngineProperties {
+public interface Tinkey extends EngineProperties<Tinkey> {
     private static void setProperty(String key, String value) {
         var updatedProps = new java.util.Properties();
         updatedProps.setProperty(key, value);

diff --git a/src/main/java/com/shaft/properties/internal/Visuals.java b/src/main/java/com/shaft/properties/internal/Visuals.java
@@ -6,7 +6,7 @@
 
 @SuppressWarnings("unused")
 @Sources({"system:properties", "file:src/main/resources/properties/VisualValidations.properties", "file:src/main/resources/properties/default/VisualValidations.properties", "classpath:VisualValidations.properties"})
-public interface Visuals extends EngineProperties {
+public interface Visuals extends EngineProperties<Visuals> {
     private static void setProperty(String key, String value) {
         var updatedProps = new java.util.Properties();
         updatedProps.setProperty(key, value);

diff --git a/src/main/java/com/shaft/properties/internal/Web.java b/src/main/java/com/shaft/properties/internal/Web.java
@@ -6,7 +6,7 @@
 
 @SuppressWarnings("unused")
 @Sources({"system:properties", "file:src/main/resources/properties/WebCapabilities.properties", "file:src/main/resources/properties/default/WebCapabilities.properties", "classpath:WebCapabilities.properties"})
-public interface Web extends EngineProperties {
+public interface Web extends EngineProperties<Web> {
     private static void setProperty(String key, String value) {
         var updatedProps = new java.util.Properties();
         updatedProps.setProperty(key, value);

diff --git a/src/main/java/com/shaft/tools/io/internal/AllureManager.java b/src/main/java/com/shaft/tools/io/internal/AllureManager.java
@@ -35,7 +35,6 @@ public static void initializeAllureReportingEnvironment() {
         overrideAllurePluginConfiguration();
         writeGenerateReportShellFilesToProjectDirectory();
         writeEnvironmentVariablesToAllureResultsDirectory();
-        createAllureListenersMetaFiles();
     }
 
     public static void openAllureReportAfterExecution() {
@@ -154,12 +153,6 @@ private static void overrideAllurePluginConfiguration() {
 
     }
 
-    private static void createAllureListenersMetaFiles() {
-        FileActions.getInstance(true).createFolder(com.shaft.properties.internal.Properties.paths.services());
-        Arrays.asList("io.qameta.allure.listener.ContainerLifecycleListener", "io.qameta.allure.listener.FixtureLifecycleListener",
-                "io.qameta.allure.listener.StepLifecycleListener", "io.qameta.allure.listener.TestLifecycleListener").forEach(fileName -> FileActions.getInstance(true).writeToFile(Properties.paths.services(), fileName, "com.shaft.listeners.AllureListener"));
-    }
-
     private static void writeAllureReport() {
         String commandToCreateAllureReport;
         allureBinaryPath = allureExtractionLocation + "allure-" + SHAFT.Properties.internal.allureVersion()

diff --git a/src/main/java/com/shaft/tools/io/internal/ProjectStructureManager.java b/src/main/java/com/shaft/tools/io/internal/ProjectStructureManager.java
@@ -5,6 +5,7 @@
 import com.shaft.tools.io.ReportManager;
 
 import java.nio.file.Paths;
+import java.util.Arrays;
 
 public class ProjectStructureManager {
     public static void initialize(RunType runType) {
@@ -32,8 +33,15 @@ public static void initialize(RunType runType) {
                     FileActions.getInstance(true).writeToFile(Properties.paths.services(), "io.cucumber.plugin.ConcurrentEventListener", "com.shaft.listeners.CucumberFeatureListener");
                 }
             }
+            createAllureListenersMetaFiles();
         }
     }
 
+    private static void createAllureListenersMetaFiles() {
+        FileActions.getInstance(true).createFolder(com.shaft.properties.internal.Properties.paths.services());
+        Arrays.asList("io.qameta.allure.listener.ContainerLifecycleListener", "io.qameta.allure.listener.FixtureLifecycleListener",
+                "io.qameta.allure.listener.StepLifecycleListener", "io.qameta.allure.listener.TestLifecycleListener").forEach(fileName -> FileActions.getInstance(true).writeToFile(Properties.paths.services(), fileName, "com.shaft.listeners.AllureListener"));
+    }
+
     public enum RunType {TESTNG, JUNIT, CUCUMBER}
 }
diff --git a/src/main/resources/META-INF/services/org.testng.ITestNGListener b/src/main/resources/META-INF/services/org.testng.ITestNGListener
@@ -0,0 +1 @@
+com.shaft.listeners.TestNGListener