From 9ba3cea3db7a0c9f7b5982c696d04fa49547c495 Mon Sep 17 00:00:00 2001 From: Haacked Date: Tue, 24 Sep 2013 13:57:29 -0700 Subject: [PATCH 1/2] Add unit tests for OctokitRT project --- Octokit.Tests/Http/ApiInfoParserTests.cs | 3 +- Octokit.Tests/OctokitRT.Tests.csproj | 105 +++++++++++++++++++++++ Octokit.sln | 12 +++ 3 files changed, 119 insertions(+), 1 deletion(-) create mode 100644 Octokit.Tests/OctokitRT.Tests.csproj diff --git a/Octokit.Tests/Http/ApiInfoParserTests.cs b/Octokit.Tests/Http/ApiInfoParserTests.cs index 59e43b48..3dfbd5ce 100644 --- a/Octokit.Tests/Http/ApiInfoParserTests.cs +++ b/Octokit.Tests/Http/ApiInfoParserTests.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Linq; using Octokit.Http; using Xunit; using Xunit.Extensions; @@ -30,7 +31,7 @@ namespace Octokit.Tests var apiInfo = response.ApiInfo; Assert.NotNull(apiInfo); - Assert.Equal(new[] { "user" }, apiInfo.AcceptedOauthScopes); + Assert.Equal(new[] { "user" }, apiInfo.AcceptedOauthScopes.ToArray()); Assert.Equal(new[] { "user", "public_repo", "repo", "gist" }, apiInfo.OauthScopes); Assert.Equal(5000, apiInfo.RateLimit); Assert.Equal(4997, apiInfo.RateLimitRemaining); diff --git a/Octokit.Tests/OctokitRT.Tests.csproj b/Octokit.Tests/OctokitRT.Tests.csproj new file mode 100644 index 00000000..6e5d4bec --- /dev/null +++ b/Octokit.Tests/OctokitRT.Tests.csproj @@ -0,0 +1,105 @@ + + + + + Debug + AnyCPU + {3F4686DA-8774-4940-823E-9138F4B42060} + Library + Properties + Octokit.Tests + Octokit.Tests + v4.5 + 512 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + False + ..\packages\NSubstitute.1.6.1.0\lib\NET40\NSubstitute.dll + + + + + + + + + False + ..\packages\xunit.1.9.2\lib\net20\xunit.dll + + + False + ..\packages\xunit.extensions.1.9.2\lib\net20\xunit.extensions.dll + + + + + + + + + + + + + + + Code + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {c8bc13b6-3fa3-4716-827d-e7706f976fe1} + OctokitRT + + + + + \ No newline at end of file diff --git a/Octokit.sln b/Octokit.sln index 95facd9a..917b41ea 100644 --- a/Octokit.sln +++ b/Octokit.sln @@ -28,6 +28,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OctokitRT", "Octokit\Octoki EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit.Reactive", "Octokit.Reactive\Octokit.Reactive.csproj", "{674B69B8-0780-4D54-AE2B-C15821FA51CB}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OctokitRT.Tests", "Octokit.Tests\OctokitRT.Tests.csproj", "{3F4686DA-8774-4940-823E-9138F4B42060}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -96,6 +98,16 @@ Global {674B69B8-0780-4D54-AE2B-C15821FA51CB}.Release|ARM.ActiveCfg = Release|Any CPU {674B69B8-0780-4D54-AE2B-C15821FA51CB}.Release|x64.ActiveCfg = Release|Any CPU {674B69B8-0780-4D54-AE2B-C15821FA51CB}.Release|x86.ActiveCfg = Release|Any CPU + {3F4686DA-8774-4940-823E-9138F4B42060}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3F4686DA-8774-4940-823E-9138F4B42060}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3F4686DA-8774-4940-823E-9138F4B42060}.Debug|ARM.ActiveCfg = Debug|Any CPU + {3F4686DA-8774-4940-823E-9138F4B42060}.Debug|x64.ActiveCfg = Debug|Any CPU + {3F4686DA-8774-4940-823E-9138F4B42060}.Debug|x86.ActiveCfg = Debug|Any CPU + {3F4686DA-8774-4940-823E-9138F4B42060}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3F4686DA-8774-4940-823E-9138F4B42060}.Release|Any CPU.Build.0 = Release|Any CPU + {3F4686DA-8774-4940-823E-9138F4B42060}.Release|ARM.ActiveCfg = Release|Any CPU + {3F4686DA-8774-4940-823E-9138F4B42060}.Release|x64.ActiveCfg = Release|Any CPU + {3F4686DA-8774-4940-823E-9138F4B42060}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 3b5b4f2e9ba435884c79dadb54da625f3ad05cfe Mon Sep 17 00:00:00 2001 From: Haacked Date: Tue, 24 Sep 2013 14:00:40 -0700 Subject: [PATCH 2/2] Run OctokitRT tests --- Octokit.Tests/Http/ApiInfoParserTests.cs | 2 +- Octokit.msbuild | 4 ++++ script/cibuild.ps1 | 11 +++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Octokit.Tests/Http/ApiInfoParserTests.cs b/Octokit.Tests/Http/ApiInfoParserTests.cs index 3dfbd5ce..2605d912 100644 --- a/Octokit.Tests/Http/ApiInfoParserTests.cs +++ b/Octokit.Tests/Http/ApiInfoParserTests.cs @@ -32,7 +32,7 @@ namespace Octokit.Tests var apiInfo = response.ApiInfo; Assert.NotNull(apiInfo); Assert.Equal(new[] { "user" }, apiInfo.AcceptedOauthScopes.ToArray()); - Assert.Equal(new[] { "user", "public_repo", "repo", "gist" }, apiInfo.OauthScopes); + Assert.Equal(new[] { "user", "public_repo", "repo", "gist" }, apiInfo.OauthScopes.ToArray()); Assert.Equal(5000, apiInfo.RateLimit); Assert.Equal(4997, apiInfo.RateLimitRemaining); Assert.Equal("5634b0b187fd2e91e3126a75006cc4fa", apiInfo.Etag); diff --git a/Octokit.msbuild b/Octokit.msbuild index 227a5825..fc9fcfdb 100644 --- a/Octokit.msbuild +++ b/Octokit.msbuild @@ -17,6 +17,10 @@ + + + + diff --git a/script/cibuild.ps1 b/script/cibuild.ps1 index 15b50815..dceaaaa9 100644 --- a/script/cibuild.ps1 +++ b/script/cibuild.ps1 @@ -112,6 +112,17 @@ if ($result.ExitCode -eq 0) { } Write-Output "" +Write-Output "Running Octokit.Tests..." +$result = Run-XUnit OctokitRT.Tests 120 +if ($result.ExitCode -eq 0) { + # Print out the test result summary. + Write-Output $result.Output[-1] +} else { + $exitCode = $result.ExitCode + Write-Output $result.Output +} +Write-Output "" + Write-Output "Running Octokit.Tests.Integration..." $result = Run-XUnit Octokit.Tests.Integration 180 if ($result.ExitCode -eq 0) {