[Android] gRPC client tests

.config/CredScanSuppressions.json

@@ -7,7 +7,8 @@
                 "src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/DSA/DSAKeyPemTests.cs",
                 "src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/EC/ECKeyPemTests.cs",
                 "src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAKeyPemTests.cs",
-                "src/libraries/System.Security.Cryptography.X509Certificates/tests/TestData.cs"
+                "src/libraries/System.Security.Cryptography.X509Certificates/tests/TestData.cs",
+                "src/tests/FunctionalTests/Android/Device_Emulator/gRPC/grpc-dotnet/testassets/Certs/InteropTests/server1.key"
             ],
             "placeholder": [
                 "-----BEGIN PRIVATE KEY-----",

eng/Versions.props

@@ -165,6 +165,8 @@
     <FsCheckVersion>2.14.3</FsCheckVersion>
     <!-- Android gRPC client tests -->
     <GoogleProtobufVersion>3.19.4</GoogleProtobufVersion>
+    <GrpcAspNetCoreVersion>2.46.0</GrpcAspNetCoreVersion>
+    <GrpcAspNetCoreWebVersion>2.46.0</GrpcAspNetCoreWebVersion>
     <GrpcAuthVersion>2.46.3</GrpcAuthVersion>
     <GrpcCoreVersion>2.46.3</GrpcCoreVersion>
     <GrpcDotnetClientVersion>2.45.0</GrpcDotnetClientVersion>

src/tests/FunctionalTests/Android/Device_Emulator/gRPC/Android.Device_Emulator.gRPC.Test.csproj

@@ -52,8 +52,6 @@
     <PackageReference Include="Grpc.Core" Version="$(GrpcCoreVersion)" PrivateAssets="All" />
     <PackageReference Include="Grpc.Net.Client" Version="$(GrpcDotnetClientVersion)" />
     <PackageReference Include="Grpc.Tools" Version="$(GrpcToolsVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingVersion)" />
-    <PackageReference Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
   </ItemGroup>
 
   <Target Name="BuildServerDockerImage" AfterTargets="Build" Condition="'$(BuildGrpcServerDockerImage)' == 'true'">

src/tests/FunctionalTests/Android/Device_Emulator/gRPC/Program.cs

@@ -1,7 +1,8 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
 using System;
 using System.Diagnostics.CodeAnalysis;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 
 // The code of the tests is cloned from https://github.com/grpc/grpc-dotnet
 using Grpc.Shared.TestAssets;
@@ -76,18 +77,15 @@ void Log(string testName, string status)
 
 sealed class InteropClientWrapper
 {
-    private readonly InteropClient interopClient;
+    private readonly InteropClient _interopClient;
 
     [DynamicDependency(DynamicallyAccessedMemberTypes.All, "Grpc.Testing.TestService.TestServiceClient", "Android.Device_Emulator.gRPC.Test")]
     [DynamicDependency(DynamicallyAccessedMemberTypes.All, "Grpc.Testing.UnimplementedService.UnimplementedServiceClient", "Android.Device_Emulator.gRPC.Test")]
     public InteropClientWrapper(ClientOptions options)
     {
-        interopClient = new InteropClient(
-            options,
-            Microsoft.Extensions.Logging.Abstractions.NullLoggerFactory.Instance
-        );
+        _interopClient = new InteropClient(options);
     }
 
     public Task Run()
-        => interopClient.Run();
+        => _interopClient.Run();
 }

src/tests/FunctionalTests/Android/Device_Emulator/gRPC/THIRD-PARTY-NOTICES

@@ -0,0 +1,26 @@
+.NET Runtime uses third-party libraries or other resources that may be
+distributed under licenses different than the .NET Runtime software.
+
+In the event that we accidentally failed to list a required notice, please
+bring it to our attention. Post an issue or email us:
+
+           [email protected]
+
+The attached notices are provided for information only.
+
+License notice for Grpc.Net.Client
+-------------------------------
+
+Copyright 2019 The gRPC Authors
+
+Licensed 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.

src/tests/FunctionalTests/Android/Device_Emulator/gRPC/grpc-dotnet/testassets/InteropTestsWebsite/InteropTestsWebsite.csproj

@@ -21,9 +21,13 @@
     <None Include="..\Certs\InteropTests\*.*" LinkBase="Certs">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+  </ItemGroup>
+
+  <Import Project="Versions.props" />
 
-    <PackageReference Include="Grpc.AspNetCore" Version="2.46.0" />
-    <PackageReference Include="Grpc.AspNetCore.Web" Version="2.46.0" />
+  <ItemGroup>
+    <PackageReference Include="Grpc.AspNetCore" Version="$(GrpcAspNetCoreVersion)" />
+    <PackageReference Include="Grpc.AspNetCore.Web" Version="$(GrpcAspNetCoreWebVersion)" />
   </ItemGroup>
 
 </Project>

src/tests/FunctionalTests/Android/Device_Emulator/gRPC/grpc-dotnet/testassets/Shared/InteropClient.cs

@@ -21,7 +21,6 @@
 using Grpc.Core;
 using Grpc.Net.Client;
 using Grpc.Testing;
-using Microsoft.Extensions.Logging;
 using Empty = Grpc.Testing.Empty;
 using System.Security.Authentication;
 
@@ -47,32 +46,19 @@ public class InteropClient
         internal const string CompressionRequestAlgorithmMetadataKey = "grpc-internal-encoding-request";
 
         private readonly ClientOptions options;
-        private readonly ILoggerFactory loggerFactory;
-        private readonly ILogger<InteropClient> logger;
 
-        public InteropClient(ClientOptions options, ILoggerFactory loggerFactory)
+        public InteropClient(ClientOptions options)
         {
             this.options = options;
-            this.loggerFactory = loggerFactory;
-            this.logger = loggerFactory.CreateLogger<InteropClient>();
         }
 
         public async Task Run()
         {
             var channel = HttpClientCreateChannel();
 
-            try
-            {
-                var message = "Running " + options.TestCase;
-                logger.LogInformation(message);
-                await RunTestCaseAsync(channel, options);
-                logger.LogInformation("Passed!");
-            }
-            catch (Exception ex)
-            {
-                logger.LogInformation(ex, "Failed!");
-                throw;
-            }
+            var message = "Running " + options.TestCase;
+            await RunTestCaseAsync(channel, options);
+
             await channel.ShutdownAsync();
         }
 
@@ -104,7 +90,6 @@ private IChannelWrapper HttpClientCreateChannel()
             {
                 Credentials = credentials,
                 HttpHandler = httpMessageHandler,
-                LoggerFactory = loggerFactory
             });
 
             return new GrpcChannelWrapper(channel);