Clean up

saucelabs · May 7, 2024 · 445b208 · 445b208
1 parent 90263f6
commit 445b208
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 59 deletions.
diff --git a/visual-java/src/main/java/com/saucelabs/visual/CheckOptions.java b/visual-java/src/main/java/com/saucelabs/visual/CheckOptions.java
@@ -125,7 +125,7 @@ public Builder enable(DiffingFlag flags) {
       return this;
     }
 
-    public Builder withRegion(VisualRegion region) {
+    public Builder addRegion(VisualRegion region) {
       if (this.regions == null) {
         this.regions = new ArrayList<>();
       }

diff --git a/visual-java/src/main/java/com/saucelabs/visual/model/DiffingFlag.java b/visual-java/src/main/java/com/saucelabs/visual/model/DiffingFlag.java
@@ -3,30 +3,20 @@
 import com.saucelabs.visual.graphql.type.DiffingOptionsIn;
 
 public enum DiffingFlag {
-  Content(1 << 0),
-  Dimensions(1 << 1),
-  Position(1 << 2),
-  Structure(1 << 3),
-  Style(1 << 4),
-  Visual(1 << 5);
-
-  private final long value;
-
-  DiffingFlag(long value) {
-    this.value = value;
-  }
-
-  public long getValue() {
-    return value;
-  }
+  Content,
+  Dimensions,
+  Position,
+  Structure,
+  Style,
+  Visual;
 
   public void apply(DiffingOptionsIn options, boolean value) {
-    if (0 < (this.value & Content.value)) options.setContent(value);
-    if (0 < (this.value & Dimensions.value)) options.setDimensions(value);
-    if (0 < (this.value & Position.value)) options.setPosition(value);
-    if (0 < (this.value & Structure.value)) options.setStructure(value);
-    if (0 < (this.value & Style.value)) options.setStyle(value);
-    if (0 < (this.value & Visual.value)) options.setVisual(value);
+    if (this == Content) options.setContent(value);
+    if (this == Dimensions) options.setDimensions(value);
+    if (this == Position) options.setPosition(value);
+    if (this == Structure) options.setStructure(value);
+    if (this == Style) options.setStyle(value);
+    if (this == Visual) options.setVisual(value);
   }
 
   public static void setAll(DiffingOptionsIn options, boolean value) {

diff --git a/visual-java/src/main/java/com/saucelabs/visual/model/VisualRegion.java b/visual-java/src/main/java/com/saucelabs/visual/model/VisualRegion.java
@@ -2,12 +2,7 @@
 
 import com.saucelabs.visual.graphql.type.DiffingOptionsIn;
 import com.saucelabs.visual.graphql.type.RegionIn;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.Rectangle;
-import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 
 public class VisualRegion {
@@ -143,37 +138,6 @@ public VisualRegion except(DiffingFlag flags) {
     return this;
   }
 
-  public static List<IgnoreRegion> forElement(WebDriver driver, List<WebElement> elements) {
-    JavascriptExecutor js = (JavascriptExecutor) driver;
-
-    List<Map<String, Long>> rects =
-        (List<Map<String, Long>>)
-            js.executeScript(
-                "return Array.from(arguments[0]).map(function(element) {"
-                    + "  const rect = element.getBoundingClientRect();"
-                    + "  return {"
-                    + "    top: Math.round(rect.top),"
-                    + "    left: Math.round(rect.left),"
-                    + "    width: Math.round(rect.width),"
-                    + "    height: Math.round(rect.height)"
-                    + "  };"
-                    + "});",
-                elements);
-
-    List<IgnoreRegion> ignoreRegions = new ArrayList<>(rects.size());
-    for (Map<String, Long> rect : rects) {
-      // Convert the rect to an IgnoreRegion
-      int x = rect.get("left").intValue();
-      int y = rect.get("top").intValue();
-      int width = rect.get("width").intValue();
-      int height = rect.get("height").intValue();
-
-      ignoreRegions.add(new IgnoreRegion(x, y, width, height));
-    }
-
-    return ignoreRegions;
-  }
-
   public RegionIn toRegionIn() {
     RegionIn r = new RegionIn();
     r.setName(this.name);