chore: fix get DERIVED_DATA_PATH

Author: dtopuzov

src/main/java/functional/tests/core/mobile/appium/Capabilities.java

@@ -82,7 +82,7 @@ public DesiredCapabilities loadAndroidCapabilities(MobileSettings settings) {
             capabilities.setCapability(AndroidMobileCapabilityType.APP_WAIT_PACKAGE, settings.android.appWaitPackage);
             capabilities.setCapability(AndroidMobileCapabilityType.NO_SIGN, true);
             if (settings.automationName.equalsIgnoreCase(AutomationName.ANDROID_UIAUTOMATOR2)) {
-                String systemPortString = OSUtils.getEnvironmentVariable("SYSTEM_PORT",
+                String systemPortString = OSUtils.getEnvironmentVariable(AndroidMobileCapabilityType.SYSTEM_PORT,
                         String.valueOf(OSUtils.getFreePort(8201, 8501)));
                 capabilities.setCapability(AndroidMobileCapabilityType.SYSTEM_PORT, Integer.valueOf(systemPortString));
             }
@@ -119,9 +119,11 @@ public DesiredCapabilities loadIOSCapabilities(MobileSettings settings) {
         capabilities.setCapability(IOSMobileCapabilityType.WDA_STARTUP_RETRIES, 5);
         capabilities.setCapability(IOSMobileCapabilityType.SHOULD_USE_SINGLETON_TESTMANAGER, false);
 
-        if (!System.getenv("DERIVED_DATA_PATH").isEmpty()) {
-            capabilities.setCapability("derivedDataPath", System.getenv("DERIVED_DATA_PATH") + File.separator + settings.deviceId);
+        String derivedDataPath = System.getenv("DERIVED_DATA_PATH");
+        if (derivedDataPath != null && !derivedDataPath.isEmpty()) {
+            capabilities.setCapability("derivedDataPath", derivedDataPath + File.separator + settings.deviceId);
         }
+
         // It looks we need it for XCTest (iOS 10+ automation)
         if (settings.platformVersion >= 10) {
             int port = settings.ios.wdaLocalPort;

src/main/java/functional/tests/core/mobile/settings/MobileSettings.java

@@ -68,7 +68,7 @@ private SettingsAndroid initSettingsAndroid() {
         loggerBase.separatorAndroid();
 
         this.android.maxEmuCount = Integer.parseInt(OSUtils.getEnvironmentVariable("MAX_EMU_COUNT", "1"));
-        loggerBase.info("Maximum number of parallel emulators: " + String.valueOf(this.android.maxEmuCount));
+        loggerBase.info("Maximum number of parallel emulators: " + this.android.maxEmuCount);
 
         if (this.deviceType == DeviceType.Emulator) {
             // Main port is 5 next two numbers comes from platform version and last one is like minor version * 2
@@ -141,11 +141,7 @@ private SettingsIOS initSettingsIOS() {
         loggerBase.info("WDA_LOCAL_PORT: " + wdaLocalPortAsString);
 
         this.ios.maxSimCount = Integer.parseInt(OSUtils.getEnvironmentVariable("MAX_SIM_COUNT", "1"));
-        loggerBase.info("Maximum number of parallel iOS Simulators: " + String.valueOf(this.ios.maxSimCount));
-
-        if (this.deviceId == null && !this.isRealDevice) {
-            this.deviceId = null;
-        }
+        loggerBase.info("Maximum number of parallel iOS Simulators: " + this.ios.maxSimCount);
         loggerBase.info("Device Id: " + this.deviceId);
 
         this.ios.acceptAlerts = this.propertyToBoolean("acceptAlerts", false);
@@ -225,7 +221,7 @@ public void initSettings() {
 
         String usePreBuildWDAEnv = System.getenv("USE_PREBUILT_WDA");
         if (usePreBuildWDAEnv != null && !usePreBuildWDAEnv.isEmpty()){
-            this.usePrebuiltWDA = usePreBuildWDAEnv == "true" ? true : false;
+            this.usePrebuiltWDA = usePreBuildWDAEnv.equals("true");
         }
 
         if (this.platform == PlatformType.Android) {