diff --git a/pom.xml b/pom.xml index 3a1337ca..7a06b5de 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.testdroid testdroid-api - 2.53 + 2.54 jar Testdroid API v2 https://github.com/bitbar/testdroid-api diff --git a/src/main/java/com/testdroid/api/APIEntity.java b/src/main/java/com/testdroid/api/APIEntity.java index 68637d6d..39852608 100644 --- a/src/main/java/com/testdroid/api/APIEntity.java +++ b/src/main/java/com/testdroid/api/APIEntity.java @@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonView; import com.testdroid.api.model.*; import com.testdroid.api.model.jrjc.*; -import com.testdroid.api.model.APIFileConfig; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; diff --git a/src/main/java/com/testdroid/api/APIFilter.java b/src/main/java/com/testdroid/api/APIFilter.java index 8d5f63c0..d2dabd73 100644 --- a/src/main/java/com/testdroid/api/APIFilter.java +++ b/src/main/java/com/testdroid/api/APIFilter.java @@ -32,7 +32,7 @@ public String serialize() { public static class APIFilterItem { - public static enum Operand { + public enum Operand { GT, AFTER, LT, @@ -48,7 +48,7 @@ public static enum Operand { AFTERORNULL } - public static enum Type { + public enum Type { N, D, S, diff --git a/src/main/java/com/testdroid/api/APISort.java b/src/main/java/com/testdroid/api/APISort.java index 3218c674..1e47f6cc 100644 --- a/src/main/java/com/testdroid/api/APISort.java +++ b/src/main/java/com/testdroid/api/APISort.java @@ -12,13 +12,13 @@ */ public class APISort { - public static enum Type { + public enum Type { ASC("a"), DESC("d"); private String urlValue; - private Type(String urlValue) { + Type(String urlValue) { this.urlValue = urlValue; } diff --git a/src/main/java/com/testdroid/api/model/APIAccountService.java b/src/main/java/com/testdroid/api/model/APIAccountService.java index 09d1a15b..65a49338 100644 --- a/src/main/java/com/testdroid/api/model/APIAccountService.java +++ b/src/main/java/com/testdroid/api/model/APIAccountService.java @@ -17,7 +17,7 @@ public class APIAccountService extends APIEntity { @XmlType(namespace = "APIAccountService") - public static enum DeactivateReason { + public enum DeactivateReason { INITIAL_FAILURE, CHARGE_FAILURE, CANCEL, diff --git a/src/main/java/com/testdroid/api/model/APIActivity.java b/src/main/java/com/testdroid/api/model/APIActivity.java index 606630fb..0c53db8b 100644 --- a/src/main/java/com/testdroid/api/model/APIActivity.java +++ b/src/main/java/com/testdroid/api/model/APIActivity.java @@ -13,7 +13,7 @@ public class APIActivity extends APIEntity { @XmlType(namespace = "APIActivity") - public static enum HttpMethod { + public enum HttpMethod { GET, HEAD, POST, diff --git a/src/main/java/com/testdroid/api/model/APIAdminDevice.java b/src/main/java/com/testdroid/api/model/APIAdminDevice.java index d23e37ae..dec2715d 100644 --- a/src/main/java/com/testdroid/api/model/APIAdminDevice.java +++ b/src/main/java/com/testdroid/api/model/APIAdminDevice.java @@ -14,7 +14,7 @@ public class APIAdminDevice extends APIEntity { @XmlType(namespace = "APIAdminDevice") - public static enum InitStep { + public enum InitStep { SKIP, REBOOT, REBOOT_WITH_UNLOCK, @@ -22,7 +22,7 @@ public static enum InitStep { } @XmlType(namespace = "APIAdminDevice") - public static enum State { + public enum State { ONLINE, OFFLINE } diff --git a/src/main/java/com/testdroid/api/model/APIAdminDeviceProblemPair.java b/src/main/java/com/testdroid/api/model/APIAdminDeviceProblemPair.java index f9add4ed..bb3425bd 100644 --- a/src/main/java/com/testdroid/api/model/APIAdminDeviceProblemPair.java +++ b/src/main/java/com/testdroid/api/model/APIAdminDeviceProblemPair.java @@ -13,7 +13,7 @@ public class APIAdminDeviceProblemPair extends APIEntity { @XmlType(namespace = "APIAdminDeviceProblemPair", name = "APIAdminDeviceProblemPairType") - public static enum Type { + public enum Type { OFFLINE, LOW_BATTERY, HIGH_FAIL_RATE, diff --git a/src/main/java/com/testdroid/api/model/APIAdminTestRun.java b/src/main/java/com/testdroid/api/model/APIAdminTestRun.java index d378e9eb..8a76152f 100644 --- a/src/main/java/com/testdroid/api/model/APIAdminTestRun.java +++ b/src/main/java/com/testdroid/api/model/APIAdminTestRun.java @@ -48,9 +48,8 @@ public APIAdminTestRun() { public APIAdminTestRun( Long id, Date createTime, Date startTime, Date endTime, APITestRun.State state, Long startedById, - String userName, String projectName, String testRunName, Boolean appCrawlerRun, Float successRatio, - Integer priority, Long projectId, Long duration, APITestRunConfig.Scheduler scheduler, Long frameworkId, - String frameworkName) { + String userName, String projectName, String testRunName, Float successRatio, Integer priority, + Long projectId, Long duration, Long frameworkId, String frameworkName) { super(id); this.createTime = createTime; this.startTime = startTime; @@ -60,16 +59,25 @@ public APIAdminTestRun( this.userName = userName; this.projectName = projectName; this.testRunName = testRunName; - this.appCrawlerRun = appCrawlerRun; this.successRatio = successRatio; this.priority = priority; this.projectId = projectId; this.duration = duration; - this.scheduler = scheduler; this.frameworkId = frameworkId; this.frameworkName = frameworkName; } + public APIAdminTestRun( + Long id, Date createTime, Date startTime, Date endTime, APITestRun.State state, Long startedById, + String userName, String projectName, String testRunName, Boolean appCrawlerRun, Float successRatio, + Integer priority, Long projectId, Long duration, APITestRunConfig.Scheduler scheduler, Long frameworkId, + String frameworkName) { + this(id, createTime, startTime, endTime, state, startedById, userName, projectName, testRunName, + successRatio, priority, projectId, duration, frameworkId, frameworkName); + this.appCrawlerRun = appCrawlerRun; + this.scheduler = scheduler; + } + public Date getEndTime() { return endTime; } diff --git a/src/main/java/com/testdroid/api/model/APICluster.java b/src/main/java/com/testdroid/api/model/APICluster.java index d04187c3..a36efbed 100644 --- a/src/main/java/com/testdroid/api/model/APICluster.java +++ b/src/main/java/com/testdroid/api/model/APICluster.java @@ -17,7 +17,7 @@ public class APICluster extends APIEntity { @XmlType(namespace = "APICluster", name = "APIClusterState") - public static enum State { + public enum State { OFFLINE, ONLINE } diff --git a/src/main/java/com/testdroid/api/model/APIDevice.java b/src/main/java/com/testdroid/api/model/APIDevice.java index 554812c5..4cdbef5a 100644 --- a/src/main/java/com/testdroid/api/model/APIDevice.java +++ b/src/main/java/com/testdroid/api/model/APIDevice.java @@ -19,21 +19,21 @@ public class APIDevice extends APIEntity { @XmlType @Deprecated - public static enum DeviceFilter { + public enum DeviceFilter { FREE, RECOMMENDED, NEW } @XmlType - public static enum DeviceGroupOrigin { + public enum DeviceGroupOrigin { STATIC, DYNAMIC, HYBRID } @XmlType(namespace = "APIDevice") - public static enum OsType { + public enum OsType { IOS("iOS"), ANDROID("Android"), UNDEFINED("Undefined"); diff --git a/src/main/java/com/testdroid/api/model/APIDeviceModelCriterion.java b/src/main/java/com/testdroid/api/model/APIDeviceModelCriterion.java index c9a5f76a..a43eb5a4 100644 --- a/src/main/java/com/testdroid/api/model/APIDeviceModelCriterion.java +++ b/src/main/java/com/testdroid/api/model/APIDeviceModelCriterion.java @@ -14,7 +14,7 @@ public class APIDeviceModelCriterion extends APIEntity { @XmlType(namespace = "APIDeviceModelCriterion") - public static enum Field { + public enum Field { NAME, FINGERPRINT, SERIAL_ID, diff --git a/src/main/java/com/testdroid/api/model/APIDeviceSession.java b/src/main/java/com/testdroid/api/model/APIDeviceSession.java index 2178020b..f9791f7d 100644 --- a/src/main/java/com/testdroid/api/model/APIDeviceSession.java +++ b/src/main/java/com/testdroid/api/model/APIDeviceSession.java @@ -15,20 +15,20 @@ public class APIDeviceSession extends APIEntity { @XmlType(namespace = "APIDeviceSession") - public static enum Type { + public enum Type { MANUAL, AUTOMATIC } @XmlType(namespace = "APIDeviceSession") - public static enum RetryState { + public enum RetryState { NONE, MANUAL, AUTO } @XmlType(namespace = "APIDeviceSession") - public static enum State { + public enum State { ABORTED, EXCLUDED, FAILED, diff --git a/src/main/java/com/testdroid/api/model/APIDeviceSessionDataAvailability.java b/src/main/java/com/testdroid/api/model/APIDeviceSessionDataAvailability.java index 70bbb1e1..ecc9a8a7 100644 --- a/src/main/java/com/testdroid/api/model/APIDeviceSessionDataAvailability.java +++ b/src/main/java/com/testdroid/api/model/APIDeviceSessionDataAvailability.java @@ -25,6 +25,10 @@ public class APIDeviceSessionDataAvailability extends APIEntity { public APIDeviceSessionDataAvailability() { } + public APIDeviceSessionDataAvailability(Long deviceRunId) { + this.deviceRunId = deviceRunId; + } + public APIDeviceSessionDataAvailability( Long deviceRunId, boolean logs, boolean performance, boolean screenshots, boolean buildLogs, boolean resultsDataZip) { diff --git a/src/main/java/com/testdroid/api/model/APIFileConfig.java b/src/main/java/com/testdroid/api/model/APIFileConfig.java index 7db80960..ec93169f 100644 --- a/src/main/java/com/testdroid/api/model/APIFileConfig.java +++ b/src/main/java/com/testdroid/api/model/APIFileConfig.java @@ -5,6 +5,7 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import java.io.Serializable; import java.util.Arrays; import java.util.List; @@ -12,10 +13,12 @@ * @author Michał Szpruta */ @XmlRootElement -public class APIFileConfig extends APIEntity { +public class APIFileConfig extends APIEntity implements Serializable { + + private static final long serialVersionUID = 1L; @XmlType(namespace = "APIFileConfig") - public static enum Action { + public enum Action { COPY_TO_DEVICE, INSTALL, RUN_TEST @@ -25,11 +28,16 @@ public static enum Action { private List availableActions = Arrays.asList(Action.values()); - private List tags; + private APIUserFile file; public APIFileConfig() { } + public APIFileConfig(Long id, Action action) { + super(id); + this.action = action; + } + public Action getAction() { return action; } @@ -46,12 +54,12 @@ public void setAvailableActions(List availableActions) { this.availableActions = availableActions; } - public List getTags() { - return tags; + public APIUserFile getFile() { + return file; } - public void setTags(List tags) { - this.tags = tags; + public void setFile(APIUserFile file) { + this.file = file; } @Override @@ -60,7 +68,7 @@ protected void clone(T from) { APIFileConfig original = (APIFileConfig) from; cloneBase(original); this.action = original.action; - this.tags = original.tags; this.availableActions = original.availableActions; + this.file = original.file; } } diff --git a/src/main/java/com/testdroid/api/model/APILicense.java b/src/main/java/com/testdroid/api/model/APILicense.java index d3ec0f86..c412acec 100644 --- a/src/main/java/com/testdroid/api/model/APILicense.java +++ b/src/main/java/com/testdroid/api/model/APILicense.java @@ -15,7 +15,7 @@ public class APILicense extends APIEntity { @XmlType(namespace = "APILicense") - public static enum Status { + public enum Status { ACTIVE, EXPIRED, INACTIVE diff --git a/src/main/java/com/testdroid/api/model/APIMarketShare.java b/src/main/java/com/testdroid/api/model/APIMarketShare.java index 2a4ada75..70ffcc81 100644 --- a/src/main/java/com/testdroid/api/model/APIMarketShare.java +++ b/src/main/java/com/testdroid/api/model/APIMarketShare.java @@ -10,7 +10,7 @@ public class APIMarketShare extends APIEntity { @XmlType(namespace = "APIMarketShare") - public static enum Type { + public enum Type { ANDROID_VERSION, IOS_VERSION, OPEN_GL_VERSION diff --git a/src/main/java/com/testdroid/api/model/APIProject.java b/src/main/java/com/testdroid/api/model/APIProject.java index fdf26d0e..8dad9157 100644 --- a/src/main/java/com/testdroid/api/model/APIProject.java +++ b/src/main/java/com/testdroid/api/model/APIProject.java @@ -21,14 +21,14 @@ public class APIProject extends APIEntity { @XmlType(namespace = "APIProject") - public static enum APIArchivingStrategy { + public enum APIArchivingStrategy { NEVER, DAYS, RUNS } @XmlType(namespace = "APIProject") - public static enum Type { + public enum Type { ANDROID(OsType.ANDROID, APIProjectJobConfig.Type.DEFAULT, "Android Instrumentation"), IOS(OsType.IOS, APIProjectJobConfig.Type.APPCRAWLER_IOS, "AppCrawler iOS"), UIAUTOMATOR(OsType.ANDROID, APIProjectJobConfig.Type.UIAUTOMATOR, "Android UIAutomator"), @@ -50,7 +50,7 @@ public static enum Type { private String title; - private Type(OsType osType, APIProjectJobConfig.Type jobConfigType, String title) { + Type(OsType osType, APIProjectJobConfig.Type jobConfigType, String title) { this.osType = osType; this.jobConfigType = jobConfigType; this.title = title; @@ -420,7 +420,7 @@ public APITestRun runWithConfig( Long dataFileId) throws APIException { Map body = new HashMap<>(); body.put("scheduler", config.getScheduler() != null ? config.getScheduler().name() : null); - body.put("appCrawlerRun", config.getAppCrawlerRun()); + body.put("appCrawlerRun", config.isAppCrawlerRun()); body.put("autoScreenshots", config.isAutoScreenshots()); body.put("screenshotDir", config.getScreenshotDir()); body.put("limitationType", config.getLimitationType() != null ? config.getLimitationType().name() : null); diff --git a/src/main/java/com/testdroid/api/model/APIProjectJobConfig.java b/src/main/java/com/testdroid/api/model/APIProjectJobConfig.java index 6eec5c24..38882f8a 100644 --- a/src/main/java/com/testdroid/api/model/APIProjectJobConfig.java +++ b/src/main/java/com/testdroid/api/model/APIProjectJobConfig.java @@ -16,7 +16,7 @@ public class APIProjectJobConfig extends APIEntity { @XmlType(namespace = "APIProjectJobConfig") - public static enum Type { + public enum Type { DEFAULT(APIDevice.OsType.ANDROID, "Android instrumentation"), INSTATEST(APIDevice.OsType.ANDROID, "Android App Crawler"), INTERACTIVE(APIDevice.OsType.ANDROID, "Testdroid Interactive"), diff --git a/src/main/java/com/testdroid/api/model/APIScreenshot.java b/src/main/java/com/testdroid/api/model/APIScreenshot.java index 6331b066..c8d0b1d0 100644 --- a/src/main/java/com/testdroid/api/model/APIScreenshot.java +++ b/src/main/java/com/testdroid/api/model/APIScreenshot.java @@ -16,7 +16,7 @@ public class APIScreenshot extends APIEntity { @XmlType(namespace = "APIScreenshot") - public static enum Type { + public enum Type { LANDSCAPE, PORTRAIT } diff --git a/src/main/java/com/testdroid/api/model/APIServicePaymentStatus.java b/src/main/java/com/testdroid/api/model/APIServicePaymentStatus.java index f24d2049..0d5b6f7e 100644 --- a/src/main/java/com/testdroid/api/model/APIServicePaymentStatus.java +++ b/src/main/java/com/testdroid/api/model/APIServicePaymentStatus.java @@ -10,7 +10,7 @@ public class APIServicePaymentStatus { @XmlType(name = "APIServicePaymentStatus") - public static enum Status { + public enum Status { SUCCEEDED, FAILED, REDIRECTED diff --git a/src/main/java/com/testdroid/api/model/APITestCaseRun.java b/src/main/java/com/testdroid/api/model/APITestCaseRun.java index 4e13bb98..4b5206ee 100644 --- a/src/main/java/com/testdroid/api/model/APITestCaseRun.java +++ b/src/main/java/com/testdroid/api/model/APITestCaseRun.java @@ -15,7 +15,7 @@ public class APITestCaseRun extends APIEntity { @XmlType(namespace = "APITestCaseRun") - public static enum Result { + public enum Result { PASSED, FAILED, SKIPPED, diff --git a/src/main/java/com/testdroid/api/model/APITestCaseRunStep.java b/src/main/java/com/testdroid/api/model/APITestCaseRunStep.java index 6c2a624e..fb0e2ccc 100644 --- a/src/main/java/com/testdroid/api/model/APITestCaseRunStep.java +++ b/src/main/java/com/testdroid/api/model/APITestCaseRunStep.java @@ -14,7 +14,7 @@ public class APITestCaseRunStep extends APIEntity { @XmlType(namespace = "APITestCaseRunStep") - public static enum Type { + public enum Type { ASSERTION, CLICK, CONFIG, diff --git a/src/main/java/com/testdroid/api/model/APITestRun.java b/src/main/java/com/testdroid/api/model/APITestRun.java index 5fda5c42..528f9f0f 100644 --- a/src/main/java/com/testdroid/api/model/APITestRun.java +++ b/src/main/java/com/testdroid/api/model/APITestRun.java @@ -16,7 +16,7 @@ public class APITestRun extends APIEntity { @XmlType(namespace = "APITestRun", name = "APITestRunState") - public static enum State { + public enum State { WAITING, RUNNING, FINISHED @@ -78,6 +78,8 @@ public static enum State { private String gamebenchResultsUrl; + private String gamebenchJobId; + private Long frameworkId; private String frameworkName; @@ -93,7 +95,7 @@ public APITestRun( Integer totalDeviceCount, Integer finishedDeviceCount, Integer excludedDeviceCount, Integer errorsDeviceCount, Integer succeededDeviceCount, Integer runningDeviceCount, Integer warningDeviceCount, Integer waitingDeviceCount, Integer abortedDeviceCount, - Integer timeoutedDeviceCount, String gamebenchResultsUrl, Long frameworkId, String frameworkName) { + Integer timeoutedDeviceCount, String gamebenchJobId, Long frameworkId, String frameworkName) { super(id); this.number = number; this.createTime = createTime; @@ -121,7 +123,7 @@ public APITestRun( this.waitingDeviceCount = waitingDeviceCount; this.abortedDeviceCount = abortedDeviceCount; this.timeoutedDeviceCount = timeoutedDeviceCount; - this.gamebenchResultsUrl = gamebenchResultsUrl; + this.gamebenchJobId = gamebenchJobId; this.frameworkId = frameworkId; this.frameworkName = frameworkName; } @@ -379,6 +381,14 @@ public void setGamebenchResultsUrl(String gamebenchResultsUrl) { this.gamebenchResultsUrl = gamebenchResultsUrl; } + public String getGamebenchJobId() { + return gamebenchJobId; + } + + public void setGamebenchJobId(String gamebenchJobId) { + this.gamebenchJobId = gamebenchJobId; + } + public Long getUserId() { return userId; } @@ -562,6 +572,7 @@ protected void clone(T from) { this.waitingDeviceCount = apiTestRun.waitingDeviceCount; this.abortedDeviceCount = apiTestRun.abortedDeviceCount; this.timeoutedDeviceCount = apiTestRun.timeoutedDeviceCount; + this.gamebenchJobId = apiTestRun.gamebenchJobId; this.gamebenchResultsUrl = apiTestRun.gamebenchResultsUrl; this.frameworkId = apiTestRun.frameworkId; this.frameworkName = apiTestRun.frameworkName; diff --git a/src/main/java/com/testdroid/api/model/APITestRunConfig.java b/src/main/java/com/testdroid/api/model/APITestRunConfig.java index d5456eb3..3f479eec 100644 --- a/src/main/java/com/testdroid/api/model/APITestRunConfig.java +++ b/src/main/java/com/testdroid/api/model/APITestRunConfig.java @@ -8,24 +8,25 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.io.Serializable; +import java.util.*; /** * @author Łukasz Kajda */ @XmlRootElement -public class APITestRunConfig extends APIEntity { +public class APITestRunConfig extends APIEntity implements Serializable { + + private static final long serialVersionUID = 1L; @XmlType(namespace = "APITestRunConfig") - public static enum LimitationType { + public enum LimitationType { PACKAGE, CLASS } @XmlType(namespace = "APITestRunConfig") - public static enum Scheduler { + public enum Scheduler { PARALLEL, SERIAL, SINGLE @@ -35,7 +36,7 @@ public static enum Scheduler { private String appiumBrokerAddress; - private boolean appRequired; + private boolean appRequired = true; private String applicationPassword; @@ -45,9 +46,9 @@ public static enum Scheduler { private Long creditsPrice; - private String deviceLanguageCode; + private String deviceLanguageCode = Locale.US.toString(); - private boolean useAdditionalFiles; + private boolean useAdditionalFiles = true; private boolean videoRecordingEnabled; @@ -55,19 +56,19 @@ public static enum Scheduler { private String instrumentationRunner; - private boolean launchApp; + private boolean launchApp = true; private LimitationType limitationType; private String limitationValue; - private Boolean appCrawlerRun; + private boolean appCrawlerRun; private Long projectId; private boolean runAvailable; - private Scheduler scheduler; + private Scheduler scheduler = Scheduler.PARALLEL; private String screenshotDir; @@ -93,16 +94,29 @@ public static enum Scheduler { private List availableFrameworks; - private List files; + private List files = new ArrayList<>(); private APIDevice.OsType osType = APIDevice.OsType.UNDEFINED; - private List testRunParameters; + private List testRunParameters = new ArrayList<>(); private List deviceIds; private String status; + private int statusCode; + + private String testRunName; + + private Long testRunId; + + private String deviceNamePattern; + + private String projectName; + + @JsonIgnore + private List computedDevices; + public APITestRunConfig() { } @@ -158,11 +172,11 @@ public void setScheduler(Scheduler scheduler) { this.scheduler = scheduler; } - public Boolean getAppCrawlerRun() { + public boolean isAppCrawlerRun() { return appCrawlerRun; } - public void setAppCrawlerRun(Boolean appCrawlerRun) { + public void setAppCrawlerRun(boolean appCrawlerRun) { this.appCrawlerRun = appCrawlerRun; } @@ -434,6 +448,46 @@ public void setDeviceIds(List deviceIds) { this.deviceIds = deviceIds; } + public String getTestRunName() { + return testRunName; + } + + public void setTestRunName(String testRunName) { + this.testRunName = testRunName; + } + + public Long getTestRunId() { + return testRunId; + } + + public void setTestRunId(Long testRunId) { + this.testRunId = testRunId; + } + + public String getDeviceNamePattern() { + return deviceNamePattern; + } + + public void setDeviceNamePattern(String deviceNamePattern) { + this.deviceNamePattern = deviceNamePattern; + } + + public String getProjectName() { + return projectName; + } + + public void setProjectName(String projectName) { + this.projectName = projectName; + } + + public int getStatusCode() { + return statusCode; + } + + public void setStatusCode(int statusCode) { + this.statusCode = statusCode; + } + @JsonIgnore public APITestRunParameter createParameter(final String key, final String value) throws APIException { Map body = new HashMap<>(); @@ -457,6 +511,15 @@ public void deleteParameter(long parameterId) throws APIException { deleteResource(String.format("%s/%s", getParametersURI(), parameterId)); } + @SuppressWarnings("unchecked") + public List getComputedDevices() { + return (List) computedDevices; + } + + public void setComputedDevices(List computedDevices) { + this.computedDevices = computedDevices; + } + public void update() throws APIException { Map body = new HashMap<>(); body.put("scheduler", scheduler != null ? scheduler.name() : null); @@ -525,5 +588,9 @@ protected void clone(T from) { this.osType = apiTestRunConfig.osType; this.testRunParameters = apiTestRunConfig.testRunParameters; this.deviceIds = apiTestRunConfig.deviceIds; + this.testRunName = apiTestRunConfig.testRunName; + this.testRunId = apiTestRunConfig.testRunId; + this.projectName = apiTestRunConfig.projectName; + this.statusCode = apiTestRunConfig.statusCode; } } diff --git a/src/main/java/com/testdroid/api/model/APITestRunExtended.java b/src/main/java/com/testdroid/api/model/APITestRunExtended.java index 5e6a49c0..63d6b3bb 100644 --- a/src/main/java/com/testdroid/api/model/APITestRunExtended.java +++ b/src/main/java/com/testdroid/api/model/APITestRunExtended.java @@ -32,13 +32,13 @@ public APITestRunExtended( Integer totalDeviceCount, Integer finishedDeviceCount, Integer excludedDeviceCount, Integer errorsDeviceCount, Integer succeededDeviceCount, Integer runningDeviceCount, Integer warningDeviceCount, Integer waitingDeviceCount, Integer abortedDeviceCount, - Integer timeoutedDeviceCount, String gamebenchResultsUrl, Long frameworkId, String frameworkName) { + Integer timeoutedDeviceCount, String gamebenchJobId, Long frameworkId, String frameworkName) { super(id, number, createTime, displayName, executionRatio, successRatio, startedById, startedByDisplayName, state, userId, projectId, screenshotsFileId, logsFileId, testCaseCount, successfulTestCaseCount, failedTestCaseCount, totalDeviceCount, finishedDeviceCount, excludedDeviceCount, errorsDeviceCount, succeededDeviceCount, runningDeviceCount, warningDeviceCount, waitingDeviceCount, abortedDeviceCount, timeoutedDeviceCount, - gamebenchResultsUrl, frameworkId, frameworkName); + gamebenchJobId, frameworkId, frameworkName); this.deviceCount = totalDeviceCount; } diff --git a/src/main/java/com/testdroid/api/model/APITestRunParameter.java b/src/main/java/com/testdroid/api/model/APITestRunParameter.java index b90e7afd..c109a3f2 100644 --- a/src/main/java/com/testdroid/api/model/APITestRunParameter.java +++ b/src/main/java/com/testdroid/api/model/APITestRunParameter.java @@ -4,12 +4,15 @@ import com.testdroid.api.APIEntity; import javax.xml.bind.annotation.XmlRootElement; +import java.io.Serializable; /** * @author Łukasz Kajda */ @XmlRootElement -public class APITestRunParameter extends APIEntity { +public class APITestRunParameter extends APIEntity implements Serializable { + + private static final long serialVersionUID = 1L; private String key; diff --git a/src/main/java/com/testdroid/api/model/APIUser.java b/src/main/java/com/testdroid/api/model/APIUser.java index 95796cd9..1396e128 100644 --- a/src/main/java/com/testdroid/api/model/APIUser.java +++ b/src/main/java/com/testdroid/api/model/APIUser.java @@ -16,14 +16,14 @@ @XmlRootElement public class APIUser extends APIEntity { - public static enum Status { + public enum Status { INACTIVE("Inactive"), DISABLED("Disabled"), ENABLED("Enabled"); private String displayName; - private Status(String displayName) { + Status(String displayName) { this.displayName = displayName; } @@ -87,14 +87,14 @@ public String getDisplayName() { @Deprecated @XmlType(namespace = "APIUser", name = "APIUserEmailNotification") - public static enum EmailNotification { + public enum EmailNotification { ALWAYS("always"), NEVER("never"), ON_FAILURE("on failure"); private String displayName; - private EmailNotification(String displayName) { + EmailNotification(String displayName) { this.displayName = displayName; } diff --git a/src/main/java/com/testdroid/api/model/APIUserFile.java b/src/main/java/com/testdroid/api/model/APIUserFile.java index 100c2e60..fb9a4c24 100644 --- a/src/main/java/com/testdroid/api/model/APIUserFile.java +++ b/src/main/java/com/testdroid/api/model/APIUserFile.java @@ -8,6 +8,7 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; import java.io.InputStream; +import java.io.Serializable; import java.net.URL; import java.util.Date; @@ -16,7 +17,9 @@ * @author Slawomir Pawluk */ @XmlRootElement -public class APIUserFile extends APIEntity { +public class APIUserFile extends APIEntity implements Serializable { + + private static final long serialVersionUID = 1L; private Date createTime; @@ -45,20 +48,20 @@ public class APIUserFile extends APIEntity { private transient String iconUri; @XmlType(namespace = "APIUserFile") - public static enum InputType { + public enum InputType { APPLICATION, TEST, DATA } @XmlType(namespace = "APIUserFile") - public static enum Direction { + public enum Direction { INPUT, OUTPUT } @XmlType(namespace = "APIUserFile", name = "APIUserFileState") - public static enum State { + public enum State { PREPARING, READY } diff --git a/src/main/java/com/testdroid/api/model/APIUserFileProperty.java b/src/main/java/com/testdroid/api/model/APIUserFileProperty.java index dd4a138c..2dadd2b6 100644 --- a/src/main/java/com/testdroid/api/model/APIUserFileProperty.java +++ b/src/main/java/com/testdroid/api/model/APIUserFileProperty.java @@ -3,13 +3,16 @@ import com.testdroid.api.APIEntity; import javax.xml.bind.annotation.XmlRootElement; +import java.io.Serializable; /** * @author Michał Szpruta * @author Slawomir Pawluk */ @XmlRootElement -public class APIUserFileProperty extends APIEntity { +public class APIUserFileProperty extends APIEntity implements Serializable { + + private static final long serialVersionUID = 1L; private String key;