Fix #393 (#394)

saucelabs · Jun 21, 2023 · 092a28a · 092a28a
2 parents 4c5dd2c + 02acb25
commit 092a28a
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 47 deletions.
diff --git a/src/main/java/com/saucelabs/saucerest/DataCenter.java b/src/main/java/com/saucelabs/saucerest/DataCenter.java
@@ -4,9 +4,7 @@
 
 public enum DataCenter {
     US_WEST("https://saucelabs.com/", "https://api.us-west-1.saucelabs.com/", "https://app.saucelabs.com/"),
-    EU_CENTRAL("https://eu-central-1.saucelabs.com/", "https://api.eu-central-1.saucelabs.com/", "https://app.eu-central-1.saucelabs.com/"),
-    US_EAST("https://us-east-1.saucelabs.com/", "https://api.us-east-1.saucelabs.com/", "https://app.us-east-1.saucelabs.com/"),
-    APAC_SOUTHEAST("https://apac-southeast-1.saucelabs.com/", "https://api.apac-southeast-1.saucelabs.com/", "https://app.apac-southeast-1.saucelabs.com/");
+    EU_CENTRAL("https://eu-central-1.saucelabs.com/", "https://api.eu-central-1.saucelabs.com/", "https://app.eu-central-1.saucelabs.com/");
 
     public final String server;
     public final String apiServer;
@@ -37,4 +35,4 @@ public String appServer() {
     public static DataCenter fromString(String dataCenter) {
         return Stream.of(values()).filter(dc -> dc.name().equalsIgnoreCase(dataCenter)).findFirst().orElse(null);
     }
-}
+}
diff --git a/src/main/java/com/saucelabs/saucerest/model/accounts/Settings.java b/src/main/java/com/saucelabs/saucerest/model/accounts/Settings.java
@@ -52,14 +52,16 @@ public class Settings {
     public Integer virtualMachines;
     @Json(name = "vm_lockdown")
     public Boolean vmLockdown;
+    @Json(name = "sso_legacy_enabled")
+    public Boolean ssoLegacyEnabled;
 
     /**
      * No args constructor for use in serialization
      */
     public Settings() {
     }
 
-    public Settings(Boolean allowIntegrationsPage, Boolean canUseTunnelsWithPublicRealDevices, String country, Boolean disableEmailVerification, Boolean groupsEnabled, Object jitDefaultTeam, String jitUsernamePrefix, Boolean jobsCrossTeamSharing, Boolean liveOnly, String logoutUrl, Integer macVirtualMachines, Boolean performanceEnabled, Boolean rdcEnabled, Integer realDevices, Boolean ssoEnabled, Boolean ssoOnly, Integer teamLimit, Boolean teamLimitReached, Object toPlan, Object trialPeriod, Boolean tunnelsLockdown, String userType, Integer virtualMachines, Boolean vmLockdown) {
+    public Settings(Boolean allowIntegrationsPage, Boolean canUseTunnelsWithPublicRealDevices, String country, Boolean disableEmailVerification, Boolean groupsEnabled, Object jitDefaultTeam, String jitUsernamePrefix, Boolean jobsCrossTeamSharing, Boolean liveOnly, String logoutUrl, Integer macVirtualMachines, Boolean performanceEnabled, Boolean rdcEnabled, Integer realDevices, Boolean ssoEnabled, Boolean ssoOnly, Integer teamLimit, Boolean teamLimitReached, Object toPlan, Object trialPeriod, Boolean tunnelsLockdown, String userType, Integer virtualMachines, Boolean vmLockdown, Boolean ssoLegacyEnabled) {
         super();
         this.allowIntegrationsPage = allowIntegrationsPage;
         this.canUseTunnelsWithPublicRealDevices = canUseTunnelsWithPublicRealDevices;
@@ -85,6 +87,7 @@ public Settings(Boolean allowIntegrationsPage, Boolean canUseTunnelsWithPublicRe
         this.userType = userType;
         this.virtualMachines = virtualMachines;
         this.vmLockdown = vmLockdown;
+        this.ssoLegacyEnabled = ssoLegacyEnabled;
     }
 
     private Settings(Builder builder) {

diff --git a/src/main/java/com/saucelabs/saucerest/model/realdevices/DeviceJob.java b/src/main/java/com/saucelabs/saucerest/model/realdevices/DeviceJob.java
@@ -92,11 +92,13 @@ public class DeviceJob {
     public String crashLogUrl;
     @Json(name = "used_cached_device")
     public Boolean usedCachedDevice;
+    @Json(name = "backtrace_url")
+    public String backtraceUrl;
 
     public DeviceJob() {
     }
 
-    public DeviceJob(ApplicationSummary applicationSummary, Object assignedTunnelId, String deviceType, String ownerSauce, String automationBackend, BaseConfig baseConfig, String build, Boolean collectsAutomatorLog, String consolidatedStatus, Long creationTime, DeviceDescriptor deviceDescriptor, Long endTime, Object error, String id, String frameworkLogUrl, String deviceLogUrl, String requestsUrl, Object testCasesUrl, Object junitLogUrl, Boolean manual, Long modificationTime, String name, String os, String osVersion, String deviceName, Boolean passed, Boolean proxied, Boolean recordScreenshots, List<Object> screenshots, Boolean recordVideo, Long startTime, String status, List<Object> tags, String videoUrl, String remoteAppFileUrl, String appiumSessionId, Object deviceSessionId, String client, String networkLogUrl, String testfairyLogUrl, String testReportType, String crashLogUrl, Boolean usedCachedDevice) {
+    public DeviceJob(ApplicationSummary applicationSummary, Object assignedTunnelId, String deviceType, String ownerSauce, String automationBackend, BaseConfig baseConfig, String build, Boolean collectsAutomatorLog, String consolidatedStatus, Long creationTime, DeviceDescriptor deviceDescriptor, Long endTime, Object error, String id, String frameworkLogUrl, String deviceLogUrl, String requestsUrl, Object testCasesUrl, Object junitLogUrl, Boolean manual, Long modificationTime, String name, String os, String osVersion, String deviceName, Boolean passed, Boolean proxied, Boolean recordScreenshots, List<Object> screenshots, Boolean recordVideo, Long startTime, String status, List<Object> tags, String videoUrl, String remoteAppFileUrl, String appiumSessionId, Object deviceSessionId, String client, String networkLogUrl, String testfairyLogUrl, String testReportType, String crashLogUrl, Boolean usedCachedDevice, String backtraceUrl) {
         super();
         this.applicationSummary = applicationSummary;
         this.assignedTunnelId = assignedTunnelId;
@@ -141,5 +143,6 @@ public DeviceJob(ApplicationSummary applicationSummary, Object assignedTunnelId,
         this.testReportType = testReportType;
         this.crashLogUrl = crashLogUrl;
         this.usedCachedDevice = usedCachedDevice;
+        this.backtraceUrl = backtraceUrl;
     }
 }
diff --git a/src/main/java/com/saucelabs/saucerest/model/storage/ItemInteger.java b/src/main/java/com/saucelabs/saucerest/model/storage/ItemInteger.java
@@ -19,17 +19,20 @@ public class ItemInteger {
     public Access access;
     @Json(name = "settings")
     public Settings settings;
+    @Json(name = "project_path")
+    public String projectPath;
 
     public ItemInteger() {
     }
 
-    public ItemInteger(Integer id, String name, Recent recent, Integer count, Access access, Settings settings) {
+    public ItemInteger(Integer id, String name, Recent recent, Integer count, Access access, Settings settings, String projectPath) {
         super();
         this.id = id;
         this.name = name;
         this.recent = recent;
         this.count = count;
         this.access = access;
         this.settings = settings;
+        this.projectPath = projectPath;
     }
 }
diff --git a/src/main/java/com/saucelabs/saucerest/model/storage/Metadata.java b/src/main/java/com/saucelabs/saucerest/model/storage/Metadata.java
@@ -36,11 +36,13 @@ public class Metadata {
     public Integer targetSdk;
     @Json(name = "test_runner_class")
     public Object testRunnerClass;
+    @Json(name = "icon_hash")
+    public String iconHash;
 
     public Metadata() {
     }
 
-    public Metadata(String identifier, String name, String version, Boolean isTestRunner, String icon, String shortVersion, Boolean isSimulator, String minOs, String targetOs, Object testRunnerPluginPath, List<String> deviceFamily, Integer versionCode, Integer minSdk, Integer targetSdk, Object testRunnerClass) {
+    public Metadata(String identifier, String name, String version, Boolean isTestRunner, String icon, String shortVersion, Boolean isSimulator, String minOs, String targetOs, Object testRunnerPluginPath, List<String> deviceFamily, Integer versionCode, Integer minSdk, Integer targetSdk, Object testRunnerClass, String iconHash) {
         super();
         this.identifier = identifier;
         this.name = name;
@@ -57,5 +59,6 @@ public Metadata(String identifier, String name, String version, Boolean isTestRu
         this.minSdk = minSdk;
         this.targetSdk = targetSdk;
         this.testRunnerClass = testRunnerClass;
+        this.iconHash = iconHash;
     }
 }
diff --git a/src/test/java/com/saucelabs/saucerest/integration/AccountsEndpointTest.java b/src/test/java/com/saucelabs/saucerest/integration/AccountsEndpointTest.java
@@ -141,7 +141,7 @@ public void getOrganizationTest(DataCenter dataCenter) throws IOException {
     }
 
     @ParameterizedTest
-    @EnumSource(value = DataCenter.class, names = {"US_EAST"}, mode = EnumSource.Mode.EXCLUDE)
+    @EnumSource(DataCenter.class)
     public void createTeamTest(DataCenter dataCenter) throws IOException {
         SauceREST sauceREST = new SauceREST(dataCenter);
         AccountsEndpoint accountsEndpoint = sauceREST.getAccountsEndpoint();
@@ -160,7 +160,7 @@ public void createTeamTest(DataCenter dataCenter) throws IOException {
     }
 
     @ParameterizedTest
-    @EnumSource(value = DataCenter.class, names = {"US_EAST"}, mode = EnumSource.Mode.EXCLUDE)
+    @EnumSource(DataCenter.class)
     public void updateTeamTest(DataCenter dataCenter) throws IOException {
         SauceREST sauceREST = new SauceREST(dataCenter);
         AccountsEndpoint accountsEndpoint = sauceREST.getAccountsEndpoint();
@@ -184,7 +184,7 @@ public void updateTeamTest(DataCenter dataCenter) throws IOException {
     }
 
     @ParameterizedTest
-    @EnumSource(value = DataCenter.class, names = {"US_EAST"}, mode = EnumSource.Mode.EXCLUDE)
+    @EnumSource(DataCenter.class)
     public void partiallyUpdateTeamTest(DataCenter dataCenter) throws IOException {
         SauceREST sauceREST = new SauceREST(dataCenter);
         AccountsEndpoint accountsEndpoint = sauceREST.getAccountsEndpoint();
@@ -210,7 +210,7 @@ public void partiallyUpdateTeamTest(DataCenter dataCenter) throws IOException {
     }
 
     @ParameterizedTest
-    @EnumSource(value = DataCenter.class, names = {"US_EAST"}, mode = EnumSource.Mode.EXCLUDE)
+    @EnumSource(DataCenter.class)
     public void getTeamMembersTest(DataCenter dataCenter) throws IOException {
         SauceREST sauceREST = new SauceREST(dataCenter);
         AccountsEndpoint accountsEndpoint = sauceREST.getAccountsEndpoint();
@@ -222,7 +222,7 @@ public void getTeamMembersTest(DataCenter dataCenter) throws IOException {
     }
 
     @ParameterizedTest
-    @EnumSource(value = DataCenter.class, names = {"US_EAST"}, mode = EnumSource.Mode.EXCLUDE)
+    @EnumSource(DataCenter.class)
     public void resetAccessKeyTeam(DataCenter dataCenter) throws IOException {
         SauceREST sauceREST = new SauceREST(dataCenter);
         AccountsEndpoint accountsEndpoint = sauceREST.getAccountsEndpoint();
@@ -242,7 +242,7 @@ public void resetAccessKeyTeam(DataCenter dataCenter) throws IOException {
     }
 
     @ParameterizedTest
-    @EnumSource(value = DataCenter.class, names = {"US_EAST"}, mode = EnumSource.Mode.EXCLUDE)
+    @EnumSource(DataCenter.class)
     public void lookupUsersWithParametersTest(DataCenter dataCenter) throws IOException {
         SauceREST sauceREST = new SauceREST(dataCenter);
         AccountsEndpoint accountsEndpoint = sauceREST.getAccountsEndpoint();
@@ -257,7 +257,7 @@ public void lookupUsersWithParametersTest(DataCenter dataCenter) throws IOExcept
     }
 
     @ParameterizedTest
-    @EnumSource(value = DataCenter.class, names = {"US_EAST"}, mode = EnumSource.Mode.EXCLUDE)
+    @EnumSource(DataCenter.class)
     public void getUserTest(DataCenter dataCenter) throws IOException {
         SauceREST sauceREST = new SauceREST(dataCenter);
         AccountsEndpoint accountsEndpoint = sauceREST.getAccountsEndpoint();
@@ -269,7 +269,7 @@ public void getUserTest(DataCenter dataCenter) throws IOException {
     }
 
     @ParameterizedTest
-    @EnumSource(value = DataCenter.class, names = {"US_EAST"}, mode = EnumSource.Mode.EXCLUDE)
+    @EnumSource(DataCenter.class)
     public void createUserTest(DataCenter dataCenter) throws IOException {
         SauceREST sauceREST = new SauceREST(dataCenter);
         AccountsEndpoint accountsEndpoint = sauceREST.getAccountsEndpoint();
@@ -281,7 +281,7 @@ public void createUserTest(DataCenter dataCenter) throws IOException {
     }
 
     @ParameterizedTest
-    @EnumSource(value = DataCenter.class, names = {"US_EAST"}, mode = EnumSource.Mode.EXCLUDE)
+    @EnumSource(DataCenter.class)
     public void updateUserTest(DataCenter dataCenter) throws IOException {
         SauceREST sauceREST = new SauceREST(dataCenter);
         AccountsEndpoint accountsEndpoint = sauceREST.getAccountsEndpoint();
@@ -305,7 +305,7 @@ public void updateUserTest(DataCenter dataCenter) throws IOException {
     }
 
     @ParameterizedTest
-    @EnumSource(value = DataCenter.class, names = {"US_EAST"}, mode = EnumSource.Mode.EXCLUDE)
+    @EnumSource(DataCenter.class)
     public void partiallyUpdateUserTest(DataCenter dataCenter) throws IOException {
         SauceREST sauceREST = new SauceREST(dataCenter);
         AccountsEndpoint accountsEndpoint = sauceREST.getAccountsEndpoint();
@@ -324,7 +324,7 @@ public void partiallyUpdateUserTest(DataCenter dataCenter) throws IOException {
     }
 
     @ParameterizedTest
-    @EnumSource(value = DataCenter.class, names = {"US_EAST", "APAC_SOUTHEAST"}, mode = EnumSource.Mode.EXCLUDE)
+    @EnumSource(DataCenter.class)
     public void getUserConcurrencyTest(DataCenter dataCenter) throws IOException {
         SauceREST sauceREST = new SauceREST(dataCenter);
         AccountsEndpoint accountsEndpoint = sauceREST.getAccountsEndpoint();
@@ -337,7 +337,7 @@ public void getUserConcurrencyTest(DataCenter dataCenter) throws IOException {
     }
 
     @ParameterizedTest
-    @EnumSource(value = DataCenter.class, names = {"US_EAST"}, mode = EnumSource.Mode.EXCLUDE)
+    @EnumSource(DataCenter.class)
     public void getUsersTeamTest(DataCenter dataCenter) throws IOException {
         SauceREST sauceREST = new SauceREST(dataCenter);
         AccountsEndpoint accountsEndpoint = sauceREST.getAccountsEndpoint();
@@ -357,7 +357,7 @@ public void getUsersTeamTest(DataCenter dataCenter) throws IOException {
 
     @Disabled("Need to find a way to reliably get a user with a team.")
     @ParameterizedTest
-    @EnumSource(value = DataCenter.class, names = {"US_EAST"}, mode = EnumSource.Mode.EXCLUDE)
+    @EnumSource(DataCenter.class)
     public void setRoleTest(DataCenter dataCenter) throws IOException {
         SauceREST sauceREST = new SauceREST(dataCenter);
         AccountsEndpoint accountsEndpoint = sauceREST.getAccountsEndpoint();
@@ -402,7 +402,7 @@ public void setRoleTest(DataCenter dataCenter) throws IOException {
     }
 
     @ParameterizedTest
-    @EnumSource(value = DataCenter.class, names = {"US_EAST"}, mode = EnumSource.Mode.EXCLUDE)
+    @EnumSource(DataCenter.class)
     public void deactivateUserTest(DataCenter dataCenter) throws IOException {
         SauceREST sauceREST = new SauceREST(dataCenter);
         AccountsEndpoint accountsEndpoint = sauceREST.getAccountsEndpoint();
@@ -419,7 +419,7 @@ public void deactivateUserTest(DataCenter dataCenter) throws IOException {
     }
 
     @ParameterizedTest
-    @EnumSource(value = DataCenter.class, names = {"US_EAST"}, mode = EnumSource.Mode.EXCLUDE)
+    @EnumSource(DataCenter.class)
     public void activateUserTest(DataCenter dataCenter) throws IOException {
         SauceREST sauceREST = new SauceREST(dataCenter);
         AccountsEndpoint accountsEndpoint = sauceREST.getAccountsEndpoint();
@@ -438,7 +438,7 @@ public void activateUserTest(DataCenter dataCenter) throws IOException {
     }
 
     @ParameterizedTest
-    @EnumSource(value = DataCenter.class, names = {"US_EAST"}, mode = EnumSource.Mode.EXCLUDE)
+    @EnumSource(DataCenter.class)
     public void resetAccessKeyTest(DataCenter dataCenter) throws IOException {
         SauceREST sauceREST = new SauceREST(dataCenter);
         AccountsEndpoint accountsEndpoint = sauceREST.getAccountsEndpoint();
@@ -456,7 +456,7 @@ public void resetAccessKeyTest(DataCenter dataCenter) throws IOException {
     }
 
     @ParameterizedTest
-    @EnumSource(value = DataCenter.class, names = {"US_EAST"}, mode = EnumSource.Mode.EXCLUDE)
+    @EnumSource(DataCenter.class)
     public void getAccessKeyTest(DataCenter dataCenter) throws IOException {
         SauceREST sauceREST = new SauceREST(dataCenter);
         AccountsEndpoint accountsEndpoint = sauceREST.getAccountsEndpoint();

diff --git a/src/test/java/com/saucelabs/saucerest/integration/SauceConnectEndpointTest.java b/src/test/java/com/saucelabs/saucerest/integration/SauceConnectEndpointTest.java
@@ -81,7 +81,7 @@ public void getLatestVersionWithoutCredentialsTest(DataCenter dataCenter) throws
     }
 
     @ParameterizedTest
-    @EnumSource(value = DataCenter.class, names = {"EU_CENTRAL", "US_WEST", "APAC_SOUTHEAST"}, mode = EnumSource.Mode.INCLUDE)
+    @EnumSource(DataCenter.class)
     public void getTunnelsForAUserTest(DataCenter dataCenter) throws IOException {
         SauceREST sauceREST = new SauceREST(dataCenter);
         SauceConnectEndpoint sauceConnectEndpoint = sauceREST.getSauceConnectEndpoint();
@@ -92,7 +92,7 @@ public void getTunnelsForAUserTest(DataCenter dataCenter) throws IOException {
     }
 
     @ParameterizedTest
-    @EnumSource(value = DataCenter.class, names = {"EU_CENTRAL", "US_WEST", "APAC_SOUTHEAST"}, mode = EnumSource.Mode.INCLUDE)
+    @EnumSource(DataCenter.class)
     public void getTunnelInformationTest(DataCenter dataCenter) throws IOException {
         SauceREST sauceREST = new SauceREST(dataCenter);
         SauceConnectEndpoint sauceConnectEndpoint = sauceREST.getSauceConnectEndpoint();
@@ -108,7 +108,7 @@ public void getTunnelInformationTest(DataCenter dataCenter) throws IOException {
     }
 
     @ParameterizedTest
-    @EnumSource(value = DataCenter.class, names = {"EU_CENTRAL", "US_WEST", "APAC_SOUTHEAST"}, mode = EnumSource.Mode.INCLUDE)
+    @EnumSource(DataCenter.class)
     public void getJobsForATunnelTest(DataCenter dataCenter) throws IOException {
         SauceREST sauceREST = new SauceREST(dataCenter);
         SauceConnectEndpoint sauceConnectEndpoint = sauceREST.getSauceConnectEndpoint();

diff --git a/src/test/java/com/saucelabs/saucerest/unit/DataCenterTest.java b/src/test/java/com/saucelabs/saucerest/unit/DataCenterTest.java
@@ -15,10 +15,6 @@ class DataCenterTest {
         "us_WeSt,        US_WEST",
         "EU_CENTRAL,     EU_CENTRAL",
         "Eu_central,     EU_CENTRAL",
-        "US_EAST,        US_EAST",
-        "us_EaSt,        US_EAST",
-        "APAC_SOUTHEAST, APAC_SOUTHEAST",
-        "apac_southeast, APAC_SOUTHEAST",
     })
     void testFromString(String input, DataCenter expected) {
         assertEquals(expected, DataCenter.fromString(input));
@@ -73,13 +69,5 @@ void testServerUrls() {
         assertEquals("https://eu-central-1.saucelabs.com/", DataCenter.EU_CENTRAL.server());
         assertEquals("https://api.eu-central-1.saucelabs.com/", DataCenter.EU_CENTRAL.apiServer());
         assertEquals("https://app.eu-central-1.saucelabs.com/", DataCenter.EU_CENTRAL.appServer());
-
-        assertEquals("https://us-east-1.saucelabs.com/", DataCenter.US_EAST.server());
-        assertEquals("https://api.us-east-1.saucelabs.com/", DataCenter.US_EAST.apiServer());
-        assertEquals("https://app.us-east-1.saucelabs.com/", DataCenter.US_EAST.appServer());
-
-        assertEquals("https://apac-southeast-1.saucelabs.com/", DataCenter.APAC_SOUTHEAST.server());
-        assertEquals("https://api.apac-southeast-1.saucelabs.com/", DataCenter.APAC_SOUTHEAST.apiServer());
-        assertEquals("https://app.apac-southeast-1.saucelabs.com/", DataCenter.APAC_SOUTHEAST.appServer());
     }
 }