Merge branch 'trunk' into py-314

Author: cgoldberg

dotnet/src/webdriver/BiDi/Browser/ClientWindowInfo.cs

@@ -17,10 +17,14 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
+using System.Text.Json.Serialization;
+
 namespace OpenQA.Selenium.BiDi.Browser;
 
 public sealed record ClientWindowInfo(bool Active, ClientWindow ClientWindow, ClientWindowState State, int Height, int Width, int X, int Y);
 
+[JsonConverter(typeof(CamelCaseEnumConverter<ClientWindowState>))]
 public enum ClientWindowState
 {
     Fullscreen,

dotnet/src/webdriver/BiDi/BrowsingContext/CaptureScreenshotCommand.cs

@@ -18,6 +18,7 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System;
 using System.Text.Json.Serialization;
 
@@ -37,6 +38,7 @@ public sealed class CaptureScreenshotOptions : CommandOptions
     public ClipRectangle? Clip { get; set; }
 }
 
+[JsonConverter(typeof(CamelCaseEnumConverter<ScreenshotOrigin>))]
 public enum ScreenshotOrigin
 {
     Viewport,

dotnet/src/webdriver/BiDi/BrowsingContext/CreateCommand.cs

@@ -18,6 +18,8 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
+using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
 
@@ -35,6 +37,7 @@ public sealed class CreateOptions : CommandOptions
     public Browser.UserContext? UserContext { get; set; }
 }
 
+[JsonConverter(typeof(CamelCaseEnumConverter<ContextType>))]
 public enum ContextType
 {
     Tab,

dotnet/src/webdriver/BiDi/BrowsingContext/Locator.cs

@@ -17,6 +17,7 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
@@ -54,6 +55,7 @@ public sealed record AccessibilityValue
 
 public sealed record ContextValue(BrowsingContext Context);
 
+[JsonConverter(typeof(CamelCaseEnumConverter<MatchType>))]
 public enum MatchType
 {
     Full,

dotnet/src/webdriver/BiDi/BrowsingContext/NavigateCommand.cs

@@ -18,6 +18,8 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
+using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
 
@@ -31,6 +33,7 @@ public sealed class NavigateOptions : CommandOptions
     public ReadinessState? Wait { get; set; }
 }
 
+[JsonConverter(typeof(CamelCaseEnumConverter<ReadinessState>))]
 public enum ReadinessState
 {
     None,

dotnet/src/webdriver/BiDi/BrowsingContext/PrintCommand.cs

@@ -18,8 +18,10 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System;
 using System.Collections.Generic;
+using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
 
@@ -56,6 +58,7 @@ public struct PrintMargin
     public double? Top { get; set; }
 }
 
+[JsonConverter(typeof(CamelCaseEnumConverter<PrintOrientation>))]
 public enum PrintOrientation
 {
     Portrait,

dotnet/src/webdriver/BiDi/BrowsingContext/UserPromptOpenedEventArgs.cs

@@ -17,6 +17,7 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.BrowsingContext;
@@ -28,6 +29,7 @@ public sealed record UserPromptOpenedEventArgs(BiDi BiDi, BrowsingContext Contex
     public string? DefaultValue { get; internal set; }
 }
 
+[JsonConverter(typeof(CamelCaseEnumConverter<UserPromptType>))]
 public enum UserPromptType
 {
     Alert,

dotnet/src/webdriver/BiDi/Communication/Broker.cs

@@ -83,14 +83,11 @@ internal Broker(BiDi bidi, Uri url)
                 new InternalIdConverter(_bidi),
                 new PreloadScriptConverter(_bidi),
                 new RealmConverter(_bidi),
-                new RealmTypeConverter(),
-                new ScreenOrientationTypeConverter(),
                 new DateTimeOffsetConverter(),
                 new PrintPageRangeConverter(),
                 new InputOriginConverter(),
                 new WebExtensionConverter(_bidi),
                 new SubscriptionConverter(),
-                new JsonStringEnumConverter(JsonNamingPolicy.CamelCase),
 
                 // https://github.com/dotnet/runtime/issues/72604
                 new Json.Converters.Polymorphic.EvaluateResultConverter(),

dotnet/src/webdriver/BiDi/Communication/Json/Converters/CamelCaseEnumConverter.cs

@@ -0,0 +1,27 @@
+// <copyright file="CamelCaseEnumConverter.cs" company="Selenium Committers">
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+// </copyright>
+
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace OpenQA.Selenium.BiDi.Communication.Json.Converters;
+
+public class CamelCaseEnumConverter<TEnum>() :
+    JsonStringEnumConverter<TEnum>(JsonNamingPolicy.CamelCase) where TEnum : struct, Enum;

dotnet/src/webdriver/BiDi/Communication/Json/Converters/KebabCaseEnumConverter.cs

@@ -0,0 +1,27 @@
+// <copyright file="KebabCaseEnumConverter.cs" company="Selenium Committers">
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+// </copyright>
+
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace OpenQA.Selenium.BiDi.Communication.Json.Converters;
+
+public class KebabCaseEnumConverter<TEnum>() :
+    JsonStringEnumConverter<TEnum>(JsonNamingPolicy.KebabCaseLower) where TEnum : struct, Enum;