Skip to content

Fix for basePath appending logic to fix Issue #1660 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 17, 2022
Merged

Fix for basePath appending logic to fix Issue #1660 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8da284
Fix for basePath appending logic to fix Issue#1660 AppiumDriverLocalS…
Mar 17, 2022
72cf29f
Added test to check the service instantiation with basepath
Mar 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion src/main/java/io/appium/java_client/service/local/AppiumDriverLocalService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,23 @@ public static AppiumDriverLocalService buildService(AppiumServiceBuilder builder
}

public AppiumDriverLocalService withBasePath(String basePath) {
this.basePath = basePath;
this.basePath = sanitizeBasePath(basePath);
return this;
}

@SneakyThrows private static String sanitizeBasePath(String basePath) {
if (null == basePath) {
LOG.warn("Base Path cannot be NULL -- ignoring the basepath configuration");
return null;
}
basePath = basePath.trim();
if (basePath.isBlank() || basePath.isEmpty()) {
LOG.warn("Base Path cannot be Empty or Blank -- ignoring the basepath configuration");
return null;
}
return (basePath.endsWith("/") ? basePath : basePath + "/");
}

public String getBasePath() {
return this.basePath;
}
Expand Down
8 changes: 8 additions & 0 deletions src/test/java/io/appium/java_client/service/local/ServerBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import static io.appium.java_client.service.local.AppiumServiceBuilder.APPIUM_PATH;
import static io.appium.java_client.service.local.flags.GeneralServerFlag.CALLBACK_ADDRESS;
import static io.appium.java_client.service.local.flags.GeneralServerFlag.SESSION_OVERRIDE;
import static io.appium.java_client.service.local.flags.GeneralServerFlag.BASEPATH;
import static io.github.bonigarcia.wdm.WebDriverManager.chromedriver;
import static java.lang.System.getProperty;
import static java.lang.System.setProperty;
Expand Down Expand Up @@ -312,4 +313,11 @@ public void checkAbilityToStartServiceWithLogFileUsingShortFlag() {
service.start();
assertTrue(testLogFile.exists());
}

@Test
public void checkAbilityToStartServiceUsingBasePath() {
service = new AppiumServiceBuilder().withArgument(BASEPATH, "/wd/hub").build();
service.start();
assertTrue(service.isRunning());
}
}