Merge pull request #897 from adamralph/893-readonlypagecollection-nul…

…l-body 893 readonlypagecollection null body
octokit · Sep 17, 2015 · 5610478 · 5610478
2 parents 0925580 + afc8c2e
commit 5610478
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 1 deletion.
diff --git a/Octokit.Tests/Http/ReadOnlyPagedCollectionTests.cs b/Octokit.Tests/Http/ReadOnlyPagedCollectionTests.cs
@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Octokit.Internal;
+using NSubstitute;
+using Xunit;
+
+namespace Octokit.Tests.Http
+{
+    public class ReadOnlyPagedCollectionTests
+    {
+        public class TheConstructor
+        {
+            [Fact]
+            public void AcceptsAResponseWithANullBody()
+            {
+                var response = Substitute.For<IApiResponse<List<string>>>();
+                response.Body.Returns((List<string>)null);
+
+                var exception = Record.Exception(() =>
+                    new ReadOnlyPagedCollection<string>(response, uri => Task.FromResult(response)));
+
+                Assert.Null(exception);
+            }
+        }
+    }
+}
diff --git a/Octokit.Tests/OctoKit.Tests-NetCore45.csproj b/Octokit.Tests/OctoKit.Tests-NetCore45.csproj
@@ -128,6 +128,7 @@
     <Compile Include="Authentication\TokenAuthenticatorTests.cs" />
     <Compile Include="Http\ConnectionTests.cs" />
     <Compile Include="Http\RateLimitTests.cs" />
+    <Compile Include="Http\ReadOnlyPagedCollectionTests.cs" />
     <Compile Include="Http\ResponseTests.cs" />
     <Compile Include="Http\RequestTests.cs" />
     <Compile Include="Models\DeploymentStatusTests.cs" />

diff --git a/Octokit.Tests/Octokit.Tests-Portable.csproj b/Octokit.Tests/Octokit.Tests-Portable.csproj
@@ -126,6 +126,7 @@
     <Compile Include="Authentication\TokenAuthenticatorTests.cs" />
     <Compile Include="Http\ConnectionTests.cs" />
     <Compile Include="Http\RateLimitTests.cs" />
+    <Compile Include="Http\ReadOnlyPagedCollectionTests.cs" />
     <Compile Include="Http\ResponseTests.cs" />
     <Compile Include="Http\RequestTests.cs" />
     <Compile Include="Models\DeploymentStatusTests.cs" />

diff --git a/Octokit.Tests/Octokit.Tests.csproj b/Octokit.Tests/Octokit.Tests.csproj
@@ -145,6 +145,7 @@
     <Compile Include="Http\ConnectionTests.cs" />
     <Compile Include="Http\RateLimitTests.cs" />
     <Compile Include="Http\RedirectHandlerTests.cs" />
+    <Compile Include="Http\ReadOnlyPagedCollectionTests.cs" />
     <Compile Include="Http\ResponseTests.cs" />
     <Compile Include="Http\RequestTests.cs" />
     <Compile Include="Models\DeploymentStatusTests.cs" />

diff --git a/Octokit/Http/ReadOnlyPagedCollection.cs b/Octokit/Http/ReadOnlyPagedCollection.cs
@@ -11,7 +11,7 @@ public class ReadOnlyPagedCollection<T> : ReadOnlyCollection<T>, IReadOnlyPagedC
         readonly Func<Uri, Task<IApiResponse<List<T>>>> _nextPageFunc;
 
         public ReadOnlyPagedCollection(IApiResponse<List<T>> response, Func<Uri, Task<IApiResponse<List<T>>>> nextPageFunc)
-            : base(response != null ? response.Body : new List<T>())
+            : base(response != null ? response.Body ?? new List<T>() : new List<T>())
         {
             Ensure.ArgumentNotNull(response, "response");
             Ensure.ArgumentNotNull(nextPageFunc, "nextPageFunc");