From 19192c30f02e57d8ef0c776f313e8d17bb940d2d Mon Sep 17 00:00:00 2001
From: Anand Bagmar <abagmar@gmail.com>
Date: Wed, 20 Nov 2024 10:52:37 +0530
Subject: [PATCH] Do not add CLOUD_NAME when generating reports for CLI or API
 tests

---
 src/main/java/com/znsio/teswiz/runner/DeviceSetup.java | 2 +-
 src/main/java/com/znsio/teswiz/runner/Runner.java      | 8 ++++++++
 src/main/java/com/znsio/teswiz/runner/Setup.java       | 2 +-
 src/main/java/com/znsio/teswiz/steps/Hooks.java        | 6 +++---
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/znsio/teswiz/runner/DeviceSetup.java b/src/main/java/com/znsio/teswiz/runner/DeviceSetup.java
index e63ec5663..1c115697a 100644
--- a/src/main/java/com/znsio/teswiz/runner/DeviceSetup.java
+++ b/src/main/java/com/znsio/teswiz/runner/DeviceSetup.java
@@ -309,7 +309,7 @@ private static void fetchAppVersion(String[] commandToGetAppVersion, Pattern pat
     }
 
     static String getCloudNameFromCapabilities() {
-        if (Runner.isRunningInCI()) {
+        if (Runner.isRunningInCI() && !Runner.isAPI() && !Runner.isCLI()) {
             String capabilityFile = Setup.getFromConfigs(CAPS);
             return JsonFile.getValueFromLoadedJsonMap(capabilityFile,
                     new String[]{"serverConfig", "server", "plugin",
diff --git a/src/main/java/com/znsio/teswiz/runner/Runner.java b/src/main/java/com/znsio/teswiz/runner/Runner.java
index bcfd7d16b..e7cee4838 100644
--- a/src/main/java/com/znsio/teswiz/runner/Runner.java
+++ b/src/main/java/com/znsio/teswiz/runner/Runner.java
@@ -247,6 +247,14 @@ public static boolean isRunningInCI() {
         return Setup.getBooleanValueFromConfigs(Setup.RUN_IN_CI);
     }
 
+    public static boolean isCLI() {
+        return Runner.getPlatform().equals(Platform.cli);
+    }
+
+    public static boolean isAPI() {
+        return Runner.getPlatform().equals(Platform.api);
+    }
+
     public static String getBrowser() {
         return Setup.getFromConfigs(Setup.BROWSER);
     }
diff --git a/src/main/java/com/znsio/teswiz/runner/Setup.java b/src/main/java/com/znsio/teswiz/runner/Setup.java
index bca2af4bf..163a80dd3 100644
--- a/src/main/java/com/znsio/teswiz/runner/Setup.java
+++ b/src/main/java/com/znsio/teswiz/runner/Setup.java
@@ -497,7 +497,7 @@ private static void setupListenersForWebOrAPIOrCLIExecution(ArrayList<String> we
     }
 
     static Map<String, Object> initialiseApplitoolsConfiguration() {
-        if (applitoolsConfiguration.isEmpty() && !Runner.getPlatform().equals(Platform.api) && !Runner.getPlatform().equals(Platform.cli)) {
+        if (applitoolsConfiguration.isEmpty() && !Runner.isAPI() && !Runner.isCLI()) {
             getApplitoolsConfigFromProvidedConfigFile();
             applitoolsConfiguration.put(APPLITOOLS.SERVER_URL, getServerUrl());
             applitoolsConfiguration.put(APPLITOOLS.APP_NAME, configs.get(APP_NAME));
diff --git a/src/main/java/com/znsio/teswiz/steps/Hooks.java b/src/main/java/com/znsio/teswiz/steps/Hooks.java
index 1764bd083..70a978f4b 100644
--- a/src/main/java/com/znsio/teswiz/steps/Hooks.java
+++ b/src/main/java/com/znsio/teswiz/steps/Hooks.java
@@ -36,7 +36,7 @@ public void beforeScenario(Scenario scenario) {
                                   scenario.getName()));
         LOGGER.info(String.format("Hooks: Running test %s on %s", testExecutionContext.getTestName(),
                                   Runner.getPlatform().name()));
-        if (!Runner.getPlatform().equals(Platform.api) || !Runner.getPlatform().equals(Platform.cli)) {
+        if (!Runner.isAPI() || !Runner.isCLI()) {
             testExecutionContext.addTestState(TEST_CONTEXT.SCREENSHOT_MANAGER, new ScreenShotManager());
         }
         testExecutionContext.addTestState(TEST_CONTEXT.CURRENT_USER_PERSONA_DETAILS,
@@ -60,7 +60,7 @@ public void afterScenario(Scenario scenario) {
     }
 
     private void startTheAsyncCommandLineExecutor() {
-        if (Runner.getPlatform().equals(Platform.cli)) {
+        if (Runner.isCLI()) {
             LOGGER.info("Start the AsyncCommandLineExecutor");
             testExecutionContext.addTestState(TEST_CONTEXT.CLI_COMMAND_NUMBER, 1);
             AsyncCommandLineExecutor asyncCommandLineExecutor = new AsyncCommandLineExecutor();
@@ -105,7 +105,7 @@ private void addSystemPropertiesToReportPortal() {
     }
 
     private void closeTheAsyncCommandLineExecutor() {
-        if (Runner.getPlatform().equals(Platform.cli)) {
+        if (Runner.isCLI()) {
             LOGGER.info("Close the AsyncCommandLineExecutor");
             AsyncCommandLineExecutor asyncCommandLineExecutor = (AsyncCommandLineExecutor) testExecutionContext.getTestState(TEST_CONTEXT.ASYNC_COMMAND_LINE_EXECUTOR);
             asyncCommandLineExecutor.close();