[java] rename the dimension and resolution enums so they make more sense

Author: titusfortner

java/src/main/java/com/saucelabs/saucebindings/options/VDCConfigurations.java

@@ -3,8 +3,8 @@
 import com.saucelabs.saucebindings.PageLoadStrategy;
 import com.saucelabs.saucebindings.Prerun;
 import com.saucelabs.saucebindings.UnhandledPromptBehavior;
-import com.saucelabs.saucebindings.screen_resolutions.Desktop;
-import com.saucelabs.saucebindings.screen_resolutions.ScreenDimensions;
+import com.saucelabs.saucebindings.pixels.DesktopResolutions;
+import com.saucelabs.saucebindings.pixels.DeviceDimensions;
 import org.openqa.selenium.Proxy;
 
 import java.net.URL;
@@ -232,7 +232,7 @@ public T setPriority(Integer priority) {
      *
      * @param resolution The screen resolution to be used
      * @return instance of configuration
-     * @see ScreenDimensions#desktop(Desktop)
+     * @see DeviceDimensions#desktop(DesktopResolutions)
      */
     public T setScreenResolution(String resolution) {
         sauceOptions.sauce().setScreenResolution(resolution);

…cebindings/screen_resolutions/Apple.java …aucelabs/saucebindings/pixels/Apple.javajava/src/main/java/com/saucelabs/saucebindings/screen_resolutions/Apple.java renamed to java/src/main/java/com/saucelabs/saucebindings/pixels/Apple.java java/src/main/java/com/saucelabs/saucebindings/screen_resolutions/Apple.java renamed to java/src/main/java/com/saucelabs/saucebindings/pixels/Apple.java

@@ -1,8 +1,8 @@
-package com.saucelabs.saucebindings.screen_resolutions;
+package com.saucelabs.saucebindings.pixels;
 
 import lombok.Getter;
 
-public enum Apple implements PixelDimensions {
+public enum Apple implements SauceEnums {
     IPAD_10_2("810x1080"),
     IPAD_9_7("768x1024"),
     IPAD_AIR_2019("834x1112"),

…bindings/screen_resolutions/Desktop.java …ebindings/pixels/DesktopResolutions.javajava/src/main/java/com/saucelabs/saucebindings/screen_resolutions/Desktop.java renamed to java/src/main/java/com/saucelabs/saucebindings/pixels/DesktopResolutions.java java/src/main/java/com/saucelabs/saucebindings/screen_resolutions/Desktop.java renamed to java/src/main/java/com/saucelabs/saucebindings/pixels/DesktopResolutions.java

@@ -1,12 +1,12 @@
-package com.saucelabs.saucebindings.screen_resolutions;
+package com.saucelabs.saucebindings.pixels;
 
 import lombok.Getter;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-public enum Desktop implements PixelDimensions {
+public enum DesktopResolutions implements SauceEnums {
     SVGA("800x600"),
     XGA("1024x768"),
     XGA_PLUS("1152x864"),
@@ -33,7 +33,7 @@ public static Set keys() {
         return ResolutionLookup.lookup.keySet();
     }
 
-    Desktop(String value) {
+    DesktopResolutions(String value) {
         this.value = value;
         this.displayName = this.name();
         ResolutionLookup.lookup.put(value, this.name());

…screen_resolutions/ScreenDimensions.java …ucebindings/pixels/DeviceDimensions.javajava/src/main/java/com/saucelabs/saucebindings/screen_resolutions/ScreenDimensions.java renamed to java/src/main/java/com/saucelabs/saucebindings/pixels/DeviceDimensions.java java/src/main/java/com/saucelabs/saucebindings/screen_resolutions/ScreenDimensions.java renamed to java/src/main/java/com/saucelabs/saucebindings/pixels/DeviceDimensions.java

@@ -1,10 +1,6 @@
-package com.saucelabs.saucebindings.screen_resolutions;
-
-public class ScreenDimensions {
-    public static String desktop(Desktop value) {
-        return String.valueOf(Desktop.valueOf(value.toString()));
-    }
+package com.saucelabs.saucebindings.pixels;
 
+public class DeviceDimensions {
     public static String apple(Apple value) {
         return String.valueOf(Apple.valueOf(value.toString()));
     }
@@ -17,10 +13,7 @@ public static String samsung(Samsung value) {
         return String.valueOf(Samsung.valueOf(value.toString()));
     }
 
-    public static PixelDimensions getResolution(String key) {
-        if (Desktop.hasKey(key)) {
-            return Desktop.valueOf(key);
-        }
+    public static SauceEnums getResolution(String key) {
         if (Google.hasKey(key)) {
             return Google.valueOf(key);
         }

…ebindings/screen_resolutions/Google.java …ucelabs/saucebindings/pixels/Google.javajava/src/main/java/com/saucelabs/saucebindings/screen_resolutions/Google.java renamed to java/src/main/java/com/saucelabs/saucebindings/pixels/Google.java java/src/main/java/com/saucelabs/saucebindings/screen_resolutions/Google.java renamed to java/src/main/java/com/saucelabs/saucebindings/pixels/Google.java

@@ -1,8 +1,8 @@
-package com.saucelabs.saucebindings.screen_resolutions;
+package com.saucelabs.saucebindings.pixels;
 
 import lombok.Getter;
 
-public enum Google implements PixelDimensions {
+public enum Google implements SauceEnums {
     PIXEL("412x732"),
     PIXEL_2("412x732"),
     PIXEL_2_XL("412x823"),

…bindings/screen_resolutions/Samsung.java …celabs/saucebindings/pixels/Samsung.javajava/src/main/java/com/saucelabs/saucebindings/screen_resolutions/Samsung.java renamed to java/src/main/java/com/saucelabs/saucebindings/pixels/Samsung.java java/src/main/java/com/saucelabs/saucebindings/screen_resolutions/Samsung.java renamed to java/src/main/java/com/saucelabs/saucebindings/pixels/Samsung.java

@@ -1,8 +1,8 @@
-package com.saucelabs.saucebindings.screen_resolutions;
+package com.saucelabs.saucebindings.pixels;
 
 import lombok.Getter;
 
-public enum Samsung implements PixelDimensions {
+public enum Samsung implements SauceEnums {
     GALAXY_A51("412x914"),
     GALAXY_A6("360x720"),
     GALAXY_A70("412x914"),

java/src/main/java/com/saucelabs/saucebindings/pixels/SauceEnums.java

@@ -0,0 +1,9 @@
+package com.saucelabs.saucebindings.pixels;
+
+public interface SauceEnums {
+    public static Boolean hasKey(String key) {
+        return null;
+    }
+    public String getValue();
+    public String getDisplayName();
+}

java/src/main/java/com/saucelabs/saucebindings/screen_resolutions/PixelDimensions.java

@@ -5,8 +5,8 @@
 import com.saucelabs.saucebindings.VisualSession;
 import com.saucelabs.saucebindings.options.SauceOptions;
 import com.saucelabs.saucebindings.options.VisualOptions;
-import com.saucelabs.saucebindings.screen_resolutions.Google;
-import com.saucelabs.saucebindings.screen_resolutions.ScreenDimensions;
+import com.saucelabs.saucebindings.pixels.Google;
+import com.saucelabs.saucebindings.pixels.DeviceDimensions;
 import org.junit.Test;
 import org.openqa.selenium.remote.RemoteWebDriver;
 
@@ -17,9 +17,11 @@ public void startSession() {
         // 1. Create Visual Options instance
         VisualOptions visualOptions = new VisualOptions();
         visualOptions.setProjectName("My Project")
-                .setViewportSize(ScreenDimensions.google(Google.PIXEL_3));
+                .setViewportSize(DeviceDimensions.google(Google.PIXEL_3));
 
-        // 2. Use setVisualOptions() to add the visual options; Make sure setName() has a value
+        // 2. Create Sauce Options.
+        //    Use setVisualOptions() to add the visual options
+        //    Make sure setName() has a value
         SauceOptions sauceOptions = SauceOptions.chrome()
                 .setName("My Test Name")
                 .setPlatformName(SaucePlatform.MAC_HIGH_SIERRA)

java/src/test/java/com/saucelabs/saucebindings/examples/VisualTest.java

@@ -1,6 +1,7 @@
 package com.saucelabs.saucebindings.options;
 
 import com.saucelabs.saucebindings.*;
+import com.saucelabs.saucebindings.pixels.DesktopResolutions;
 import org.junit.Assert;
 import org.junit.Test;
 import org.openqa.selenium.UnexpectedAlertBehaviour;
@@ -117,7 +118,7 @@ public void acceptsSauceLabsSettings() {
                 .disableRecordLogs()
                 .disableRecordScreenshots()
                 .disableRecordVideo()
-                .setScreenResolution("1024x768")
+                .setScreenResolution(DesktopResolutions.XGA.getValue())
                 .setTags(tags)
                 .setTimeZone("San Francisco")
                 .setTunnelIdentifier("tunnelname")