Merged with master; Migrated InstanceIdClient to the new HttpClient API

Author: hiranya911

.gitignore

@@ -2,3 +2,4 @@ bin/
 obj/
 .vscode/
 .vs/
+.idea/

CONTRIBUTING.md

@@ -100,7 +100,7 @@ Run the following commands from the command line to get your local environmentse
 ```bash
 $ git clone https://github.com/firebase/firebase-admin-dotnet.git
 $ cd firebase-admin-dotnet/FirebaseAdmin # Change into the FirebaseAdmin solution directory
-$ dotnet restore                         # Install dependencies 
+$ dotnet restore                         # Install dependencies
 ```
 
 ### Running Tests
@@ -119,6 +119,24 @@ To run the unit test suite:
 $ dotnet test FirebaseAdmin.Tests
 ```
 
+To invoke code coverage tools, run the unit tests as follows:
+
+```bash
+$ dotnet test FirebaseAdmin.Tests /p:CollectCoverage=true
+```
+
+The above command calculates and displays a code coverage summary. To produce a more detailed
+code coverage report, you can use a tool like
+[Report Generator](https://github.com/danielpalme/ReportGenerator):
+
+```bash
+$ dotnet test FirebaseAdmin.Tests /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
+$ dotnet path/to/ReportGenerator.dll -reports:./FirebaseAdmin.Tests/coverage.opencover.xml -targetdir:./reports
+```
+
+This generates a collection of HTML code coverage reports in a local subdirectory named
+`reports/`.
+
 The integration test suite requires a service account JSON key file, and an API key for a Firebase
 project. Create a new project in the [Firebase console](https://console.firebase.google.com) if
 you do not already have one. Use a separate, dedicated project for integration tests since the
@@ -143,4 +161,3 @@ Here are some highlights of the directory structure and notable source files
   * `FirebaseAdmin.Tests/` - Unit tests directory.
   * `FirebaseAdmin.IntegrationTests/` - Integration tests directory.
   * `FirebaseAdmin.Snippets/` - Example code snippets for the SDK.
-  

FirebaseAdmin/FirebaseAdmin.IntegrationTests/FirebaseMessagingTest.cs

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 using System;
+using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using FirebaseAdmin.Messaging;
@@ -120,5 +121,29 @@ public async Task SendMulticast()
             Assert.NotNull(response.Responses[0].Exception);
             Assert.NotNull(response.Responses[1].Exception);
         }
+
+        [Fact]
+        public async Task SubscribeToTopic()
+        {
+            var response = await FirebaseMessaging.DefaultInstance.SubscribeToTopicAsync("test-topic", new List<string> { "token1", "token2" });
+            Assert.NotNull(response);
+            Assert.Equal(2, response.FailureCount);
+            Assert.Equal("invalid-argument", response.Errors[0].Reason);
+            Assert.Equal(0, response.Errors[0].Index);
+            Assert.Equal("invalid-argument", response.Errors[1].Reason);
+            Assert.Equal(1, response.Errors[1].Index);
+        }
+
+        [Fact]
+        public async Task UnsubscribeFromTopic()
+        {
+            var response = await FirebaseMessaging.DefaultInstance.UnsubscribeFromTopicAsync("test-topic", new List<string> { "token1", "token2" });
+            Assert.NotNull(response);
+            Assert.Equal(2, response.FailureCount);
+            Assert.Equal("invalid-argument", response.Errors[0].Reason);
+            Assert.Equal(0, response.Errors[0].Index);
+            Assert.Equal("invalid-argument", response.Errors[1].Reason);
+            Assert.Equal(1, response.Errors[1].Index);
+        }
     }
 }

FirebaseAdmin/FirebaseAdmin.Tests/FirebaseAdmin.Tests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
@@ -10,6 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="coverlet.msbuild" Version="2.6.3" />
     <PackageReference Include="Google.Apis.Auth" Version="1.40.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
     <PackageReference Include="xunit" Version="2.3.1" />

FirebaseAdmin/FirebaseAdmin.Tests/Messaging/FcmOptionsTest.cs

@@ -0,0 +1,80 @@
+// 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;
+using FirebaseAdmin.Messaging;
+using FirebaseAdmin.Messaging.Util;
+using Xunit;
+
+namespace FirebaseAdmin.Tests.Messaging
+{
+    public class FcmOptionsTest
+    {
+        [Fact]
+        public void FcmOptionsCopyAndValidate()
+        {
+            var options = new FcmOptions() { AnalyticsLabel = "label" };
+            var result = options.CopyAndValidate();
+            Assert.Equal(options.AnalyticsLabel, result.AnalyticsLabel);
+        }
+
+        [Fact]
+        public void ApnsFcmOptionsCopyAndValidate()
+        {
+            var options = new ApnsFcmOptions() { AnalyticsLabel = "label" };
+            var result = options.CopyAndValidate();
+            Assert.Equal(options.AnalyticsLabel, result.AnalyticsLabel);
+        }
+
+        [Fact]
+        public void AndroidFcmOptionsCopyAndValidate()
+        {
+            var options = new AndroidFcmOptions() { AnalyticsLabel = "label" };
+            var result = options.CopyAndValidate();
+            Assert.Equal(options.AnalyticsLabel, result.AnalyticsLabel);
+        }
+
+        [Fact]
+        public void FcmOptionsCopyAndValidateNullLabel()
+        {
+            var options = new FcmOptions() { AnalyticsLabel = null };
+            options.CopyAndValidate();
+        }
+
+        [Fact]
+        public void FcmOptionsCopyAndValidateEmptyLabel()
+        {
+            var options = new FcmOptions() { AnalyticsLabel = string.Empty };
+            Assert.Throws<ArgumentException>(() => options.CopyAndValidate());
+        }
+
+        [Fact]
+        public void AnalyticsLabelTooLong()
+        {
+            Assert.Throws<ArgumentException>(() => AnalyticsLabelChecker.ValidateAnalyticsLabel(new string('a', 51)));
+        }
+
+        [Fact]
+        public void AnalyticsLabelEmtpty()
+        {
+            Assert.Throws<ArgumentException>(() => AnalyticsLabelChecker.ValidateAnalyticsLabel(string.Empty));
+        }
+
+        [Fact]
+        public void AnalyticsLabelInvalidCharacters()
+        {
+            Assert.Throws<ArgumentException>(() => AnalyticsLabelChecker.ValidateAnalyticsLabel("label(label)"));
+        }
+    }
+}

FirebaseAdmin/FirebaseAdmin.Tests/Messaging/FirebaseMessagingTest.cs

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 using System;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using FirebaseAdmin.Tests;
@@ -118,6 +119,56 @@ await Assert.ThrowsAsync<OperationCanceledException>(
                     new Message() { Topic = "test-topic" }, canceller.Token));
         }
 
+        [Fact]
+        public async Task SubscribeWithClientFactory()
+        {
+            var handler = new MockMessageHandler()
+            {
+                Response = @"{""results"":[{}]}",
+            };
+            var factory = new MockHttpClientFactory(handler);
+
+            var app = FirebaseApp.Create(new AppOptions()
+            {
+                Credential = GoogleCredential.FromAccessToken("test-token"),
+                HttpClientFactory = factory,
+                ProjectId = "test-project",
+            });
+            FirebaseMessaging messaging = FirebaseMessaging.GetMessaging(app);
+            Assert.NotNull(messaging);
+            Assert.Same(messaging, FirebaseMessaging.GetMessaging(app));
+
+            var response = await messaging.SubscribeToTopicAsync("test-topic", new List<string> { "test-token" });
+            Assert.Equal(0, response.FailureCount);
+            Assert.Equal(1, response.SuccessCount);
+            app.Delete();
+        }
+
+        [Fact]
+        public async Task UnsubscribeWithClientFactory()
+        {
+            var handler = new MockMessageHandler()
+            {
+                Response = @"{""results"":[{}]}",
+            };
+            var factory = new MockHttpClientFactory(handler);
+
+            var app = FirebaseApp.Create(new AppOptions()
+            {
+                Credential = GoogleCredential.FromAccessToken("test-token"),
+                HttpClientFactory = factory,
+                ProjectId = "test-project",
+            });
+            FirebaseMessaging messaging = FirebaseMessaging.GetMessaging(app);
+            Assert.NotNull(messaging);
+            Assert.Same(messaging, FirebaseMessaging.GetMessaging(app));
+
+            var response = await messaging.UnsubscribeFromTopicAsync("test-topic", new List<string> { "test-token" });
+            Assert.Equal(0, response.FailureCount);
+            Assert.Equal(1, response.SuccessCount);
+            app.Delete();
+        }
+
         public void Dispose()
         {
             FirebaseApp.DeleteAll();