refactored based on sonar recommendations (#614)

* refactored based on sonar recommendations * reverted BrowserStackDevice
znsio · Feb 22, 2024 · 9783586 · 9783586
1 parent af3c2b0
commit 9783586
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 21 deletions.
diff --git a/src/main/java/com/znsio/teswiz/aspect/AspectLogging.java b/src/main/java/com/znsio/teswiz/aspect/AspectLogging.java
@@ -9,13 +9,6 @@
 
 @Aspect
 public class AspectLogging {
-    private static final Logger LOGGER = LogManager.getLogger(AspectLogging.class.getName());
-    private final TestExecutionContext context;
-
-    public AspectLogging() {
-        long threadId = Thread.currentThread().getId();
-        context = SessionContext.getTestExecutionContext(threadId);
-    }
     @Pointcut("execution(public * *.*.*.entities.*.*(..)) " +
             "|| execution(public * *.*.*.listener.*.*(..)) " +
             "|| execution(public * *.*.*.runner.*.*(..)) " +

diff --git a/src/main/java/com/znsio/teswiz/listener/CucumberPlatformScenarioListener.java b/src/main/java/com/znsio/teswiz/listener/CucumberPlatformScenarioListener.java
@@ -26,7 +26,7 @@ public class CucumberPlatformScenarioListener
             CucumberPlatformScenarioListener.class.getName());
     private final Map<String, Integer> scenarioRunCounts = new HashMap<>();
 
-    private Platform platform = Runner.getPlatform();
+    private final Platform platform = Runner.getPlatform();
 
     public CucumberPlatformScenarioListener() {
         LOGGER.info(String.format("ThreadId: %d: CucumberScenarioListener%n",
@@ -103,4 +103,4 @@ private Integer getScenarioRunCount(String scenarioName) {
     private String normaliseScenarioName(String scenarioName) {
         return scenarioName.replaceAll("[`~ !@#$%^&*()\\-=+\\[\\]{}\\\\|;:'\",<.>/?]", "_");
     }
-}
+}
diff --git a/src/main/java/com/znsio/teswiz/runner/AppiumDriverManager.java b/src/main/java/com/znsio/teswiz/runner/AppiumDriverManager.java
@@ -169,7 +169,7 @@ private static Driver setupFirstAppiumDriver(String userPersona, Platform forPla
         Driver currentDriver;
         AppiumDriver appiumDriver = (AppiumDriver) context.getTestState(
                 TEST_CONTEXT.APPIUM_DRIVER);
-        DriverSession deviceInfo = (DriverSession) context.getTestState(TEST_CONTEXT.DEVICE_INFO);
+        // DriverSession deviceInfo = (DriverSession) context.getTestState(TEST_CONTEXT.DEVICE_INFO);
         // Do not add the device info to additionalDevices for the driver created by ATD
         // additionalDevices.add(deviceInfo);
         Capabilities appiumDriverCapabilities = appiumDriver.getCapabilities();

diff --git a/src/main/java/com/znsio/teswiz/runner/Driver.java b/src/main/java/com/znsio/teswiz/runner/Driver.java
@@ -164,8 +164,7 @@ public boolean isElementPresent(By locator) {
     }
 
     public boolean isElementPresentByAccessibilityId(String locator) {
-        return driver.findElements(AppiumBy.accessibilityId(locator))
-                .size() > 0;
+        return !driver.findElements(AppiumBy.accessibilityId(locator)).isEmpty();
     }
 
     public boolean isElementPresentWithin(WebElement parentElement, By locator) {

diff --git a/src/main/java/com/znsio/teswiz/runner/Drivers.java b/src/main/java/com/znsio/teswiz/runner/Drivers.java
@@ -273,14 +273,13 @@ private static void updateTestStatusInCloud(WebDriver driver, Status cucumberSce
 
     private static void updateTestStatusInBrowserStack(JavascriptExecutor driver, String scenarioStatus, String scenarioFailureReasons) {
         LOGGER.info(String.format("updateTestStatusInCloud for BrowserStack: '%s'", scenarioStatus));
-        final JavascriptExecutor jse = driver;
         JSONObject executorObject = new JSONObject();
         JSONObject argumentsObject = new JSONObject();
         argumentsObject.put("status", scenarioStatus);
         argumentsObject.put("reason", scenarioFailureReasons);
         executorObject.put("action", "setSessionStatus");
         executorObject.put("arguments", argumentsObject);
-        jse.executeScript(String.format("browserstack_executor: %s", executorObject));
+        driver.executeScript(String.format("browserstack_executor: %s", executorObject));
     }
 
     private static void validateVisualTestResults(String userPersona, Driver driver) {

diff --git a/src/main/java/com/znsio/teswiz/runner/PCloudySetup.java b/src/main/java/com/znsio/teswiz/runner/PCloudySetup.java
@@ -183,11 +183,7 @@ else if (Runner.getPlatform().equals(Platform.iOS)) {
 
     @NotNull
     private static CommandLineResponse getListOfUploadedFilesInPCloudy(String authToken, String deviceLabURL) {
-        Map payload = new HashMap();
-        payload.put("\"token\"", "\"" + authToken + "\"");
-        payload.put("\"limit\"", 15);
-        payload.put("\"filter\"", "\"all\"");
-        String updatedPayload = payload.toString().replace("\"", "\\\"").replace("=", ":");
+        String updatedPayload = createPayloadToGetListOfUploadedFiles(authToken);
 
         String[] listOfUploadedFiles;
         listOfUploadedFiles = new String[]{CURL_INSECURE, getCurlProxyCommand(), "-H",
@@ -211,4 +207,14 @@ private static CommandLineResponse getListOfUploadedFilesInPCloudy(String authTo
         return listFilesInPCloudyResponse;
     }
 
+    @NotNull
+    private static String createPayloadToGetListOfUploadedFiles(String authToken) {
+        Map payload = new HashMap();
+        payload.put("\"token\"", "\"" + authToken + "\"");
+        payload.put("\"limit\"", 15);
+        payload.put("\"filter\"", "\"all\"");
+        String updatedPayload = payload.toString().replace("\"", "\\\"").replace("=", ":");
+        return updatedPayload;
+    }
+
 }
diff --git a/src/main/java/com/znsio/teswiz/runner/UserPersonaDetails.java b/src/main/java/com/znsio/teswiz/runner/UserPersonaDetails.java
@@ -19,7 +19,7 @@ public class UserPersonaDetails {
     private final ConcurrentHashMap<String, String> deviceLogFileNameForUserPersonaAndPlatform =
             new ConcurrentHashMap<>();
 
-    private String keyPrefix = Thread.currentThread().getId() + "-";
+    private final String keyPrefix = Thread.currentThread().getId() + "-";
 
     void assignNewPersonaForUser(String userPersona, String newUserPersona) {
         replaceCapabilitiesFor(userPersona, newUserPersona);
@@ -231,4 +231,4 @@ private String getKeyNameForBrowserLogs(String userPersona, String forplatform,
     Map<String, Driver> getAllAssignedUserPersonasAndDrivers() {
         return drivers;
     }
-}
+}