chore: merge assertions module into playwright (#773)

yury-s · web-flow · commit a006d51872bf · 2022-01-18T12:22:15.000-08:00
diff --git a/assertions/pom.xml b/assertions/pom.xml
diff --git a/playwright/pom.xml b/playwright/pom.xml
@@ -73,6 +73,10 @@
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opentest4j</groupId>
+      <artifactId>opentest4j</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.microsoft.playwright</groupId>
       <artifactId>driver</artifactId>
diff --git a/playwright/src/main/java/com/microsoft/playwright/APIRequestContext.java b/playwright/src/main/java/com/microsoft/playwright/APIRequestContext.java
@@ -18,7 +18,6 @@
 
 import com.microsoft.playwright.options.*;
 import java.nio.file.Path;
-import java.util.*;
 
 /**
  * This API is used for the Web API testing. You can use it to trigger API endpoints, configure micro-services, prepare
diff --git a/playwright/src/main/java/com/microsoft/playwright/Dialog.java b/playwright/src/main/java/com/microsoft/playwright/Dialog.java
@@ -16,7 +16,6 @@
 
 package com.microsoft.playwright;
 
-import java.util.*;
 
 /**
  * {@code Dialog} objects are dispatched by page via the {@link Page#onDialog Page.onDialog()} event.
diff --git a/playwright/src/main/java/com/microsoft/playwright/Download.java b/playwright/src/main/java/com/microsoft/playwright/Download.java
@@ -18,7 +18,6 @@
 
 import java.io.InputStream;
 import java.nio.file.Path;
-import java.util.*;
 
 /**
  * {@code Download} objects are dispatched by page via the {@link Page#onDownload Page.onDownload()} event.
diff --git a/playwright/src/main/java/com/microsoft/playwright/FileChooser.java b/playwright/src/main/java/com/microsoft/playwright/FileChooser.java
@@ -18,7 +18,6 @@
 
 import com.microsoft.playwright.options.*;
 import java.nio.file.Path;
-import java.util.*;
 
 /**
  * {@code FileChooser} objects are dispatched by the page in the {@link Page#onFileChooser Page.onFileChooser()} event.
diff --git a/playwright/src/main/java/com/microsoft/playwright/FrameLocator.java b/playwright/src/main/java/com/microsoft/playwright/FrameLocator.java
@@ -16,7 +16,6 @@
 
 package com.microsoft.playwright;
 
-import java.util.*;
 import java.util.regex.Pattern;
 
 /**
diff --git a/playwright/src/main/java/com/microsoft/playwright/Keyboard.java b/playwright/src/main/java/com/microsoft/playwright/Keyboard.java
@@ -17,7 +17,6 @@
 package com.microsoft.playwright;
 
 import com.microsoft.playwright.options.*;
-import java.util.*;
 
 /**
  * Keyboard provides an api for managing a virtual keyboard. The high level api is {@link Keyboard#type Keyboard.type()},
diff --git a/playwright/src/main/java/com/microsoft/playwright/Mouse.java b/playwright/src/main/java/com/microsoft/playwright/Mouse.java
@@ -17,7 +17,6 @@
 package com.microsoft.playwright;
 
 import com.microsoft.playwright.options.*;
-import java.util.*;
 
 /**
  * The Mouse class operates in main-frame CSS pixels relative to the top-left corner of the viewport.
diff --git a/playwright/src/main/java/com/microsoft/playwright/Route.java b/playwright/src/main/java/com/microsoft/playwright/Route.java
@@ -16,7 +16,6 @@
 
 package com.microsoft.playwright;
 
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.*;
 
diff --git a/playwright/src/main/java/com/microsoft/playwright/Selectors.java b/playwright/src/main/java/com/microsoft/playwright/Selectors.java
@@ -17,7 +17,6 @@
 package com.microsoft.playwright;
 
 import java.nio.file.Path;
-import java.util.*;
 
 /**
  * Selectors can be used to install custom selector engines. See <a
diff --git a/playwright/src/main/java/com/microsoft/playwright/Touchscreen.java b/playwright/src/main/java/com/microsoft/playwright/Touchscreen.java
@@ -16,7 +16,6 @@
 
 package com.microsoft.playwright;
 
-import java.util.*;
 
 /**
  * The Touchscreen class operates in main-frame CSS pixels relative to the top-left corner of the viewport. Methods on the
diff --git a/playwright/src/main/java/com/microsoft/playwright/Tracing.java b/playwright/src/main/java/com/microsoft/playwright/Tracing.java
@@ -17,7 +17,6 @@
 package com.microsoft.playwright;
 
 import java.nio.file.Path;
-import java.util.*;
 
 /**
  * API for collecting and saving Playwright traces. Playwright traces can be opened in <a
diff --git a/playwright/src/main/java/com/microsoft/playwright/Video.java b/playwright/src/main/java/com/microsoft/playwright/Video.java
@@ -17,7 +17,6 @@
 package com.microsoft.playwright;
 
 import java.nio.file.Path;
-import java.util.*;
 
 /**
  * When browser context is created with the {@code recordVideo} option, each page has a video object associated with it.
diff --git a/playwright/src/main/java/com/microsoft/playwright/WebSocket.java b/playwright/src/main/java/com/microsoft/playwright/WebSocket.java
@@ -16,7 +16,6 @@
 
 package com.microsoft.playwright;
 
-import java.util.*;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
diff --git a/playwright/src/main/java/com/microsoft/playwright/WebSocketFrame.java b/playwright/src/main/java/com/microsoft/playwright/WebSocketFrame.java
@@ -16,7 +16,6 @@
 
 package com.microsoft.playwright;
 
-import java.util.*;
 
 /**
  * The {@code WebSocketFrame} class represents frames sent over {@code WebSocket} connections in the page. Frame payload is returned by
diff --git a/playwright/src/main/java/com/microsoft/playwright/Worker.java b/playwright/src/main/java/com/microsoft/playwright/Worker.java
@@ -16,7 +16,6 @@
 
 package com.microsoft.playwright;
 
-import java.util.*;
 import java.util.function.Consumer;
 
 /**
diff --git a/playwright/src/main/java/com/microsoft/playwright/assertions/APIResponseAssertions.java b/playwright/src/main/java/com/microsoft/playwright/assertions/APIResponseAssertions.java
@@ -16,7 +16,6 @@
 
 package com.microsoft.playwright.assertions;
 
-import java.util.*;
 
 /**
  * The {@code APIResponseAssertions} class provides assertion methods that can be used to make assertions about the {@code APIResponse}
diff --git a/playwright/src/main/java/com/microsoft/playwright/assertions/LocatorAssertions.java b/playwright/src/main/java/com/microsoft/playwright/assertions/LocatorAssertions.java
@@ -16,9 +16,7 @@
 
 package com.microsoft.playwright.assertions;
 
-import java.util.*;
 import java.util.regex.Pattern;
-import com.microsoft.playwright.Locator;
 
 /**
  * The {@code LocatorAssertions} class provides assertion methods that can be used to make assertions about the {@code Locator} state
diff --git a/playwright/src/main/java/com/microsoft/playwright/assertions/PageAssertions.java b/playwright/src/main/java/com/microsoft/playwright/assertions/PageAssertions.java
@@ -16,9 +16,7 @@
 
 package com.microsoft.playwright.assertions;
 
-import java.util.*;
 import java.util.regex.Pattern;
-import com.microsoft.playwright.Page;
 
 /**
  * The {@code PageAssertions} class provides assertion methods that can be used to make assertions about the {@code Page} state in the
diff --git a/playwright/src/main/java/com/microsoft/playwright/assertions/PlaywrightAssertions.java b/playwright/src/main/java/com/microsoft/playwright/assertions/PlaywrightAssertions.java
@@ -16,7 +16,6 @@
 
 package com.microsoft.playwright.assertions;
 
-import java.util.*;
 import com.microsoft.playwright.APIResponse;
 import com.microsoft.playwright.Locator;
 import com.microsoft.playwright.Page;
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/APIResponseAssertionsImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/APIResponseAssertionsImpl.java
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/AssertionsBase.java b/playwright/src/main/java/com/microsoft/playwright/impl/AssertionsBase.java
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/LocatorAssertionsImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/LocatorAssertionsImpl.java
diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/PageAssertionsImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/PageAssertionsImpl.java
diff --git a/playwright/src/main/java/com/microsoft/playwright/options/FormData.java b/playwright/src/main/java/com/microsoft/playwright/options/FormData.java
@@ -18,7 +18,6 @@
 
 import com.microsoft.playwright.impl.FormDataImpl;
 import java.nio.file.Path;
-import java.util.*;
 
 /**
  * The {@code FormData} is used create form data that is sent via {@code APIRequestContext}.
diff --git a/playwright/src/main/java/com/microsoft/playwright/options/RequestOptions.java b/playwright/src/main/java/com/microsoft/playwright/options/RequestOptions.java
@@ -17,7 +17,6 @@
 package com.microsoft.playwright.options;
 
 import com.microsoft.playwright.impl.RequestOptionsImpl;
-import java.util.*;
 
 /**
  * The {@code RequestOptions} allows to create form data to be sent via {@code APIRequestContext}.
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestAPIResponseAssertions.java b/playwright/src/test/java/com/microsoft/playwright/TestAPIResponseAssertions.java
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestLocatorAssertions.java b/playwright/src/test/java/com/microsoft/playwright/TestLocatorAssertions.java
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestLocatorFrame.java b/playwright/src/test/java/com/microsoft/playwright/TestLocatorFrame.java
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageAssertions.java b/playwright/src/test/java/com/microsoft/playwright/TestPageAssertions.java
diff --git a/pom.xml b/pom.xml
@@ -39,7 +39,6 @@
     <module>driver</module>
     <module>driver-bundle</module>
     <module>playwright</module>
-    <module>assertions</module>
   </modules>
 
   <properties>
diff --git a/tools/api-generator/src/main/java/com/microsoft/playwright/tools/ApiGenerator.java b/tools/api-generator/src/main/java/com/microsoft/playwright/tools/ApiGenerator.java
@@ -924,16 +924,15 @@ void writeTo(List<String> output, String offset) {
     if (asList("Page", "Request", "Response", "APIRequestContext", "APIRequest", "APIResponse", "FileChooser", "Frame", "ElementHandle", "Locator", "Browser", "BrowserContext", "BrowserType", "Mouse", "Keyboard").contains(jsonName)) {
       output.add("import com.microsoft.playwright.options.*;");
     }
-    if (jsonName.equals("Route")) {
-      output.add("import java.nio.charset.StandardCharsets;");
-    }
     if ("Download".equals(jsonName)) {
       output.add("import java.io.InputStream;");
     }
     if (asList("Page", "Frame", "ElementHandle", "Locator", "FormData", "APIRequest", "APIRequestContext", "FileChooser", "Browser", "BrowserContext", "BrowserType", "Download", "Route", "Selectors", "Tracing", "Video").contains(jsonName)) {
       output.add("import java.nio.file.Path;");
     }
-    output.add("import java.util.*;");
+    if (asList("Page", "Frame", "ElementHandle", "Locator", "APIRequest", "Browser", "BrowserContext", "BrowserType", "Route", "Request", "Response", "JSHandle", "ConsoleMessage", "APIResponse", "Playwright").contains(jsonName)) {
+      output.add("import java.util.*;");
+    }
     if (asList("Page", "Browser", "BrowserContext", "WebSocket", "Worker").contains(jsonName)) {
       output.add("import java.util.function.Consumer;");
     }
@@ -951,12 +950,6 @@ void writeTo(List<String> output, String offset) {
       output.add("import com.microsoft.playwright.impl.LocatorAssertionsImpl;");
       output.add("import com.microsoft.playwright.impl.PageAssertionsImpl;");
     }
-    if ("PageAssertions".equals(jsonName)) {
-      output.add("import com.microsoft.playwright.Page;");
-    }
-    if ("LocatorAssertions".equals(jsonName)) {
-      output.add("import com.microsoft.playwright.Locator;");
-    }
     output.add("");
 
     List<String> superInterfaces = new ArrayList<>();
@@ -1122,7 +1115,7 @@ public class ApiGenerator {
     System.out.println("Writing files to: " + dir.getCanonicalPath());
     generate(api, dir, "com.microsoft.playwright", isAssertion().negate());
 
-    File assertionsDir = new File(cwd,"assertions/src/main/java/com/microsoft/playwright/assertions");
+    File assertionsDir = new File(cwd,"playwright/src/main/java/com/microsoft/playwright/assertions");
     System.out.println("Writing assertion files to: " + dir.getCanonicalPath());
     generate(api, assertionsDir, "com.microsoft.playwright.assertions", isAssertion());
   }
diff --git a/tools/test-local-installation/create_project_and_run_tests.sh b/tools/test-local-installation/create_project_and_run_tests.sh
@@ -10,7 +10,6 @@ cd "$(dirname $0)"
 PROJECT_DIR=$(mktemp -d)
 echo "Creating project in $PROJECT_DIR"
 cp -R . $PROJECT_DIR
-cp -R ../../assertions/src/test/ $PROJECT_DIR/src/
 cp -R ../../driver-bundle/src/test/ $PROJECT_DIR/src/
 cp -R ../../playwright/src/test/ $PROJECT_DIR/src/
 cd $PROJECT_DIR
diff --git a/tools/test-local-installation/pom.xml b/tools/test-local-installation/pom.xml
@@ -27,11 +27,6 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.microsoft.playwright</groupId>
-      <artifactId>assertions</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
