diff options
Diffstat (limited to 'plugins/github/test')
6 files changed, 36 insertions, 24 deletions
diff --git a/plugins/github/test/org/jetbrains/plugins/github/GithubCreateGistTestBase.java b/plugins/github/test/org/jetbrains/plugins/github/GithubCreateGistTestBase.java index b54bd8c62b4e..4dabe58bebc7 100644 --- a/plugins/github/test/org/jetbrains/plugins/github/GithubCreateGistTestBase.java +++ b/plugins/github/test/org/jetbrains/plugins/github/GithubCreateGistTestBase.java @@ -22,6 +22,7 @@ import com.intellij.util.text.DateFormatUtil; import git4idea.test.TestDialogHandler; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.github.api.GithubApiUtil; +import org.jetbrains.plugins.github.api.GithubConnection; import org.jetbrains.plugins.github.api.GithubGist; import org.jetbrains.plugins.github.test.GithubTest; import org.jetbrains.plugins.github.ui.GithubLoginDialog; @@ -59,7 +60,7 @@ public abstract class GithubCreateGistTestBase extends GithubTest { protected void deleteGist() throws IOException { if (GIST_ID != null) { - GithubApiUtil.deleteGist(myGitHubSettings.getAuthData(), GIST_ID); + GithubApiUtil.deleteGist(new GithubConnection(myGitHubSettings.getAuthData()), GIST_ID); GIST = null; GIST_ID = null; } @@ -82,7 +83,7 @@ public abstract class GithubCreateGistTestBase extends GithubTest { if (GIST == null) { try { - GIST = GithubApiUtil.getGist(myGitHubSettings.getAuthData(), GIST_ID); + GIST = GithubApiUtil.getGist(new GithubConnection(myGitHubSettings.getAuthData()), GIST_ID); } catch (IOException e) { System.err.println(e.getMessage()); diff --git a/plugins/github/test/org/jetbrains/plugins/github/GithubCreatePullRequestTestBase.java b/plugins/github/test/org/jetbrains/plugins/github/GithubCreatePullRequestTestBase.java index 643c3d2db5f0..b6a2058cd24f 100644 --- a/plugins/github/test/org/jetbrains/plugins/github/GithubCreatePullRequestTestBase.java +++ b/plugins/github/test/org/jetbrains/plugins/github/GithubCreatePullRequestTestBase.java @@ -76,8 +76,8 @@ public abstract class GithubCreatePullRequestTestBase extends GithubTest { @Override public int handleDialog(GithubCreatePullRequestDialog dialog) { dialog.testSetRequestTitle(BRANCH_NAME); + dialog.testSetFork(new GithubFullPath(user, PROJECT_NAME)); dialog.testSetBranch(branch); - dialog.testSetTarget(new GithubFullPath(user, PROJECT_NAME)); dialog.testCreatePullRequest(); return DialogWrapper.OK_EXIT_CODE; } diff --git a/plugins/github/test/org/jetbrains/plugins/github/GithubIssuesTest.java b/plugins/github/test/org/jetbrains/plugins/github/GithubIssuesTest.java index 1921b9ecc055..1cd499f53c89 100644 --- a/plugins/github/test/org/jetbrains/plugins/github/GithubIssuesTest.java +++ b/plugins/github/test/org/jetbrains/plugins/github/GithubIssuesTest.java @@ -19,6 +19,7 @@ import com.intellij.openapi.util.Comparing; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.plugins.github.api.GithubApiUtil; +import org.jetbrains.plugins.github.api.GithubConnection; import org.jetbrains.plugins.github.api.GithubIssue; import org.jetbrains.plugins.github.test.GithubTest; @@ -32,7 +33,7 @@ public class GithubIssuesTest extends GithubTest { private static final String REPO_NAME = "IssuesTest"; public void testAssigneeIssues1() throws Exception { - List<GithubIssue> result = GithubApiUtil.getIssuesAssigned(myAuth, myLogin2, REPO_NAME, myLogin1, 100, false); + List<GithubIssue> result = GithubApiUtil.getIssuesAssigned(new GithubConnection(myAuth), myLogin2, REPO_NAME, myLogin1, 100, false); List<Long> issues = ContainerUtil.map(result, new Function<GithubIssue, Long>() { @Override public Long fun(GithubIssue githubIssue) { @@ -46,7 +47,7 @@ public class GithubIssuesTest extends GithubTest { } public void testAssigneeIssues2() throws Exception { - List<GithubIssue> result = GithubApiUtil.getIssuesAssigned(myAuth, myLogin2, REPO_NAME, myLogin2, 100, false); + List<GithubIssue> result = GithubApiUtil.getIssuesAssigned(new GithubConnection(myAuth), myLogin2, REPO_NAME, myLogin2, 100, false); List<Long> issues = ContainerUtil.map(result, new Function<GithubIssue, Long>() { @Override public Long fun(GithubIssue githubIssue) { @@ -60,7 +61,7 @@ public class GithubIssuesTest extends GithubTest { } public void testAssigneeIssues3() throws Exception { - List<GithubIssue> result = GithubApiUtil.getIssuesAssigned(myAuth, myLogin2, REPO_NAME, "", 100, false); + List<GithubIssue> result = GithubApiUtil.getIssuesAssigned(new GithubConnection(myAuth), myLogin2, REPO_NAME, "", 100, false); List<Long> issues = ContainerUtil.map(result, new Function<GithubIssue, Long>() { @Override public Long fun(GithubIssue githubIssue) { @@ -74,7 +75,7 @@ public class GithubIssuesTest extends GithubTest { } public void testAssigneeIssues4() throws Exception { - List<GithubIssue> result = GithubApiUtil.getIssuesAssigned(myAuth, myLogin2, REPO_NAME, myLogin1, 100, true); + List<GithubIssue> result = GithubApiUtil.getIssuesAssigned(new GithubConnection(myAuth), myLogin2, REPO_NAME, myLogin1, 100, true); List<Long> issues = ContainerUtil.map(result, new Function<GithubIssue, Long>() { @Override public Long fun(GithubIssue githubIssue) { @@ -88,7 +89,7 @@ public class GithubIssuesTest extends GithubTest { } public void testAssigneeIssues5() throws Exception { - List<GithubIssue> result = GithubApiUtil.getIssuesAssigned(myAuth, myLogin2, REPO_NAME, myLogin2, 100, true); + List<GithubIssue> result = GithubApiUtil.getIssuesAssigned(new GithubConnection(myAuth), myLogin2, REPO_NAME, myLogin2, 100, true); List<Long> issues = ContainerUtil.map(result, new Function<GithubIssue, Long>() { @Override public Long fun(GithubIssue githubIssue) { @@ -102,7 +103,7 @@ public class GithubIssuesTest extends GithubTest { } public void testAssigneeIssues6() throws Exception { - List<GithubIssue> result = GithubApiUtil.getIssuesAssigned(myAuth, myLogin2, REPO_NAME, "", 100, true); + List<GithubIssue> result = GithubApiUtil.getIssuesAssigned(new GithubConnection(myAuth), myLogin2, REPO_NAME, "", 100, true); List<Long> issues = ContainerUtil.map(result, new Function<GithubIssue, Long>() { @Override public Long fun(GithubIssue githubIssue) { @@ -116,7 +117,7 @@ public class GithubIssuesTest extends GithubTest { } public void testQueriedIssues1() throws Exception { - List<GithubIssue> result = GithubApiUtil.getIssuesQueried(myAuth, myLogin2, REPO_NAME, "abracadabra", true); + List<GithubIssue> result = GithubApiUtil.getIssuesQueried(new GithubConnection(myAuth), myLogin2, REPO_NAME, "abracadabra", true); List<Long> issues = ContainerUtil.map(result, new Function<GithubIssue, Long>() { @Override public Long fun(GithubIssue githubIssue) { @@ -130,7 +131,7 @@ public class GithubIssuesTest extends GithubTest { } public void testQueriedIssues2() throws Exception { - List<GithubIssue> result = GithubApiUtil.getIssuesQueried(myAuth, myLogin2, REPO_NAME, "commentary", true); + List<GithubIssue> result = GithubApiUtil.getIssuesQueried(new GithubConnection(myAuth), myLogin2, REPO_NAME, "commentary", true); List<Long> issues = ContainerUtil.map(result, new Function<GithubIssue, Long>() { @Override public Long fun(GithubIssue githubIssue) { @@ -144,7 +145,7 @@ public class GithubIssuesTest extends GithubTest { } public void testQueriedIssues3() throws Exception { - List<GithubIssue> result = GithubApiUtil.getIssuesQueried(myAuth, myLogin2, REPO_NAME, "abracadabra", false); + List<GithubIssue> result = GithubApiUtil.getIssuesQueried(new GithubConnection(myAuth), myLogin2, REPO_NAME, "abracadabra", false); List<Long> issues = ContainerUtil.map(result, new Function<GithubIssue, Long>() { @Override public Long fun(GithubIssue githubIssue) { diff --git a/plugins/github/test/org/jetbrains/plugins/github/GithubRequestPagingTest.java b/plugins/github/test/org/jetbrains/plugins/github/GithubRequestPagingTest.java index 4fec0d1c7a5c..22b06a58ff02 100644 --- a/plugins/github/test/org/jetbrains/plugins/github/GithubRequestPagingTest.java +++ b/plugins/github/test/org/jetbrains/plugins/github/GithubRequestPagingTest.java @@ -16,8 +16,10 @@ package org.jetbrains.plugins.github; import org.jetbrains.plugins.github.api.GithubApiUtil; +import org.jetbrains.plugins.github.api.GithubConnection; import org.jetbrains.plugins.github.api.GithubRepo; import org.jetbrains.plugins.github.test.GithubTest; +import org.jetbrains.plugins.github.util.GithubAuthData; import java.util.ArrayList; import java.util.List; @@ -36,17 +38,23 @@ public class GithubRequestPagingTest extends GithubTest { public void testAvailableRepos() throws Throwable { - List<GithubRepo> availableRepos = GithubApiUtil.getUserRepos(myGitHubSettings.getAuthData(), myLogin2); - List<String> realData = new ArrayList<String>(); - for (GithubRepo info : availableRepos) { - realData.add(info.getName()); - } + GithubConnection connection = new GithubConnection(myGitHubSettings.getAuthData(), true); + try { + List<GithubRepo> availableRepos = GithubApiUtil.getUserRepos(connection, myLogin2); + List<String> realData = new ArrayList<String>(); + for (GithubRepo info : availableRepos) { + realData.add(info.getName()); + } - List<String> expectedData = new ArrayList<String>(); - for (int i = 1; i <= 251; i++) { - expectedData.add(String.valueOf(i)); - } + List<String> expectedData = new ArrayList<String>(); + for (int i = 1; i <= 251; i++) { + expectedData.add(String.valueOf(i)); + } - assertContainsElements(realData, expectedData); + assertContainsElements(realData, expectedData); + } + finally { + connection.close(); + } } } diff --git a/plugins/github/test/org/jetbrains/plugins/github/GithubShareProjectTest.java b/plugins/github/test/org/jetbrains/plugins/github/GithubShareProjectTest.java index c4063629cbbe..4e51fccc0729 100644 --- a/plugins/github/test/org/jetbrains/plugins/github/GithubShareProjectTest.java +++ b/plugins/github/test/org/jetbrains/plugins/github/GithubShareProjectTest.java @@ -4,6 +4,7 @@ import com.intellij.notification.NotificationType; import com.intellij.openapi.components.ServiceManager; import git4idea.commands.Git; import org.jetbrains.plugins.github.api.GithubApiUtil; +import org.jetbrains.plugins.github.api.GithubConnection; import org.jetbrains.plugins.github.api.GithubRepoDetailed; import org.jetbrains.plugins.github.util.GithubAuthData; @@ -100,7 +101,7 @@ public class GithubShareProjectTest extends GithubShareProjectTestBase { protected void checkGithubExists() throws IOException { GithubAuthData auth = myGitHubSettings.getAuthData(); - GithubRepoDetailed githubInfo = GithubApiUtil.getDetailedRepoInfo(auth, myLogin1, PROJECT_NAME); + GithubRepoDetailed githubInfo = GithubApiUtil.getDetailedRepoInfo(new GithubConnection(auth), myLogin1, PROJECT_NAME); assertNotNull("GitHub repository does not exist", githubInfo); } } diff --git a/plugins/github/test/org/jetbrains/plugins/github/GithubShareProjectTestBase.java b/plugins/github/test/org/jetbrains/plugins/github/GithubShareProjectTestBase.java index abfb5ece3819..ea07ca1eaf1d 100644 --- a/plugins/github/test/org/jetbrains/plugins/github/GithubShareProjectTestBase.java +++ b/plugins/github/test/org/jetbrains/plugins/github/GithubShareProjectTestBase.java @@ -22,6 +22,7 @@ import git4idea.GitUtil; import git4idea.repo.GitRepository; import git4idea.test.TestDialogHandler; import org.jetbrains.plugins.github.api.GithubApiUtil; +import org.jetbrains.plugins.github.api.GithubConnection; import org.jetbrains.plugins.github.test.GithubTest; import org.jetbrains.plugins.github.ui.GithubShareDialog; @@ -48,7 +49,7 @@ public abstract class GithubShareProjectTestBase extends GithubTest { } protected void deleteGithubRepo() throws IOException { - GithubApiUtil.deleteGithubRepository(myGitHubSettings.getAuthData(), myLogin1, PROJECT_NAME); + GithubApiUtil.deleteGithubRepository(new GithubConnection(myGitHubSettings.getAuthData()), myLogin1, PROJECT_NAME); } protected void registerDefaultShareDialogHandler() { |