Test fixes

Author: Leo

FirebaseAdmin/FirebaseAdmin.Tests/Messaging/InstanceIdClientTest.cs

@@ -78,7 +78,7 @@ public async Task BadRequest()
                () => client.SubscribeToTopicAsync("test-topic", new List<string> { "abc123" }));
 
             Assert.Equal(ErrorCode.InvalidArgument, exception.ErrorCode);
-            Assert.Equal("Unexpected HTTP response with status: 400 (Bad Request)\nBad Request", exception.Message);
+            Assert.Equal("Unexpected HTTP response with status: 400 (BadRequest)\nBadRequest", exception.Message);
             Assert.Null(exception.MessagingErrorCode);
             Assert.NotNull(exception.HttpResponse);
             Assert.Null(exception.InnerException);
@@ -144,7 +144,7 @@ public async Task NotFound()
                () => client.SubscribeToTopicAsync("test-topic", new List<string> { "abc123" }));
 
             Assert.Equal(ErrorCode.NotFound, exception.ErrorCode);
-            Assert.Equal("Unexpected HTTP response with status: 404 (Not Found)\nNot Found", exception.Message);
+            Assert.Equal("Unexpected HTTP response with status: 404 (NotFound)\nNotFound", exception.Message);
             Assert.Null(exception.MessagingErrorCode);
             Assert.NotNull(exception.HttpResponse);
             Assert.Null(exception.InnerException);
@@ -166,7 +166,7 @@ public async Task ServiceUnavailable()
                () => client.SubscribeToTopicAsync("test-topic", new List<string> { "abc123" }));
 
             Assert.Equal(ErrorCode.Unavailable, exception.ErrorCode);
-            Assert.Equal("Unexpected HTTP response with status: 503 (Service Unavailable)\nService Unavailable", exception.Message);
+            Assert.Equal("Unexpected HTTP response with status: 503 (ServiceUnavailable)\nServiceUnavailable", exception.Message);
             Assert.Null(exception.MessagingErrorCode);
             Assert.NotNull(exception.HttpResponse);
             Assert.Null(exception.InnerException);

FirebaseAdmin/FirebaseAdmin.Tests/Messaging/TopicManagementResponseTest.cs

@@ -45,35 +45,23 @@ public void NullResponse()
         [Fact]
         public void EmptyResponse()
         {
-            Assert.Throws<ArgumentException>(() =>
+            Assert.Throws<ArgumentNullException>(() =>
             {
                 var instanceIdServiceResponse = new InstanceIdServiceResponse();
                 new TopicManagementResponse(instanceIdServiceResponse);
             });
         }
 
         [Fact]
-        public void UnknownError()
+        public void UnregisteredToken()
         {
             var json = @"{""results"": [{}, {""error"":""NOT_FOUND""}]}";
             var instanceIdServiceResponse = JsonConvert.DeserializeObject<InstanceIdServiceResponse>(json);
             var response = new TopicManagementResponse(instanceIdServiceResponse);
 
             Assert.Single(response.Errors);
-            Assert.Equal("unknown-error", response.Errors[0].Reason);
-            Assert.Equal(0, response.Errors[0].Index);
-        }
-
-        [Fact]
-        public void UnexpectedResponse()
-        {
-            var json = @"{""results"": [{""unexpected"":""NOT_A_REAL_CODE""}]}";
-            var instanceIdServiceResponse = JsonConvert.DeserializeObject<InstanceIdServiceResponse>(json);
-            var response = new TopicManagementResponse(instanceIdServiceResponse);
-
-            Assert.Single(response.Errors);
-            Assert.Equal("unknown-error", response.Errors[0].Reason);
-            Assert.Equal(0, response.SuccessCount);
+            Assert.Equal("registration-token-not-registered", response.Errors[0].Reason);
+            Assert.Equal(1, response.Errors[0].Index);
         }
 
         [Fact]

FirebaseAdmin/FirebaseAdmin/Messaging/TopicManagementResponse.cs

@@ -28,9 +28,14 @@ public sealed class TopicManagementResponse
         /// <param name="instanceIdServiceResponse">The results from the response produced by FCM topic management operations.</param>
         internal TopicManagementResponse(InstanceIdServiceResponse instanceIdServiceResponse)
         {
-            if (instanceIdServiceResponse == null || instanceIdServiceResponse.ResultCount == 0)
+            if (instanceIdServiceResponse == null)
             {
-                throw new ArgumentException("unexpected response from topic management service");
+                throw new ArgumentNullException("Unexpected null response from topic management service");
+            }
+
+            if (instanceIdServiceResponse.ResultCount == 0)
+            {
+                throw new ArgumentNullException("Unexpected empty response from topic management service");
             }
 
             var resultErrors = new List<ErrorInfo>();