fix integration tests

2026-06-12 06:00:38 +00:00 · 2013-11-05 15:57:01 -08:00
parent 34d0fac09a
commit 920b911f4f
1 changed files with 59 additions and 60 deletions
@@ -1,85 +1,84 @@
-using Octokit.Reactive;
+using Octokit;
+using Octokit.Reactive;
 using System;
-using System.Linq;
 using System.Net.Http.Headers;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
+using Octokit.Tests.Integration;
 using Xunit;

-namespace Octokit.Tests.Integration
+public class ObservableIssuesClientTests : IDisposable
 {
-    public class ObservableIssuesClientTests : IDisposable
+    readonly ObservableIssuesClient _client;
+    readonly string _repoName;
+    readonly Repository _createdRepository;
+
+    public ObservableIssuesClientTests()
    {
-        readonly ObservableIssuesClient client;
-        readonly string repoName;
-        readonly Repository createdRepository;
-
-        public ObservableIssuesClientTests()
+        var github = new GitHubClient(new ProductHeaderValue("OctokitTests"))
        {
-            var github = new GitHubClient(new ProductHeaderValue("OctokitTests"))
-            {
-                Credentials = Helper.Credentials
-            };
+            Credentials = Helper.Credentials
+        };

-            client = new ObservableIssuesClient(github);
-            repoName = Helper.MakeNameWithTimestamp("public-repo");
-            var result = github.Repository.Create(new NewRepository { Name = repoName }).Result;
-            createdRepository = result;
-        }
+        _client = new ObservableIssuesClient(github);
+        _repoName = Helper.MakeNameWithTimestamp("public-repo");
+        var result = github.Repository.Create(new NewRepository { Name = _repoName }).Result;
+        _createdRepository = result;
+    }

-        [IntegrationTest]
-        public async Task ReturnsSpecifiedIssue()
-        {
-            var observable = client.Get("libgit2", "libgit2sharp", 1);
-            var issue = await observable;
+    [IntegrationTest]
+    public async Task ReturnsSpecifiedIssue()
+    {
+        var observable = _client.Get("libgit2", "libgit2sharp", 1);
+        var issue = await observable;

-            Assert.Equal(1, issue.Number);
-            Assert.Equal("Change License ", issue.Title);
-        }
+        Assert.Equal(1, issue.Number);
+        Assert.Equal("Change License ", issue.Title);
+    }

-        [IntegrationTest]
-        public void ReturnsAllIssuesForARepository()
-        {
-            var issues = client.GetForRepository("libgit2", "libgit2sharp").ToList().Wait();
+    [IntegrationTest]
+    public async Task ReturnsAllIssuesForARepository()
+    {
+        var issues = await _client.GetForRepository("libgit2", "libgit2sharp").ToList();

-            Assert.NotEmpty(issues);
-        }
+        Assert.NotEmpty(issues);
+    }

-        [IntegrationTest]
-        public async void ReturnsAllIssuesForCurrentUser()
-        {
-            var newIssue = new NewIssue("Integration test issue");
-            var createResult = await client.Create(createdRepository.Owner.Name, repoName, newIssue);
+    [IntegrationTest]
+    public async Task ReturnsAllIssuesForCurrentUser()
+    {
+        var newIssue = new NewIssue("Integration test issue");
+        await _client.Create(_createdRepository.Owner.Name, _repoName, newIssue);
            
-            var issues = client.GetAllForCurrent().ToList().Wait();
+        var issues = await _client.GetAllForCurrent().ToList();

-            Assert.NotEmpty(issues);
-        }
+        Assert.NotEmpty(issues);
+    }

-        [IntegrationTest]
-        public async void ReturnsAllIssuesForOwnedAndMemberRepositories()
-        {
-            var newIssue = new NewIssue("Integration test issue");
-            var createResult = await client.Create(createdRepository.Owner.Name, repoName, newIssue);
-            var result = client.GetAllForOwnedAndMemberRepositories().ToList().Wait();
+    [IntegrationTest]
+    public async Task ReturnsAllIssuesForOwnedAndMemberRepositories()
+    {
+        var newIssue = new NewIssue("Integration test issue");
+        await _client.Create(_createdRepository.Owner.Name, _repoName, newIssue);
+        var result = await _client.GetAllForOwnedAndMemberRepositories().ToList();

-            Assert.NotEmpty(result);
-        }
+        Assert.NotEmpty(result);
+    }

-        [IntegrationTest]
-        public async void CanCreateAndUpdateIssues()
-        {
-            var newIssue = new NewIssue("Integration test issue");
+    [IntegrationTest]
+    public async Task CanCreateAndUpdateIssues()
+    {
+        var newIssue = new NewIssue("Integration test issue");

-            var createResult = await client.Create(createdRepository.Owner.Name, repoName, newIssue);
-            var updateResult = await client.Update(createdRepository.Owner.Name, repoName, createResult.Number, new IssueUpdate { Title = "Modified integration test issue" });
+        var createResult = await _client.Create(_createdRepository.Owner.Name, _repoName, newIssue);
+        var updateResult = await _client.Update(_createdRepository.Owner.Name, _repoName, createResult.Number, new IssueUpdate { Title = "Modified integration test issue" });

-            Assert.Equal("Modified integration test issue", updateResult.Title);
-        }
+        Assert.Equal("Modified integration test issue", updateResult.Title);
+    }

-        public void Dispose()
-        {
-            Helper.DeleteRepo(createdRepository);
-        }
+    public void Dispose()
+    {
+        Helper.DeleteRepo(_createdRepository);
    }
 }
+