Fix Microsoft.JSInterop tests

Author: oroztocil

src/JSInterop/Microsoft.JSInterop/test/Infrastructure/DotNetDispatcherTest.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 #nullable disable
+using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using Microsoft.AspNetCore.InternalTesting;
 
@@ -1088,16 +1089,26 @@ protected override void BeginInvokeJS(JSInvocationInfo invocationInfo)
             _nextInvocationTcs = new TaskCompletionSource();
         }
 
-        protected override string InvokeJS(string identifier, string argsJson, JSCallResultType resultType, long targetInstanceId)
+        protected override void BeginInvokeJS(long taskId, string identifier, [StringSyntax("Json")] string argsJson, JSCallResultType resultType, long targetInstanceId)
+        {
+            throw new NotImplementedException();
+        }
+
+        protected override string InvokeJS(JSInvocationInfo invocationInfo)
         {
             LastInvocationAsyncHandle = default;
-            LastInvocationIdentifier = identifier;
-            LastInvocationArgsJson = argsJson;
+            LastInvocationIdentifier = invocationInfo.Identifier;
+            LastInvocationArgsJson = invocationInfo.ArgsJson;
             _nextInvocationTcs.SetResult();
             _nextInvocationTcs = new TaskCompletionSource();
             return null;
         }
 
+        protected override string InvokeJS(string identifier, string argsJson, JSCallResultType resultType, long targetInstanceId)
+        {
+            throw new NotImplementedException();
+        }
+
         protected internal override void EndInvokeDotNet(DotNetInvocationInfo invocationInfo, in DotNetInvocationResult invocationResult)
         {
             LastCompletionCallId = invocationInfo.CallId;

src/JSInterop/Microsoft.JSInterop/test/JSInProcessRuntimeTest.cs

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.JSInterop.Infrastructure;
 
 namespace Microsoft.JSInterop;
@@ -91,22 +92,24 @@ class TestDTO
 
     class TestJSInProcessRuntime : JSInProcessRuntime
     {
-        public List<InvokeArgs> InvokeCalls { get; set; } = new List<InvokeArgs>();
+        public List<JSInvocationInfo> InvokeCalls { get; set; } = [];
 
         public string? NextResultJson { get; set; }
 
         protected override string? InvokeJS(string identifier, string? argsJson, JSCallResultType resultType, long targetInstanceId)
         {
-            InvokeCalls.Add(new InvokeArgs { Identifier = identifier, ArgsJson = argsJson });
-            return NextResultJson;
+            throw new NotImplementedException();
         }
 
-        public class InvokeArgs
+        protected override string? InvokeJS(JSInvocationInfo invocationInfo)
         {
-            public string? Identifier { get; set; }
-            public string? ArgsJson { get; set; }
+            InvokeCalls.Add(invocationInfo);
+            return NextResultJson;
         }
 
+        protected override void BeginInvokeJS(long taskId, string identifier, [StringSyntax("Json")] string? argsJson, JSCallResultType resultType, long targetInstanceId)
+            => throw new NotImplementedException("This test only covers sync calls");
+
         protected override void BeginInvokeJS(JSInvocationInfo invocationInfo)
             => throw new NotImplementedException("This test only covers sync calls");
 

src/JSInterop/Microsoft.JSInterop/test/JSObjectReferenceTest.cs

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.JSInterop.Implementation;
 using Microsoft.JSInterop.Infrastructure;
 
@@ -74,6 +75,11 @@ protected override void BeginInvokeJS(JSInvocationInfo invocationInfo)
             BeginInvokeJSInvocationCount++;
         }
 
+        protected override void BeginInvokeJS(long taskId, string identifier, [StringSyntax("Json")] string? argsJson, JSCallResultType resultType, long targetInstanceId)
+        {
+            throw new NotImplementedException();
+        }
+
         protected internal override void EndInvokeDotNet(DotNetInvocationInfo invocationInfo, in DotNetInvocationResult invocationResult)
         {
         }
@@ -87,13 +93,23 @@ protected override void BeginInvokeJS(JSInvocationInfo invocationInfo)
         {
         }
 
-        protected override string? InvokeJS(string identifier, string? argsJson, JSCallResultType resultType, long targetInstanceId)
+        protected override void BeginInvokeJS(long taskId, string identifier, [StringSyntax("Json")] string? argsJson, JSCallResultType resultType, long targetInstanceId)
+        {
+            throw new NotImplementedException();
+        }
+
+        protected override string? InvokeJS(JSInvocationInfo invocationInfo)
         {
             InvokeJSInvocationCount++;
 
             return null;
         }
 
+        protected override string? InvokeJS(string identifier, string? argsJson, JSCallResultType resultType, long targetInstanceId)
+        {
+            throw new NotImplementedException();
+        }
+
         protected internal override void EndInvokeDotNet(DotNetInvocationInfo invocationInfo, in DotNetInvocationResult invocationResult)
         {
         }

src/JSInterop/Microsoft.JSInterop/test/JSRuntimeTest.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Text;
 using System.Text.Json;
 using Microsoft.JSInterop.Implementation;
@@ -475,6 +476,11 @@ protected internal override void EndInvokeDotNet(DotNetInvocationInfo invocation
             });
         }
 
+        protected override void BeginInvokeJS(long taskId, string identifier, [StringSyntax("Json")] string? argsJson, JSCallResultType resultType, long targetInstanceId)
+        {
+            throw new NotImplementedException();
+        }
+
         protected override void BeginInvokeJS(JSInvocationInfo invocationInfo)
         {
             BeginInvokeCalls.Add(invocationInfo);

src/JSInterop/Microsoft.JSInterop/test/TestJSRuntime.cs

@@ -1,12 +1,18 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.JSInterop.Infrastructure;
 
 namespace Microsoft.JSInterop;
 
 internal class TestJSRuntime : JSRuntime
 {
+    protected override void BeginInvokeJS(long taskId, string identifier, [StringSyntax("Json")] string? argsJson, JSCallResultType resultType, long targetInstanceId)
+    {
+        throw new NotImplementedException();
+    }
+
     protected override void BeginInvokeJS(JSInvocationInfo invocationInfo)
     {
         throw new NotImplementedException();