Merge pull request #445 from wicherska/2.141

Version 2.141
bitbar · Apr 12, 2022 · cc65007 · cc65007
2 parents 0470825 + 51619ee
commit cc65007
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 79 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.testdroid</groupId>
     <artifactId>testdroid-api</artifactId>
-    <version>2.140</version>
+    <version>2.141</version>
     <packaging>jar</packaging>
     <name>Bitbar API v2</name>
     <url>https://github.com/bitbar/testdroid-api</url>

diff --git a/src/main/java/com/testdroid/api/model/APIDeviceSession.java b/src/main/java/com/testdroid/api/model/APIDeviceSession.java
@@ -44,8 +44,14 @@ public String getDisplayName() {
     @XmlType(namespace = "APIDeviceSession")
     public enum Type {
         AUTOMATIC,
-        MANUAL,
-        REMOTE
+        MANUAL, // TODO to be removed with >= 2.142
+        MANUAL_APP,
+        MANUAL_WEB,
+        REMOTE;
+
+        public boolean isManual() {
+            return this == MANUAL || this == MANUAL_APP || this == MANUAL_WEB;
+        }
     }
 
     @XmlType(namespace = "APIDeviceSession")

diff --git a/src/main/java/com/testdroid/api/model/APIDeviceSessionConfig.java b/src/main/java/com/testdroid/api/model/APIDeviceSessionConfig.java
@@ -26,7 +26,7 @@ public class APIDeviceSessionConfig extends APIEntity implements Serializable {
 
     private APITunnelSettings tunnelSettings;
 
-    private APIDeviceSession.Type type = APIDeviceSession.Type.MANUAL;
+    private APIDeviceSession.Type type;
 
     private String url;
 

diff --git a/src/main/java/com/testdroid/api/util/BitbarUtils.java b/src/main/java/com/testdroid/api/util/BitbarUtils.java
diff --git a/src/test/java/com/testdroid/api/APIUserAPIClientTest.java b/src/test/java/com/testdroid/api/APIUserAPIClientTest.java
@@ -26,7 +26,6 @@
 import static com.testdroid.api.model.APIFileConfig.Action.INSTALL;
 import static com.testdroid.api.model.APIFileConfig.Action.RUN_TEST;
 import static com.testdroid.api.model.APITestRun.State.WAITING;
-import static com.testdroid.api.util.BitbarUtils.loadFile;
 import static com.testdroid.cloud.test.categories.TestTags.API_CLIENT;
 import static java.lang.Integer.MAX_VALUE;
 import static java.util.Collections.singletonMap;

diff --git a/src/test/java/com/testdroid/api/BaseAPIClientTest.java b/src/test/java/com/testdroid/api/BaseAPIClientTest.java
@@ -12,6 +12,7 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.ArgumentsProvider;
 
+import java.io.File;
 import java.util.*;
 import java.util.stream.Stream;
 
@@ -123,4 +124,7 @@ static DefaultAPIClient createDefaultApiClientWithProxy(HttpHost proxy) throws A
         return new DefaultAPIClient(CLOUD_URL, user.getEmail(), USER_PASSWORD, proxy, false);
     }
 
+    static File loadFile(String name) {
+        return new File(BaseAPIClientTest.class.getResource(name).getFile());
+    }
 }