Merge branch 'release/1.3.1'

sahb1239 · Jan 9, 2019 · d75e6cf · d75e6cf
2 parents a9ca719 + 23a2f29
commit d75e6cf
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/src/SAHB.GraphQLClient/Exceptions/GraphQLErrorException.cs b/src/SAHB.GraphQLClient/Exceptions/GraphQLErrorException.cs
@@ -28,7 +28,17 @@ private static string GetMessage(IEnumerable<GraphQLDataError> errors)
 
             return string.Join(Environment.NewLine,
                 errors.Select(error =>
-                    $"{error.Message ?? "Error"} at {Environment.NewLine}{string.Join(Environment.NewLine, error.Locations?.Select(location => "   line: " + location.Line + " column: " + location.Column))}"));
+                    $"{error.Message ?? "Error"} at {Environment.NewLine}{GetErrorLocation(error)}"));
+        }
+
+        private static string GetErrorLocation(GraphQLDataError error)
+        {
+            var errors = (error.Locations?.Select(location => "   line: " + location?.Line + " column: " + location?.Column));
+            if (errors != null && errors.Any())
+            {
+                return string.Join(Environment.NewLine, errors);
+            }
+            return "Unknown location";
         }
 
         public IEnumerable<GraphQLDataError> Errors { get; }

diff --git a/tests/SAHB.GraphQLClient.Tests/Exceptions/GraphQLErrorExceptionTests.cs b/tests/SAHB.GraphQLClient.Tests/Exceptions/GraphQLErrorExceptionTests.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using SAHB.GraphQLClient.Exceptions;
+using SAHB.GraphQLClient.Result;
+using Xunit;
+
+namespace SAHB.GraphQLClient.Tests.Exceptions
+{
+
+    public class GraphQLErrorExceptionTests
+    {
+        [Fact]
+        public void Get_Message_Should_Not_Throw_Exception()
+        {
+            var errorList = new List<GraphQLDataError> { new GraphQLDataError { Message = "Access denied." } };
+
+            new GraphQLErrorException("query", errorList);
+        }
+    }
+}