Skip to content
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

Jump to bottom

#732 FIX #733

Merged
merged 3 commits into from
Sep 27, 2017
Merged

#732 FIX #733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5fa74ae
#732 FIX
TikhomirovSergey Sep 22, 2017
d2e5ff1
code style issues were got fixed
TikhomirovSergey Sep 23, 2017
89b22dd
some minor things that were found by reviewers were improved
TikhomirovSergey Sep 23, 2017
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
31 changes: 3 additions & 28 deletions src/main/java/io/appium/java_client/AppiumDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@
package io.appium.java_client;

import static com.google.common.base.Preconditions.checkNotNull;
import static io.appium.java_client.remote.MobileCapabilityType.AUTOMATION_NAME;
import static io.appium.java_client.remote.MobileCapabilityType.PLATFORM_NAME;
import static java.util.Optional.ofNullable;
import static org.apache.commons.lang3.StringUtils.containsIgnoreCase;

import com.google.common.collect.ImmutableMap;

Expand Down Expand Up @@ -72,9 +71,6 @@ public class AppiumDriver<T extends WebElement>
private URL remoteAddress;
private RemoteLocationContext locationContext;
private ExecuteMethod executeMethod;
private final String platformName;
private final String automationName;


/**
* @param executor is an instance of {@link org.openqa.selenium.remote.HttpCommandExecutor}
Expand All @@ -89,20 +85,6 @@ public AppiumDriver(HttpCommandExecutor executor, Capabilities capabilities) {
locationContext = new RemoteLocationContext(executeMethod);
super.setErrorHandler(errorHandler);
this.remoteAddress = executor.getAddressOfRemoteServer();

Object capabilityPlatform1 = getCapabilities().getCapability(PLATFORM_NAME);
Object capabilityAutomation1 = getCapabilities().getCapability(AUTOMATION_NAME);

Object capabilityPlatform2 = capabilities.getCapability(PLATFORM_NAME);
Object capabilityAutomation2 = capabilities.getCapability(AUTOMATION_NAME);

platformName = ofNullable(ofNullable(super.getPlatformName())
.orElse(capabilityPlatform1 != null ? String.valueOf(capabilityPlatform1) : null))
.orElse(capabilityPlatform2 != null ? String.valueOf(capabilityPlatform2) : null);
automationName = ofNullable(ofNullable(super.getAutomationName())
.orElse(capabilityAutomation1 != null ? String.valueOf(capabilityAutomation1) : null))
.orElse(capabilityAutomation2 != null ? String.valueOf(capabilityAutomation2) : null);

this.setElementConverter(new JsonToMobileElementConverter(this, this));
}

Expand Down Expand Up @@ -282,15 +264,8 @@ public URL getRemoteAddress() {
return remoteAddress;
}

@Override public String getPlatformName() {
return platformName;
}

@Override public String getAutomationName() {
return automationName;
}

@Override public boolean isBrowser() {
return !getContext().toLowerCase().contains("NATIVE_APP".toLowerCase());
return super.isBrowser()
&& !containsIgnoreCase(getContext(), "NATIVE_APP");
}
}
41 changes: 32 additions & 9 deletions src/main/java/io/appium/java_client/HasSessionDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,15 @@

import static io.appium.java_client.MobileCommand.GET_SESSION;
import static java.util.Optional.ofNullable;
import static java.util.stream.Collectors.toMap;
import static org.apache.commons.lang3.StringUtils.isBlank;

import com.google.common.collect.ImmutableMap;

import org.openqa.selenium.remote.Response;

import java.util.Map;
import javax.annotation.Nullable;

public interface HasSessionDetails extends ExecutesMethod {
/**
Expand All @@ -34,26 +36,47 @@ public interface HasSessionDetails extends ExecutesMethod {
@SuppressWarnings("unchecked")
default Map<String, Object> getSessionDetails() {
Response response = execute(GET_SESSION);
Map<String, Object> resultMap = Map.class.cast(response.getValue());

//this filtering was added to clear returned result.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

-> was added to avoid unexpected NPE on putAll call if the response map contains null value(s)

Copy link
Contributor Author

@TikhomirovSergey TikhomirovSergey Sep 24, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mykola-mokhnach Not only for this purpose. I think empty strings is not useful data and it increases complexity of further operations. So let there will be something useful or null-value when user tries

driver.getSessionDetail("someDetail")

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

of course, just mention the same thing in the comment

//results of further operations should be simply interpreted by users
return ImmutableMap.<String, Object>builder()
.putAll(Map.class.cast(response.getValue())).build();
.putAll(resultMap.entrySet()
.stream().filter(entry -> {
String key = entry.getKey();
Object value = entry.getValue();
return !isBlank(key)
&& value != null
&& !isBlank(String.valueOf(value));
}).collect(toMap(Map.Entry::getKey, Map.Entry::getValue))).build();
}

default Object getSessionDetail(String detail) {
default @Nullable Object getSessionDetail(String detail) {
return getSessionDetails().get(detail);
}

default String getPlatformName() {
Object platformName = getSessionDetail("platformName");
return ofNullable(platformName != null ? String.valueOf(platformName) : null).orElse(null);
/**
* @return name of the current mobile platform.
*/
default @Nullable String getPlatformName() {
Object platformName = ofNullable(getSessionDetail("platformName"))
.orElseGet(() -> getSessionDetail("platform"));
return ofNullable(platformName).map(String::valueOf).orElse(null);
}

default String getAutomationName() {
Object automationName = getSessionDetail("automationName");
return ofNullable(automationName != null ? String.valueOf(automationName) : null).orElse(null);
/**
* @return current automation name.
*/
default @Nullable String getAutomationName() {
return ofNullable(getSessionDetail("automationName"))
.map(String::valueOf).orElse(null);
}

/**
* @return is focus on browser or on native content.
*/
boolean isBrowser();
default boolean isBrowser() {
return ofNullable(getSessionDetail("browserName"))
.orElse(null) != null;
}
}