Rename printoptions package to print

SeleniumHQ · Jan 18, 2021 · c80bddf · c80bddf
1 parent fc8578e
commit c80bddf
Show file tree

Hide file tree

Showing 14 changed files with 41 additions and 70 deletions.
diff --git a/java/client/src/org/openqa/selenium/PrintsPage.java b/java/client/src/org/openqa/selenium/PrintsPage.java
@@ -16,7 +16,7 @@
 // under the License.
 package org.openqa.selenium;
 
-import org.openqa.selenium.printoptions.PrintOptions;
+import org.openqa.selenium.print.PrintOptions;
 
 public interface PrintsPage {
   Pdf print(PrintOptions printOptions) throws WebDriverException;

diff --git a/...a/selenium/printoptions/print/BUILD.bazel → ...src/org/openqa/selenium/print/BUILD.bazel b/...a/selenium/printoptions/print/BUILD.bazel → ...src/org/openqa/selenium/print/BUILD.bazel
@@ -10,7 +10,6 @@ java_library(
         "//java/client/test/org/openqa/selenium:__subpackages__",
         "//java/client/test/org/openqa/selenium/build:__pkg__",
         "//java/client/test/org/openqa/selenium/testing/drivers:__pkg__",
-        "//java/client/src/org/openqa/selenium:__subpackages__",
     ],
     deps = [
         "//java/client/src/org/openqa/selenium:core",

diff --git a/...lenium/printoptions/print/PageMargin.java → ...org/openqa/selenium/print/PageMargin.java b/...lenium/printoptions/print/PageMargin.java → ...org/openqa/selenium/print/PageMargin.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.selenium.printoptions.print;
+package org.openqa.selenium.print;
 
 import org.openqa.selenium.internal.Require;
 

diff --git a/...selenium/printoptions/print/PageSize.java → ...c/org/openqa/selenium/print/PageSize.java b/...selenium/printoptions/print/PageSize.java → ...c/org/openqa/selenium/print/PageSize.java
@@ -15,10 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.selenium.printoptions.print;
+package org.openqa.selenium.print;
 
-import java.util.HashMap;
-import java.util.Map;
 
 public class PageSize {
 

diff --git a/...a/selenium/printoptions/PrintOptions.java → ...g/openqa/selenium/print/PrintOptions.java b/...a/selenium/printoptions/PrintOptions.java → ...g/openqa/selenium/print/PrintOptions.java
@@ -15,12 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.selenium.printoptions;
-
-
-import org.openqa.selenium.internal.Require;
-import org.openqa.selenium.printoptions.print.PageMargin;
-import org.openqa.selenium.printoptions.print.PageSize;
+package org.openqa.selenium.print;
 
 public class PrintOptions {
 
@@ -32,16 +27,16 @@ public enum Orientation {
   private double scale = 1.0;
   private boolean background = false;
   private boolean shrinkToFit = true;
-  private org.openqa.selenium.printoptions.print.PageSize pageSize = new org.openqa.selenium.printoptions.print.PageSize();
-  private org.openqa.selenium.printoptions.print.PageMargin pageMargin = new org.openqa.selenium.printoptions.print.PageMargin();
+  private PageSize pageSize = new PageSize();
+  private PageMargin pageMargin = new PageMargin();
   private String[] pageRanges;
 
   public Orientation getOrientation() {
     return this.orientation;
   }
 
   public void setOrientation(Orientation orientation) {
-    this.orientation = Require.nonNull("orientation", orientation);
+    this.orientation = orientation;
   }
 
   public String[] getPageRanges() {
@@ -52,49 +47,46 @@ public void setPageRanges(String[] ranges) {
     this.pageRanges = ranges;
   }
 
-  public boolean getBackground() {
-    return this.background;
-  }
-
   public void setBackground(boolean background) {
-    this.background = Require.nonNull("background", background);
+    this.background = background;
   }
 
-  public double getScale() {
-    return this.scale;
+  public boolean getBackground() {
+    return this.background;
   }
 
   public void setScale(double scale) {
-    Require.nonNull("scale", scale);
-
     if (scale < 0.1 || scale > 2) {
       throw new IllegalArgumentException("Scale value should be between 0.1 and 2");
     }
-
     this.scale = scale;
   }
 
+  public double getScale() {
+    return this.scale;
+  }
+
   public boolean getShrinkToFit() {
     return this.shrinkToFit;
   }
 
   public void setShrinkToFit(boolean value) {
-    this.shrinkToFit = Require.nonNull("value", value);
+    this.shrinkToFit = value;
   }
 
-  public PageSize getPageSize() {
-    return this.pageSize;
+  public void setPageSize(PageSize pageSize) {
+    this.pageSize = pageSize;
   }
 
-  public void setPageSize(PageSize pageSize) {
-    this.pageSize = Require.nonNull("pageSize", pageSize);
+  public void setPageMargin(PageMargin margin) {
+    this.pageMargin = margin;
   }
 
-  public PageMargin getPageMargin() {
-    return this.pageMargin;
+  public PageSize getPageSize() {
+    return this.pageSize;
   }
 
-  public void setPageMargin(PageMargin margin) {
-    this.pageMargin = Require.nonNull("margin", margin);
+  public PageMargin getPageMargin() {
+    return this.pageMargin;
   }
 }
diff --git a/java/client/src/org/openqa/selenium/printoptions/BUILD.bazel b/java/client/src/org/openqa/selenium/printoptions/BUILD.bazel
diff --git a/java/client/src/org/openqa/selenium/remote/DriverCommand.java b/java/client/src/org/openqa/selenium/remote/DriverCommand.java
@@ -25,7 +25,7 @@
 import org.openqa.selenium.Point;
 import org.openqa.selenium.WindowType;
 import org.openqa.selenium.interactions.Sequence;
-import org.openqa.selenium.printoptions.PrintOptions;
+import org.openqa.selenium.print.PrintOptions;
 
 import java.time.Duration;
 import java.util.Collection;

diff --git a/java/client/src/org/openqa/selenium/remote/RemoteWebDriver.java b/java/client/src/org/openqa/selenium/remote/RemoteWebDriver.java
@@ -55,7 +55,8 @@
 import org.openqa.selenium.logging.LoggingPreferences;
 import org.openqa.selenium.logging.Logs;
 import org.openqa.selenium.logging.NeedsLocalLogs;
-import org.openqa.selenium.printoptions.PrintOptions;
+import org.openqa.selenium.print.PageMargin;
+import org.openqa.selenium.print.PrintOptions;
 import org.openqa.selenium.remote.internal.WebElementToJsonConverter;
 import org.openqa.selenium.virtualauthenticator.Credential;
 import org.openqa.selenium.virtualauthenticator.HasVirtualAuthenticator;

diff --git a/java/client/test/org/openqa/selenium/chrome/BUILD.bazel b/java/client/test/org/openqa/selenium/chrome/BUILD.bazel
@@ -13,7 +13,6 @@ java_selenium_test_suite(
     ],
     deps = [
         "//java/client/src/org/openqa/selenium/chrome",
-        "//java/client/src/org/openqa/selenium/printoptions",
         "//java/client/src/org/openqa/selenium/remote",
         "//java/client/src/org/openqa/selenium/support",
         "//java/client/test/org/openqa/selenium/build",

diff --git a/java/client/test/org/openqa/selenium/firefox/FireFoxPrintCommandTest.java b/java/client/test/org/openqa/selenium/firefox/FireFoxPrintCommandTest.java
@@ -24,8 +24,8 @@
 import org.junit.Before;
 
 import org.openqa.selenium.Pdf;
-import org.openqa.selenium.printoptions.print.PageSize;
-import org.openqa.selenium.printoptions.PrintOptions;
+import org.openqa.selenium.print.PageSize;
+import org.openqa.selenium.print.PrintOptions;
 import org.openqa.selenium.testing.JUnit4TestBase;
 
 public class FireFoxPrintCommandTest extends JUnit4TestBase {
@@ -49,7 +49,7 @@ public void canPrintPage() {
     PrintOptions printOptions = new PrintOptions();
 
     Pdf pdf = localDriver.print(printOptions);
-    assertThat(pdf.getBase64String().contains(MAGIC_STRING)).isTrue();
+    assertThat(pdf.getContent().contains(MAGIC_STRING)).isTrue();
   }
 
   @Test
@@ -58,7 +58,7 @@ public void canPrintwoPages() {
     printOptions.setPageRanges(new String[]{"1-2"});
 
     Pdf pdf = localDriver.print(printOptions);
-    assertThat(pdf.getBase64String().contains(MAGIC_STRING)).isTrue();
+    assertThat(pdf.getContent().contains(MAGIC_STRING)).isTrue();
   }
 
   @Test
@@ -72,6 +72,6 @@ public void canPrintWithValidParams() {
     printOptions.setPageSize(pageSize);
 
     Pdf pdf = localDriver.print(printOptions);
-    assertThat(pdf.getBase64String().contains(MAGIC_STRING)).isTrue();
+    assertThat(pdf.getContent().contains(MAGIC_STRING)).isTrue();
   }
 }
diff --git a/.../openqa/selenium/printoptions/BUILD.bazel → ...est/org/openqa/selenium/print/BUILD.bazel b/.../openqa/selenium/printoptions/BUILD.bazel → ...est/org/openqa/selenium/print/BUILD.bazel
@@ -6,10 +6,9 @@ java_test_suite(
     size = "small",
     srcs = glob(["*Test.java", "print/*Test.java"]),
     deps = [
-        "//java/client/src/org/openqa/selenium/printoptions",
         "//java/client/test/org/openqa/selenium/testing:test-base",
         "//java/client/test/org/openqa/selenium/testing:annotations",
-        "//java/client/src/org/openqa/selenium/printoptions/print",
+        "//java/client/src/org/openqa/selenium/print:print",
         artifact("org.assertj:assertj-core"),
         artifact("junit:junit"),
     ]

diff --git a/...um/printoptions/print/PageMarginTest.java → ...openqa/selenium/print/PageMarginTest.java b/...um/printoptions/print/PageMarginTest.java → ...openqa/selenium/print/PageMarginTest.java
@@ -15,13 +15,13 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.selenium.printoptions.print;
+package org.openqa.selenium.print;
 
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.openqa.selenium.printoptions.print.PageMargin;
+import org.openqa.selenium.print.PageMargin;
 import org.openqa.selenium.testing.UnitTests;
 
 
@@ -36,7 +36,7 @@ public class PageMarginTest {
 
   @Test
   public void setsDefaultMarginValues() {
-    org.openqa.selenium.printoptions.print.PageMargin pageMargin = new org.openqa.selenium.printoptions.print.PageMargin();
+    PageMargin pageMargin = new PageMargin();
 
     assertThat(pageMargin.getTop()).isEqualTo(TOP);
     assertThat(pageMargin.getBottom()).isEqualTo(BOTTOM);
@@ -46,7 +46,7 @@ public void setsDefaultMarginValues() {
 
   @Test
   public void setsVauesAsPassed() {
-    org.openqa.selenium.printoptions.print.PageMargin pageMargin = new PageMargin();
+    PageMargin pageMargin = new PageMargin();
     pageMargin.setBottom(2.0);
     pageMargin.setTop(3.0);
     pageMargin.setLeft(1.0);

diff --git a/...nium/printoptions/print/PageSizeTest.java → ...g/openqa/selenium/print/PageSizeTest.java b/...nium/printoptions/print/PageSizeTest.java → ...g/openqa/selenium/print/PageSizeTest.java
@@ -15,13 +15,13 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.selenium.printoptions.print;
+package org.openqa.selenium.print;
 
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.openqa.selenium.printoptions.print.PageSize;
+import org.openqa.selenium.print.PageSize;
 import org.openqa.selenium.testing.UnitTests;
 
 
@@ -34,15 +34,15 @@ public class PageSizeTest {
 
   @Test
   public void setsDefaultHeightWidth() {
-    org.openqa.selenium.printoptions.print.PageSize pageSize = new org.openqa.selenium.printoptions.print.PageSize();
+    PageSize pageSize = new PageSize();
 
     assertThat(pageSize.getHeight()).isEqualTo(HEIGHT);
     assertThat(pageSize.getWidth()).isEqualTo(WIDTH);
   }
 
   @Test
   public void setsValuesAsPassed() {
-    org.openqa.selenium.printoptions.print.PageSize pageSize = new PageSize();
+    PageSize pageSize = new PageSize();
     pageSize.setHeight(11.0);
     pageSize.setWidth(12.0);
 

diff --git a/...lenium/printoptions/PrintOptionsTest.java → ...enqa/selenium/print/PrintOptionsTest.java b/...lenium/printoptions/PrintOptionsTest.java → ...enqa/selenium/print/PrintOptionsTest.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.selenium.printoptions;
+package org.openqa.selenium.print;
 
 import org.junit.Test;
 import org.junit.experimental.categories.Category;