Skip to content

refactor: Replace performance data APIs with mobile extensions #1905

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 1 commit into from
May 7, 2023
Merged

refactor: Replace performance data APIs with mobile extensions #1905

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 25 additions & 4 deletions src/main/java/io/appium/java_client/android/HasSupportedPerformanceDataType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
package io.appium.java_client.android;

import com.google.common.collect.ImmutableMap;
import io.appium.java_client.CanRememberExtensionPresence;
import io.appium.java_client.CommandExecutionHelper;
import io.appium.java_client.ExecutesMethod;
import org.openqa.selenium.UnsupportedCommandException;

import java.util.List;

import static io.appium.java_client.android.AndroidMobileCommandHelper.getPerformanceDataCommand;
import static io.appium.java_client.android.AndroidMobileCommandHelper.getSupportedPerformanceDataTypesCommand;

public interface HasSupportedPerformanceDataType extends ExecutesMethod {
public interface HasSupportedPerformanceDataType extends ExecutesMethod, CanRememberExtensionPresence {

/**
* returns the information type of the system state which is supported to read
Expand All @@ -18,7 +21,15 @@ public interface HasSupportedPerformanceDataType extends ExecutesMethod {
*
*/
default List<String> getSupportedPerformanceDataTypes() {
return CommandExecutionHelper.execute(this, getSupportedPerformanceDataTypesCommand());
final String extName = "mobile: getPerformanceDataTypes";
try {
return CommandExecutionHelper.executeScript(assertExtensionExists(extName), extName);
} catch (UnsupportedCommandException e) {
// TODO: Remove the fallback
return CommandExecutionHelper.execute(
markExtensionAbsence(extName), getSupportedPerformanceDataTypesCommand()
);
}
}

/**
Expand Down Expand Up @@ -50,7 +61,17 @@ default List<String> getSupportedPerformanceDataTypes() {
* in case of cpu info : [[user, kernel], [0.9, 1.3]]
*/
default List<List<Object>> getPerformanceData(String packageName, String dataType, int dataReadTimeout) {
return CommandExecutionHelper.execute(this,
getPerformanceDataCommand(packageName, dataType, dataReadTimeout));
final String extName = "mobile: getPerformanceData";
try {
return CommandExecutionHelper.executeScript(assertExtensionExists(extName), extName, ImmutableMap.of(
"packageName", packageName,
"dataType", dataType
));
} catch (UnsupportedCommandException e) {
// TODO: Remove the fallback
return CommandExecutionHelper.execute(
markExtensionAbsence(extName), getPerformanceDataCommand(packageName, dataType, dataReadTimeout)
);
}
}
}