Merge pull request #76 from firebase/hkj-auth-test

Cleaning up the test utils

Author: hiranya911

FirebaseAdmin/FirebaseAdmin.Tests/Auth/FirebaseUserManagerTest.cs

@@ -58,7 +58,7 @@ public async Task GetPublicKeysWithCaching()
             var handler = new MockMessageHandler()
             {
                 Response = File.ReadAllBytes("./resources/public_keys.json"),
-                ApplyHeaders = (header) => header.CacheControl = cacheControl,
+                ApplyHeaders = (header, _) => header.CacheControl = cacheControl,
             };
             var clientFactory = new MockHttpClientFactory(handler);
             var keyManager = new HttpPublicKeySource(

FirebaseAdmin/FirebaseAdmin.Tests/Auth/HttpPublicKeySourceTest.cs

@@ -54,7 +54,7 @@ public async Task Signer()
             byte[] signature = await signer.SignDataAsync(data);
             Assert.Equal(bytes, signature);
             var req = NewtonsoftJsonSerializer.Instance.Deserialize<IAMSigner.SignBlobRequest>(
-                handler.Request);
+                handler.LastRequestBody);
             Assert.Equal(Convert.ToBase64String(data), req.BytesToSign);
             Assert.Equal(2, handler.Calls);
         }
@@ -99,7 +99,7 @@ public async Task Signer()
             byte[] signature = await signer.SignDataAsync(data);
             Assert.Equal(bytes, signature);
             var req = NewtonsoftJsonSerializer.Instance.Deserialize<IAMSigner.SignBlobRequest>(
-                handler.Request);
+                handler.LastRequestBody);
             Assert.Equal(Convert.ToBase64String(data), req.BytesToSign);
             Assert.Equal(1, handler.Calls);
         }

FirebaseAdmin/FirebaseAdmin.Tests/Auth/IAMSignerTest.cs

@@ -0,0 +1,44 @@
+// Copyright 2019, Google Inc. All rights reserved.
+//
+// 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.
+
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace FirebaseAdmin.Tests
+{
+    /// <summary>
+    /// An <see cref="HttpMessageHandler"/> implementation that counts the number of requests
+    /// processed.
+    /// </summary>
+    internal abstract class CountingMessageHandler : HttpMessageHandler
+    {
+        private int calls;
+
+        public int Calls
+        {
+            get => this.calls;
+        }
+
+        protected sealed override Task<HttpResponseMessage> SendAsync(
+          HttpRequestMessage request, CancellationToken cancellationToken)
+        {
+            var count = Interlocked.Increment(ref this.calls);
+            return this.DoSendAsync(request, count, cancellationToken);
+        }
+
+        protected abstract Task<HttpResponseMessage> DoSendAsync(
+            HttpRequestMessage request, int count, CancellationToken cancellationToken);
+    }
+}

FirebaseAdmin/FirebaseAdmin.Tests/CountingMessageHandler.cs

@@ -75,11 +75,11 @@ public async Task SendAsync()
             var response = await client.SendAsync(message);
 
             Assert.Equal("test-response", response);
-            var req = JsonConvert.DeserializeObject<FirebaseMessagingClient.SendRequest>(handler.Request);
+            var req = JsonConvert.DeserializeObject<FirebaseMessagingClient.SendRequest>(handler.LastRequestBody);
             Assert.Equal("test-topic", req.Message.Topic);
             Assert.False(req.ValidateOnly);
             Assert.Equal(1, handler.Calls);
-            var versionHeader = handler.RequestHeaders.GetValues("X-Firebase-Client").First();
+            var versionHeader = handler.LastRequestHeaders.GetValues("X-Firebase-Client").First();
             Assert.Equal(FirebaseMessagingClient.ClientVersion, versionHeader);
         }
 
@@ -103,11 +103,11 @@ public async Task SendDryRunAsync()
             var response = await client.SendAsync(message, dryRun: true);
 
             Assert.Equal("test-response", response);
-            var req = JsonConvert.DeserializeObject<FirebaseMessagingClient.SendRequest>(handler.Request);
+            var req = JsonConvert.DeserializeObject<FirebaseMessagingClient.SendRequest>(handler.LastRequestBody);
             Assert.Equal("test-topic", req.Message.Topic);
             Assert.True(req.ValidateOnly);
             Assert.Equal(1, handler.Calls);
-            var versionHeader = handler.RequestHeaders.GetValues("X-Firebase-Client").First();
+            var versionHeader = handler.LastRequestHeaders.GetValues("X-Firebase-Client").First();
             Assert.Equal(FirebaseMessagingClient.ClientVersion, versionHeader);
         }
 
@@ -148,7 +148,7 @@ public async Task SendAllAsync()
             var handler = new MockMessageHandler()
             {
                 Response = rawResponse,
-                ApplyContentHeaders = (headers) =>
+                ApplyHeaders = (_, headers) =>
                 {
                     headers.Remove("Content-Type");
                     headers.TryAddWithoutValidation("Content-Type", "multipart/mixed; boundary=batch_test-boundary");
@@ -172,7 +172,7 @@ public async Task SendAllAsync()
             Assert.Equal("projects/fir-adminintegrationtests/messages/5903525881088369386", response.Responses[1].MessageId);
             Assert.Equal(1, handler.Calls);
             var versionHeader = $"X-Firebase-Client: {FirebaseMessagingClient.ClientVersion}";
-            Assert.Equal(2, this.CountLinesWithPrefix(handler.Request, versionHeader));
+            Assert.Equal(2, this.CountLinesWithPrefix(handler.LastRequestBody, versionHeader));
         }
 
         [Fact]
@@ -223,7 +223,7 @@ public async Task SendAllAsyncWithError()
             var handler = new MockMessageHandler()
             {
                 Response = rawResponse,
-                ApplyContentHeaders = (headers) =>
+                ApplyHeaders = (_, headers) =>
                 {
                     headers.Remove("Content-Type");
                     headers.TryAddWithoutValidation("Content-Type", "multipart/mixed; boundary=batch_test-boundary");
@@ -248,7 +248,7 @@ public async Task SendAllAsyncWithError()
             Assert.NotNull(response.Responses[1].Exception);
             Assert.Equal(1, handler.Calls);
             var versionHeader = $"X-Firebase-Client: {FirebaseMessagingClient.ClientVersion}";
-            Assert.Equal(2, this.CountLinesWithPrefix(handler.Request, versionHeader));
+            Assert.Equal(2, this.CountLinesWithPrefix(handler.LastRequestBody, versionHeader));
         }
 
         [Fact]
@@ -295,7 +295,7 @@ public async Task HttpErrorAsync()
                 async () => await client.SendAsync(message));
             Assert.Contains("not json", ex.Message);
             var req = JsonConvert.DeserializeObject<FirebaseMessagingClient.SendRequest>(
-                handler.Request);
+                handler.LastRequestBody);
             Assert.Equal("test-topic", req.Message.Topic);
             Assert.False(req.ValidateOnly);
             Assert.Equal(1, handler.Calls);

FirebaseAdmin/FirebaseAdmin.Tests/Messaging/FirebaseMessagingClientTest.cs

@@ -0,0 +1,34 @@
+// Copyright 2019, Google Inc. All rights reserved.
+//
+// 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.
+
+using System.Net.Http;
+using Google.Apis.Http;
+
+namespace FirebaseAdmin.Tests
+{
+    internal sealed class MockHttpClientFactory : HttpClientFactory
+    {
+        private readonly HttpMessageHandler handler;
+
+        public MockHttpClientFactory(HttpMessageHandler handler)
+        {
+            this.handler = handler;
+        }
+
+        protected override HttpMessageHandler CreateHandler(CreateHttpClientArgs args)
+        {
+            return this.handler;
+        }
+    }
+}