Merge branch 'trunk' into final-python-pagesize-support

Author: yvsvarma

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

@@ -56,6 +56,7 @@ namespace OpenQA.Selenium.BiDi.Communication;
 [JsonDerivedType(typeof(Modules.Network.ProvideResponseCommand), "network.provideResponse")]
 [JsonDerivedType(typeof(Modules.Network.ContinueWithAuthCommand), "network.continueWithAuth")]
 [JsonDerivedType(typeof(Modules.Network.RemoveInterceptCommand), "network.removeIntercept")]
+[JsonDerivedType(typeof(Modules.Network.SetCacheBehaviorCommand), "network.setCacheBehavior")]
 
 [JsonDerivedType(typeof(Modules.Script.AddPreloadScriptCommand), "script.addPreloadScript")]
 [JsonDerivedType(typeof(Modules.Script.RemovePreloadScriptCommand), "script.removePreloadScript")]

dotnet/src/webdriver/BiDi/Modules/BrowsingContext/BrowsingContextNetworkModule.cs

@@ -69,6 +69,16 @@ public async Task<Intercept> InterceptAuthAsync(Func<AuthRequiredEventArgs, Task
         return intercept;
     }
 
+    public Task SetCacheBehaviorAsync(CacheBehavior behavior, BrowsingContextSetCacheBehaviorOptions? options = null)
+    {
+        SetCacheBehaviorOptions setCacheBehaviorOptions = new(options)
+        {
+            Contexts = [context]
+        };
+
+        return networkModule.SetCacheBehaviorAsync(behavior, setCacheBehaviorOptions);
+    }
+
     public Task<Subscription> OnBeforeRequestSentAsync(Func<BeforeRequestSentEventArgs, Task> handler, SubscriptionOptions? options = null)
     {
         return networkModule.OnBeforeRequestSentAsync(handler, new BrowsingContextsSubscriptionOptions(options) { Contexts = [context] });

dotnet/src/webdriver/BiDi/Modules/Network/NetworkModule.cs

@@ -68,6 +68,18 @@ public async Task<Intercept> InterceptResponseAsync(Func<ResponseStartedEventArg
         return intercept;
     }
 
+    public async Task SetCacheBehaviorAsync(CacheBehavior behavior, SetCacheBehaviorOptions? options = null)
+    {
+        var @params = new SetCacheBehaviorCommandParameters(behavior);
+
+        if (options is not null)
+        {
+            @params.Contexts = options.Contexts;
+        }
+
+        await Broker.ExecuteCommandAsync(new SetCacheBehaviorCommand(@params), options).ConfigureAwait(false);
+    }
+
     public async Task<Intercept> InterceptAuthAsync(Func<AuthRequiredEventArgs, Task> handler, AddInterceptOptions? interceptOptions = null, SubscriptionOptions? options = null)
     {
         var intercept = await AddInterceptAsync([InterceptPhase.AuthRequired], interceptOptions).ConfigureAwait(false);

dotnet/src/webdriver/BiDi/Modules/Network/SetCacheBehaviorCommand.cs

@@ -0,0 +1,58 @@
+// <copyright file="SetCacheBehaviorCommand.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.Collections.Generic;
+using OpenQA.Selenium.BiDi.Communication;
+
+#nullable enable
+
+namespace OpenQA.Selenium.BiDi.Modules.Network;
+
+internal class SetCacheBehaviorCommand(SetCacheBehaviorCommandParameters @params) : Command<SetCacheBehaviorCommandParameters>(@params);
+
+internal record SetCacheBehaviorCommandParameters(CacheBehavior CacheBehavior) : CommandParameters
+{
+    public IEnumerable<BrowsingContext.BrowsingContext>? Contexts { get; set; }
+}
+
+public record SetCacheBehaviorOptions : CommandOptions
+{
+    public SetCacheBehaviorOptions()
+    {
+
+    }
+
+    internal SetCacheBehaviorOptions(BrowsingContextSetCacheBehaviorOptions? options)
+    {
+
+    }
+
+    public IEnumerable<BrowsingContext.BrowsingContext>? Contexts { get; set; }
+}
+
+public record BrowsingContextSetCacheBehaviorOptions
+{
+
+}
+
+public enum CacheBehavior
+{
+    Default,
+    Bypass
+}

dotnet/test/common/BiDi/Network/NetworkTest.cs

@@ -211,4 +211,11 @@ public async Task CanFailRequest()
 
         Assert.That(action, Throws.TypeOf<BiDiException>().With.Message.Contain("net::ERR_FAILED").Or.Message.Contain("NS_ERROR_ABORT"));
     }
+
+    [Test]
+    public void CanSetCacheBehavior()
+    {
+        Assert.That(async () => await bidi.Network.SetCacheBehaviorAsync(CacheBehavior.Default), Throws.Nothing);
+        Assert.That(async () => await context.Network.SetCacheBehaviorAsync(CacheBehavior.Default), Throws.Nothing);
+    }
 }

third_party/dotnet/devtools/src/generator/Templates/command.hbs

@@ -14,10 +14,7 @@ namespace {{rootNamespace}}.{{domain.Name}}
         /// Gets the name of the command.
         /// </summary>
         [JsonIgnore]
-        public string CommandName
-        {
-            get { return DevToolsRemoteInterface_CommandName; }
-        }
+        public string CommandName => DevToolsRemoteInterface_CommandName;
 
     {{#each command.Parameters}}
         {{#if Description}}
@@ -31,11 +28,8 @@ namespace {{rootNamespace}}.{{domain.Name}}
         {{/if}}
         [JsonPropertyName("{{Name}}")]
         {{#if Optional}}[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]{{/if}}
-        public {{typemap ../context}} {{dehumanize Name}}
-        {
-            get;
-            set;
-        }
+        public {{typemap ../context}} {{dehumanize Name}} { get; set; }
+
     {{/each}}
     }
 
@@ -56,11 +50,8 @@ namespace {{rootNamespace}}.{{domain.Name}}
         {{/if}}
         [JsonPropertyName("{{Name}}")]
         {{#if Optional}}[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]{{/if}}
-        public {{typemap ../context}} {{dehumanize Name}}
-        {
-            get;
-            set;
-        }
+        public {{typemap ../context}} {{dehumanize Name}} { get; set; }
+
     {{/each}}
     }
 }

third_party/dotnet/devtools/src/generator/Templates/domain.hbs

@@ -12,18 +12,18 @@ namespace {{rootNamespace}}.{{domain.Name}}
     /// </summary>
     public class {{dehumanize domain.Name}}Adapter
     {
-        private readonly IDevToolsSession m_session;
         private readonly string m_domainName = "{{dehumanize domain.Name}}";
         private Dictionary<string, DevToolsEventData> m_eventMap = new Dictionary<string, DevToolsEventData>();
 
         /// <summary>
         /// Initializes a new instance of the {{dehumanize domain.Name}}Adapter class.
         /// </summary>
         /// <param name="session">The IDevToolsSession to be used with this adapter.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="session"/> is <see langword="null"/>.</exception>
         public {{dehumanize domain.Name}}Adapter(IDevToolsSession session)
         {
-            m_session = session ?? throw new ArgumentNullException(nameof(session));
-            m_session.DevToolsEventReceived += OnDevToolsEventReceived;
+            Session = session ?? throw new ArgumentNullException(nameof(session));
+            Session.DevToolsEventReceived += OnDevToolsEventReceived;
     {{#each domain.Events}}
             m_eventMap["{{Name}}"] = new DevToolsEventData(typeof({{dehumanize Name}}EventArgs), On{{dehumanize Name}});
     {{/each}}
@@ -32,16 +32,14 @@ namespace {{rootNamespace}}.{{domain.Name}}
         /// <summary>
         /// Gets the DevToolsSession associated with the adapter.
         /// </summary>
-        public IDevToolsSession Session
-        {
-            get { return m_session; }
-        }
+        public IDevToolsSession Session { get; }
 
     {{#each domain.Events}}
         /// <summary>
         /// {{xml-code-comment Description 2}}
         /// </summary>
         public event EventHandler<{{dehumanize Name}}EventArgs> {{dehumanize Name}};
+
     {{/each}}
 
     {{#each domain.Commands}}
@@ -50,8 +48,9 @@ namespace {{rootNamespace}}.{{domain.Name}}
         /// </summary>
         public Task<{{dehumanize Name}}CommandResponse> {{dehumanize Name}}({{dehumanize Name}}CommandSettings command{{#if NoParameters}} = null{{/if}}, CancellationToken cancellationToken = default(CancellationToken), int? millisecondsTimeout = null, bool throwExceptionIfResponseNotReceived = true)
         {
-            return m_session.SendCommand<{{dehumanize Name}}CommandSettings, {{dehumanize Name}}CommandResponse>(command{{#if NoParameters}} ?? new {{dehumanize Name}}CommandSettings(){{/if}}, cancellationToken, millisecondsTimeout, throwExceptionIfResponseNotReceived);
+            return Session.SendCommand<{{dehumanize Name}}CommandSettings, {{dehumanize Name}}CommandResponse>(command{{#if NoParameters}} ?? new {{dehumanize Name}}CommandSettings(){{/if}}, cancellationToken, millisecondsTimeout, throwExceptionIfResponseNotReceived);
         }
+
     {{/each}}
 
         private void OnDevToolsEventReceived(object sender, DevToolsEventReceivedEventArgs e)
@@ -70,12 +69,12 @@ namespace {{rootNamespace}}.{{domain.Name}}
     {{#each domain.Events}}
         private void On{{dehumanize Name}}(object rawEventArgs)
         {
-            {{dehumanize Name}}EventArgs e = rawEventArgs as {{dehumanize Name}}EventArgs;
-            if (e != null && {{dehumanize Name}} != null)
+            if (rawEventArgs is {{dehumanize Name}}EventArgs e)
             {
-                {{dehumanize Name}}(this, e);
+                {{dehumanize Name}}?.Invoke(this, e);
             }
         }
+
     {{/each}}
     }
 }

third_party/dotnet/devtools/src/generator/Templates/event.hbs

@@ -21,11 +21,8 @@ namespace {{rootNamespace}}.{{domain.Name}}
         {{/if}}
         [JsonPropertyName("{{Name}}")]
         {{#if Optional}}[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]{{/if}}
-        public {{typemap ../context}} {{dehumanize Name}}
-        {
-            get;
-            set;
-        }
+        public {{typemap ../context}} {{dehumanize Name}} { get; set; }
+
     {{/each}}
     }
 }

third_party/dotnet/devtools/src/generator/Templates/type-hash.hbs

@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 namespace {{rootNamespace}}.{{domain.Name}}
 {
     using System.Collections.Generic;
@@ -14,11 +14,8 @@ namespace {{rootNamespace}}.{{domain.Name}}
         ///</summary>
         [JsonPropertyName("{{Name}}")]
         {{#if Optional}}[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]{{/if}}
-        public {{typemap ../context}} {{dehumanize Name}}
-        {
-            get;
-            set;
-        }
+        public {{typemap ../context}} {{dehumanize Name}} { get; set; }
+
     {{/each}}
     }
-}
+}

third_party/dotnet/devtools/src/generator/Templates/type-object.hbs

@@ -1,4 +1,4 @@
-// <auto-generated />
+// <auto-generated />
 namespace {{rootNamespace}}.{{domain.Name}}
 {
     using System.Text.Json.Serialization;
@@ -14,11 +14,8 @@ namespace {{rootNamespace}}.{{domain.Name}}
         ///</summary>
         [JsonPropertyName("{{Name}}")]
         {{#if Optional}}[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]{{/if}}
-        public {{typemap ../context}} {{dehumanize Name}}
-        {
-            get;
-            set;
-        }
+        public {{typemap ../context}} {{dehumanize Name}} { get; set; }
+
     {{/each}}
     }
-}
+}