added new test cases and other improvements

Author: RannyRanny

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>

FirebaseAdmin/FirebaseAdmin.Tests/Messaging/FcmOptionsTest.cs

@@ -0,0 +1,59 @@
+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 };
+            Assert.Throws<ArgumentException>(() => options.CopyAndValidate());
+        }
+
+        [Fact]
+        public void AnalyticsLabelTooLong()
+        {
+            Assert.Throws<ArgumentException>(() => AnalyticsLabelChecker.ValidateAnalyticsLabel("012345678901234567890123456789012345678901234567890"));
+        }
+
+        [Fact]
+        public void AnalyticsLabelEmtpty()
+        {
+            Assert.Throws<ArgumentException>(() => AnalyticsLabelChecker.ValidateAnalyticsLabel(string.Empty));
+        }
+
+        [Fact]
+        public void AnalyticsLabelInvalidCharacters()
+        {
+            Assert.Throws<ArgumentException>(() => AnalyticsLabelChecker.ValidateAnalyticsLabel("label(label)"));
+        }
+    }
+}

FirebaseAdmin/FirebaseAdmin/Messaging/AndroidFcmOptions.cs

@@ -24,7 +24,7 @@ internal AndroidFcmOptions CopyAndValidate()
             {
                 AnalyticsLabel = this.AnalyticsLabel,
             };
-            AnalyticsLabelChecker.CheckAnalyticsLabelOrThrow(this.AnalyticsLabel);
+            AnalyticsLabelChecker.ValidateAnalyticsLabel(copy.AnalyticsLabel);
 
             return copy;
         }

FirebaseAdmin/FirebaseAdmin/Messaging/ApnsFcmOptions.cs

@@ -24,7 +24,7 @@ internal ApnsFcmOptions CopyAndValidate()
             {
                 AnalyticsLabel = this.AnalyticsLabel,
             };
-            AnalyticsLabelChecker.CheckAnalyticsLabelOrThrow(this.AnalyticsLabel);
+            AnalyticsLabelChecker.ValidateAnalyticsLabel(copy.AnalyticsLabel);
 
             return copy;
         }

FirebaseAdmin/FirebaseAdmin/Messaging/FcmOptions.cs

@@ -24,7 +24,7 @@ internal FcmOptions CopyAndValidate()
             {
                 AnalyticsLabel = this.AnalyticsLabel,
             };
-            AnalyticsLabelChecker.CheckAnalyticsLabelOrThrow(this.AnalyticsLabel);
+            AnalyticsLabelChecker.ValidateAnalyticsLabel(copy.AnalyticsLabel);
 
             return copy;
         }

FirebaseAdmin/FirebaseAdmin/Messaging/Util/AnalyticsLabelChecker.cs

@@ -1,37 +1,31 @@
 using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Linq;
 using System.Text.RegularExpressions;
 
 namespace FirebaseAdmin.Messaging.Util
 {
     /// <summary>
     /// Checker for analytics label.
     /// </summary>
-    public static class AnalyticsLabelChecker
+    internal static class AnalyticsLabelChecker
     {
-        private static ImmutableHashSet<char> alowedChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-~%".ToCharArray().ToImmutableHashSet();
+        private static string pattern = "^[a-zA-Z0-9-_.~%]{0,50}$";
 
         /// <summary>
         /// Checks anytytics labels an throw if not valid.
         /// </summary>
         /// <exception cref="ArgumentException">If analytics label does not match pattern.</exception>
         /// <param name="analyticsLabel">Analytics label.</param>
-        public static void CheckAnalyticsLabelOrThrow(string analyticsLabel)
+        public static void ValidateAnalyticsLabel(string analyticsLabel)
         {
-            if (analyticsLabel.Length > 50)
+            if (string.IsNullOrWhiteSpace(analyticsLabel))
             {
                 throw new ArgumentException("Analytics label must have format matching'^[a-zA-Z0-9-_.~%]{1,50}$");
             }
 
-            foreach (var character in analyticsLabel)
+            if (!Regex.IsMatch(analyticsLabel, pattern))
             {
-                if (!alowedChars.Contains(character))
-                {
-                    throw new ArgumentException("Analytics label must have format matching'^[a-zA-Z0-9-_.~%]{1,50}$");
-                }
+                throw new ArgumentException("Analytics label must have format matching'^[a-zA-Z0-9-_.~%]{1,50}$");
             }
         }
     }
-}
+}