Merge pull request #140 from martincostello/Update-Test-Target-Framework

Update tests' target framework
octokit · Aug 3, 2018 · 3e85171 · 3e85171
2 parents 826485c + 7489861
commit 3e85171
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 38 deletions.
diff --git a/Octokit.GraphQL.Core.Generation.UnitTests/Octokit.GraphQL.Core.Generation.UnitTests.csproj b/Octokit.GraphQL.Core.Generation.UnitTests/Octokit.GraphQL.Core.Generation.UnitTests.csproj
@@ -1,20 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <LangVersion>7.2</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Octokit.GraphQL.Core.Generation\Octokit.GraphQL.Core.Generation.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/Octokit.GraphQL.Core.UnitTests/ExpressionRewiterTests.cs b/Octokit.GraphQL.Core.UnitTests/ExpressionRewiterTests.cs
@@ -81,7 +81,7 @@ public void Licence_Conditions_Nested_Selects()
                 });
 
             Expression<Func<JObject, object>> expected = data =>
-                (IEnumerable)Rewritten.List.Select(
+                (IEnumerable<object>)Rewritten.List.Select(
                     data["data"]["licenses"],
                     x => new
                     {
@@ -109,12 +109,12 @@ public void Licenses_Conditions_Select_ToDictionary()
                 });
 
             Expression<Func<JObject, object>> expected = data =>
-                (IEnumerable) Rewritten.List.Select(
+                (IEnumerable<object>) Rewritten.List.Select(
                     data["data"]["licenses"],
                     x => new
                     {
                         Body = x["body"].ToObject<string>(),
-                        Items = (IEnumerable) Rewritten.List.Select(x["items"], i => new
+                        Items = (IDictionary<string, object>) Rewritten.List.Select(x["items"], i => new
                         {
                             Key = i["key"].ToObject<string>(),
                             Description = i["description"].ToObject<string>()
@@ -207,7 +207,7 @@ public void Nodes_OfType()
                 });
 
             Expression<Func<JObject, object>> expected = data =>
-                (IEnumerable)Rewritten.List.Select(
+                (IEnumerable<object>)Rewritten.List.Select(
                     Rewritten.List.OfType(data["data"]["nodes"], "Issue"),
                     x => new
                     {

diff --git a/Octokit.GraphQL.Core.UnitTests/Octokit.GraphQL.Core.UnitTests.csproj b/Octokit.GraphQL.Core.UnitTests/Octokit.GraphQL.Core.UnitTests.csproj
@@ -1,20 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <LangVersion>7.2</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Octokit.GraphQL.Core\Octokit.GraphQL.Core.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/Octokit.GraphQL.Core.UnitTests/PartialEvaluationTests.cs b/Octokit.GraphQL.Core.UnitTests/PartialEvaluationTests.cs
@@ -179,7 +179,7 @@ public void Cast_Value()
             var query = (SimpleQuery<float>)new QueryBuilder().Build(expression);
             var result = new ResponseDeserializer().Deserialize(query, data);
 
-            Assert.IsType(typeof(float), result);
+            Assert.IsType<float>(result);
             Assert.Equal(12, result);
         }
 

diff --git a/Octokit.GraphQL.IntegrationTests/Octokit.GraphQL.IntegrationTests.csproj b/Octokit.GraphQL.IntegrationTests/Octokit.GraphQL.IntegrationTests.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <AssemblyName>Octokit.GraphQL.IntegrationTests</AssemblyName>
     <LangVersion>7.2</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
     <PackageReference Include="Octokit" Version="0.29.0" />
-    <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Octokit.GraphQL.Core\Octokit.GraphQL.Core.csproj" />
@@ -17,4 +17,4 @@
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/Octokit.GraphQL.IntegrationTests/Queries/IssueTests.cs b/Octokit.GraphQL.IntegrationTests/Queries/IssueTests.cs
@@ -187,7 +187,7 @@ public async Task Can_AutoPage_Issues_Comments()
             var result = (await Connection.Run(query)).ToList();
 
             Assert.True(result.Count > 100);
-            Assert.True(result.Any(x => x.Comments.Count > 100));
+            Assert.Contains(result, x => x.Comments.Count > 100);
         }
 
         [IntegrationTest(Skip = "Querying unions like this no longer works")]
@@ -215,7 +215,7 @@ public async Task Should_Query_Union_Issue_Or_PullRequest2()
 
             var result = (await Connection.Run(query)).Last();
 
-            Assert.NotNull(result.ClosedEventId);
+            Assert.NotEqual(default(ID), result.ClosedEventId);
         }
 
         class ActorModel

diff --git a/Octokit.GraphQL.IntegrationTests/Queries/PullRequestTests.cs b/Octokit.GraphQL.IntegrationTests/Queries/PullRequestTests.cs
@@ -22,7 +22,7 @@ public async Task Should_Query_Commits()
 
             var results = (await Connection.Run(query)).ToArray();
 
-            Assert.Equal(1, results.Length);
+            Assert.Single(results);
             Assert.Equal("MDY6Q29tbWl0NzUyODY3OTpkYWZhYjhhZjA0ODM5NDU1ODM4Y2QzZmRlMTFkMTM5MTc0MTYyZmFh", results[0].Id.Value);
             var expectedMessage = "Adding README, CONTRIBUTING, LICENSE\n\nWe plan to release this code under the MIT license so might as well get\nthe right things in place early.";
             Assert.Equal(expectedMessage, results[0].Message);
@@ -124,7 +124,7 @@ public async Task Can_AutoPage_Reviews_Comments_2()
             var result = await Connection.Run(query);
 
             Assert.True(result.Reviews.Count > 100);
-            Assert.True(result.Reviews.Any(x => x.Comments.Count > 100));
+            Assert.Contains(result.Reviews, x => x.Comments.Count > 100);
         }
     }
 }
diff --git a/Octokit.GraphQL.IntegrationTests/Utilities/IntegrationTestAttribute.cs b/Octokit.GraphQL.IntegrationTests/Utilities/IntegrationTestAttribute.cs
@@ -18,7 +18,7 @@ public IntegrationTestDiscoverer(IMessageSink diagnosticMessageSink)
         public IEnumerable<IXunitTestCase> Discover(ITestFrameworkDiscoveryOptions discoveryOptions, ITestMethod testMethod, IAttributeInfo factAttribute)
         {
             return Helper.HasCredentials
-                ? new[] { new XunitTestCase(_diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod) }
+                ? new[] { new XunitTestCase(_diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), TestMethodDisplayOptions.None, testMethod) }
                 : Enumerable.Empty<IXunitTestCase>();
         }
     }

diff --git a/Octokit.GraphQL.UnitTests/Octokit.GraphQL.UnitTests.csproj b/Octokit.GraphQL.UnitTests/Octokit.GraphQL.UnitTests.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <LangVersion>7.2</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Octokit.GraphQL\Octokit.GraphQL.csproj" />
@@ -17,4 +17,4 @@
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/Octokit.GraphQL.UnitTests/ResponseDeserializerTests.cs b/Octokit.GraphQL.UnitTests/ResponseDeserializerTests.cs
@@ -50,8 +50,8 @@ public void RepositoryOwner_Repository_Query()
             Assert.Equal("1234", result.Id.Value);
             Assert.Equal("Octokit.GraphQL.Core", result.Name);
             Assert.Equal("grokys", result.Owner.Login);
-            Assert.Equal(false, result.IsFork);
-            Assert.Equal(false, result.IsPrivate);
+            Assert.False(result.IsFork);
+            Assert.False(result.IsPrivate);
         }