Import order correction

robinGupta11392 · robinGupta11392 · commit 5b76ab99cdc7 · 2022-03-19T09:44:07.000+08:00
Removed validations of exception message in the tests
Accepted the change from val to use checkArgument method from Preconditions class
diff --git a/src/main/java/io/appium/java_client/service/local/AppiumServiceBuilder.java b/src/main/java/io/appium/java_client/service/local/AppiumServiceBuilder.java
@@ -16,19 +16,35 @@
 
 package io.appium.java_client.service.local;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static org.openqa.selenium.remote.CapabilityType.PLATFORM_NAME;
 
 import com.google.common.collect.ImmutableList;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import io.appium.java_client.remote.AndroidMobileCapabilityType;
 import io.appium.java_client.remote.MobileBrowserType;
 import io.appium.java_client.remote.MobileCapabilityType;
 import io.appium.java_client.service.local.flags.GeneralServerFlag;
 import io.appium.java_client.service.local.flags.ServerArgument;
+
+import lombok.SneakyThrows;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.SystemUtils;
+import org.apache.commons.validator.routines.InetAddressValidator;
+import org.openqa.selenium.Capabilities;
+import org.openqa.selenium.Platform;
+import org.openqa.selenium.os.ExecutableFinder;
+import org.openqa.selenium.remote.Browser;
+import org.openqa.selenium.remote.service.DriverService;
+
+import javax.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
+
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -40,17 +56,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Function;
-import javax.annotation.Nullable;
-import lombok.SneakyThrows;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.SystemUtils;
-import org.apache.commons.validator.routines.InetAddressValidator;
-import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.Platform;
-import org.openqa.selenium.os.ExecutableFinder;
-import org.openqa.selenium.remote.Browser;
-import org.openqa.selenium.remote.service.DriverService;
 
 public final class AppiumServiceBuilder
         extends DriverService.Builder<AppiumDriverLocalService, AppiumServiceBuilder> {
@@ -226,7 +231,8 @@ public AppiumServiceBuilder withArgument(ServerArgument argument, String value)
 
     private static String sanitizeBasePath(String basePath) {
         basePath = checkNotNull(basePath).trim();
-        Preconditions.checkArgument(!basePath.isEmpty(), "Given base path is not valid - blank or empty values are not allowed for base path");
+        checkArgument(!basePath.isEmpty(),
+            "Given base path is not valid - blank or empty values are not allowed for base path");
         return basePath.endsWith("/") ? basePath : basePath + "/";
     }
 
diff --git a/src/test/java/io/appium/java_client/service/local/ServerBuilderTest.java b/src/test/java/io/appium/java_client/service/local/ServerBuilderTest.java
@@ -27,16 +27,17 @@
 import com.google.common.collect.ImmutableMap;
 import io.appium.java_client.android.options.UiAutomator2Options;
 import io.github.bonigarcia.wdm.WebDriverManager;
+import org.junit.After;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.OutputStream;
 import java.nio.file.Path;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
-import org.junit.After;
-import org.junit.BeforeClass;
-import org.junit.Test;
 
 @SuppressWarnings("ResultOfMethodCallIgnored")
 public class ServerBuilderTest {
@@ -57,9 +58,6 @@ public class ServerBuilderTest {
     private static final Path PATH_T0_TEST_MAIN_JS = ROOT_TEST_PATH
             .resolve("service").resolve("local").resolve("main.js");
 
-    private static final String INVALID_BASE_PATH_ERROR_MESSAGE =
-        "Given base path is not valid - blank or empty values are not allowed for base path";
-
     private static String testIP;
     private AppiumDriverLocalService service;
     private File testLogFile;
@@ -341,24 +339,22 @@ public void checkAbilityToStartServiceUsingValidBasePathWithSinglePathParams() {
 
     @Test
     public void checkAbilityToValidateBasePathForEmptyBasePath() {
-        Exception exception = assertThrows(IllegalArgumentException.class, () -> {
-            service = new AppiumServiceBuilder().withArgument(BASEPATH, "").build();
+        assertThrows(IllegalArgumentException.class, () -> {
+           new AppiumServiceBuilder().withArgument(BASEPATH, "").build();
         });
-        assertEquals(INVALID_BASE_PATH_ERROR_MESSAGE, exception.getMessage());
     }
 
     @Test
     public void checkAbilityToValidateBasePathForBlankBasePath() {
-        Exception exception = assertThrows(IllegalArgumentException.class, () -> {
-            service = new AppiumServiceBuilder().withArgument(BASEPATH, "   ").build();
+        assertThrows(IllegalArgumentException.class, () -> {
+            new AppiumServiceBuilder().withArgument(BASEPATH, "   ").build();
         });
-        assertEquals(INVALID_BASE_PATH_ERROR_MESSAGE, exception.getMessage());
     }
 
     @Test
     public void checkAbilityToValidateBasePathForNullBasePath() {
         assertThrows(NullPointerException.class, () -> {
-            service = new AppiumServiceBuilder().withArgument(BASEPATH, null).build();
+            new AppiumServiceBuilder().withArgument(BASEPATH, null).build();
         });
     }
 }
