Merge branch 'trunk' into cddl2py_bazel

Author: cgoldberg

common/repositories.bzl

@@ -50,8 +50,8 @@ js_library(
 
     http_archive(
         name = "linux_beta_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/150.0b1/linux-x86_64/en-US/firefox-150.0b1.tar.xz",
-        sha256 = "a50cebdd0fe65aa4360775aff217642754c3a8f433ecb5b38a39c7bf7635a150",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/150.0b2/linux-x86_64/en-US/firefox-150.0b2.tar.xz",
+        sha256 = "e79bfc7738e5cd1c72b4997ebdbe54ee8a25aa92747c43c51609b8c9b4dcee68",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -72,8 +72,8 @@ js_library(
 
     dmg_archive(
         name = "mac_beta_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/150.0b1/mac/en-US/Firefox%20150.0b1.dmg",
-        sha256 = "385a400ad629b87c49e22fdeb152446ea8e676a68c6492bfd470c86a9dc87df9",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/150.0b2/mac/en-US/Firefox%20150.0b2.dmg",
+        sha256 = "530a7a745539cf4280c02763350771ba1668602d1c7ff882481ce4870a65f42e",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -123,10 +123,10 @@ js_library(
 
     pkg_archive(
         name = "mac_edge",
-        url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/d3bfff5e-987c-4418-9286-15f9b7f6ffff/MicrosoftEdge-146.0.3856.72.pkg",
-        sha256 = "7fc3d256e7beb271e5c24897a5cdd9fd41ebaac29b61d9fff6dc2d5dceb5f81d",
+        url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/be10546a-4c12-4633-8dce-37a41a35fd5a/MicrosoftEdge-146.0.3856.84.pkg",
+        sha256 = "5fc2870b90c00946922927b0a36830a7adda4c068fd2d5fcf03278203ab60711",
         move = {
-            "MicrosoftEdge-146.0.3856.72.pkg/Payload/Microsoft Edge.app": "Edge.app",
+            "MicrosoftEdge-146.0.3856.84.pkg/Payload/Microsoft Edge.app": "Edge.app",
         },
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -143,8 +143,8 @@ js_library(
 
     deb_archive(
         name = "linux_edge",
-        url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_146.0.3856.72-1_amd64.deb",
-        sha256 = "a10d78ad96ee86e1a55c2bb810551be9e8b9f5382de665f0418cfd6955bb1817",
+        url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_146.0.3856.84-1_amd64.deb",
+        sha256 = "7e2524c506a0be82876c6cb5a6b79079c627946c87d1fbdbcfb01b14bbaa6eb2",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -165,8 +165,8 @@ js_library(
 
     http_archive(
         name = "linux_edgedriver",
-        url = "https://msedgedriver.microsoft.com/146.0.3856.72/edgedriver_linux64.zip",
-        sha256 = "4196d8c986fd72a56914bf04f820cd59e550b947dbec6846be8cccaa947867a1",
+        url = "https://msedgedriver.microsoft.com/146.0.3856.84/edgedriver_linux64.zip",
+        sha256 = "cedbb9f2a0159b3593264d6c91d8861a5a963d5e3cc42590e47937d0bc6b923c",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -182,8 +182,8 @@ js_library(
 
     http_archive(
         name = "mac_edgedriver",
-        url = "https://msedgedriver.microsoft.com/146.0.3856.72/edgedriver_mac64_m1.zip",
-        sha256 = "44e6baecb2c7f6667ce528afc61187ad129e39294317448b859998c3309572d3",
+        url = "https://msedgedriver.microsoft.com/146.0.3856.84/edgedriver_mac64_m1.zip",
+        sha256 = "0ed73eefa083189dee5809c17c28589385f79cf415e4ea01ca165dc1fd1351fa",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])

dotnet/defs.bzl

@@ -14,7 +14,7 @@ load("//dotnet/private:paket_deps.bzl", _paket_deps = "paket_deps")
 def devtools_version_targets():
     targets = []
     for devtools_version in SUPPORTED_DEVTOOLS_VERSIONS:
-        targets.append("//dotnet/src/webdriver/cdp:generate-{}".format(devtools_version))
+        targets.append("//dotnet/src/webdriver/DevTools:generate-{}".format(devtools_version))
     return targets
 
 csharp_binary = _csharp_binary

dotnet/src/webdriver/BUILD.bazel

@@ -46,7 +46,7 @@ csharp_library(
         ":resource-utilities",
     ] + glob([
         "**/*.cs",
-    ]) + devtools_version_targets(),
+    ]) + ["//dotnet/src/webdriver/DevTools:srcs"] + devtools_version_targets(),
     out = "WebDriver",
     internals_visible_to = [
         "WebDriver.Common.Tests",
@@ -79,7 +79,7 @@ csharp_library(
         ":resource-utilities",
     ] + glob([
         "**/*.cs",
-    ]) + devtools_version_targets(),
+    ]) + ["//dotnet/src/webdriver/DevTools:srcs"] + devtools_version_targets(),
     out = "WebDriver",
     internals_visible_to = [
         "WebDriver.Common.Tests",
@@ -113,7 +113,7 @@ csharp_library(
         ":resource-utilities",
     ] + glob([
         "**/*.cs",
-    ]) + devtools_version_targets(),
+    ]) + ["//dotnet/src/webdriver/DevTools:srcs"] + devtools_version_targets(),
     out = "WebDriver",
     defines = [
         "NET8_0_OR_GREATER",
@@ -140,7 +140,7 @@ csharp_library(
         ":resource-utilities",
     ] + glob([
         "**/*.cs",
-    ]) + devtools_version_targets(),
+    ]) + ["//dotnet/src/webdriver/DevTools:srcs"] + devtools_version_targets(),
     out = "WebDriver.StrongNamed",
     keyfile = "//dotnet:Selenium.snk",
     langversion = "14.0",
@@ -171,7 +171,7 @@ csharp_library(
         ":resource-utilities",
     ] + glob([
         "**/*.cs",
-    ]) + devtools_version_targets(),
+    ]) + ["//dotnet/src/webdriver/DevTools:srcs"] + devtools_version_targets(),
     out = "WebDriver.StrongNamed",
     keyfile = "//dotnet:Selenium.snk",
     langversion = "14.0",
@@ -203,7 +203,7 @@ csharp_library(
         ":resource-utilities",
     ] + glob([
         "**/*.cs",
-    ]) + devtools_version_targets(),
+    ]) + ["//dotnet/src/webdriver/DevTools:srcs"] + devtools_version_targets(),
     out = "WebDriver.StrongNamed",
     defines = [
         "NET8_0_OR_GREATER",

dotnet/src/webdriver/cdp/BUILD.bazel dotnet/src/webdriver/DevTools/BUILD.bazeldotnet/src/webdriver/cdp/BUILD.bazel renamed to dotnet/src/webdriver/DevTools/BUILD.bazel

@@ -1,6 +1,12 @@
 load("//dotnet:defs.bzl", "generate_devtools")
 load("//dotnet:selenium-dotnet-version.bzl", "SUPPORTED_DEVTOOLS_VERSIONS")
 
+filegroup(
+    name = "srcs",
+    srcs = glob(["**/*.cs"]),
+    visibility = ["//dotnet/src/webdriver:__pkg__"],
+)
+
 [
     generate_devtools(
         name = "generate-{}".format(devtools_version),

dotnet/src/webdriver/cdp/README.md dotnet/src/webdriver/DevTools/README.mddotnet/src/webdriver/cdp/README.md renamed to dotnet/src/webdriver/DevTools/README.md

@@ -18,10 +18,10 @@ add an entry for version `<N>` to the `SupportedDevToolsVersions` dictionary ini
 add the following block (substituting the proper value for `<N>`):
 
 ```bash
-if not exist  "%1..\..\..\bazel-bin\dotnet\src\webdriver\cdp\v<N>\DevToolsSessionDomains.cs" (
+if not exist  "%1..\..\..\bazel-bin\dotnet\src\webdriver\DevTools\v<N>\DevToolsSessionDomains.cs" (
   echo Generating CDP code for version <N>
   pushd "%1..\..\.."
-  bazel build //dotnet/src/webdriver/cdp:generate-v<N>
+  bazel build //dotnet/src/webdriver/DevTools:generate-v<N>
   popd
 )
 ```
@@ -30,10 +30,10 @@ if not exist  "%1..\..\..\bazel-bin\dotnet\src\webdriver\cdp\v<N>\DevToolsSessio
 add the following block (substituting the proper value for `<N>`):
 
 ```bash
-if [[ ! -f "$1../../../bazel-bin/dotnet/src/webdriver/cdp/v<N>/DevToolsSessionDomains.cs" ]]
+if [[ ! -f "$1../../../bazel-bin/dotnet/src/webdriver/DevTools/v<N>/DevToolsSessionDomains.cs" ]]
 then
   echo "Generating CDP code for version <N>"
-  bazel build //dotnet/src/webdriver/cdp:generate-v<N>
+  bazel build //dotnet/src/webdriver/DevTools:generate-v<N>
 fi
 ```
 

dotnet/src/webdriver/Selenium.WebDriver.csproj

@@ -94,10 +94,10 @@
   </Target>
 
   <Target Name="GenerateCdp" BeforeTargets="CoreCompile">
-    <Exec Command="bazel build //dotnet/src/webdriver/cdp/..." WorkingDirectory="../../.." />
+    <Exec Command="bazel build //dotnet/src/webdriver/DevTools/..." WorkingDirectory="../../.." />
 
     <ItemGroup>
-      <Compile Include="..\..\..\bazel-bin\dotnet\src\webdriver\cdp\**\*.cs" LinkBase="DevTools\generated" />
+      <Compile Include="..\..\..\bazel-bin\dotnet\src\webdriver\DevTools\**\*.cs" LinkBase="DevTools\generated" />
     </ItemGroup>
   </Target>
 

java/src/org/openqa/selenium/devtools/events/CdpEventTypes.java

@@ -66,7 +66,9 @@ public void initializeListener(WebDriver webDriver) {
   public static EventType<Void> domMutation(Consumer<@Nullable DomMutationEvent> handler) {
     Require.nonNull("Handler", handler);
 
-    String script = Read.resourceAsString("/org/openqa/selenium/devtools/mutation-listener.js");
+    String script =
+        Read.resourceAsString(
+            CdpEventTypes.class, "/org/openqa/selenium/devtools/mutation-listener.js");
 
     return new EventType<>() {
       @Override

java/src/org/openqa/selenium/io/Read.java

@@ -18,6 +18,7 @@
 package org.openqa.selenium.io;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Objects.requireNonNull;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -53,8 +54,19 @@ public static String toString(InputStream in) throws IOException {
     return new String(toByteArray(in), UTF_8);
   }
 
+  /**
+   * This method might not work in OSGI environment.
+   *
+   * @deprecated Use {@link #resourceAsString(Class, String)} instead
+   */
+  @Deprecated
   public static String resourceAsString(String resource) {
-    try (InputStream stream = Read.class.getResourceAsStream(resource)) {
+    return resourceAsString(Read.class, resource);
+  }
+
+  public static String resourceAsString(Class<?> resourceOwner, String resource) {
+    Class<?> clazz = requireNonNull(resourceOwner, "Class owning the resource");
+    try (InputStream stream = clazz.getResourceAsStream(resource)) {
       if (stream == null) {
         throw new IllegalArgumentException("Resource not found: " + resource);
       }

java/src/org/openqa/selenium/remote/RemoteScript.java

@@ -84,7 +84,7 @@ public void removeJavaScriptErrorHandler(long id) {
   @Override
   public long addDomMutationHandler(Consumer<DomMutation> consumer) {
     String scriptValue =
-        Read.resourceAsString("/org/openqa/selenium/remote/bidi-mutation-listener.js");
+        Read.resourceAsString(getClass(), "/org/openqa/selenium/remote/bidi-mutation-listener.js");
 
     this.script.addPreloadScript(scriptValue, List.of(new ChannelValue("channel_name")));
 

java/src/org/openqa/selenium/remote/codec/w3c/W3CHttpCommandCodec.java

@@ -363,7 +363,7 @@ private List<String> stringToUtf8Array(String toConvert) {
               atomFileName,
               (fileName) -> {
                 String rawFunction =
-                    resourceAsString("/org/openqa/selenium/remote/" + atomFileName);
+                    resourceAsString(getClass(), "/org/openqa/selenium/remote/" + atomFileName);
                 String atomName = fileName.replace(".js", "");
                 return String.format(
                     "/* %s */return (%s).apply(null, arguments);", atomName, rawFunction);