From 9fbcf81c5503008c8d7cd19aeb23f875c2d0f885 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <Aleksey.Pivovarov@jetbrains.com>
Date: Mon, 19 Aug 2013 17:05:35 +0400
Subject: [PATCH] Github: simplify

---
 .../github/GithubCreatePullRequestTest.java    | 18 ------------------
 .../GithubCreatePullRequestTestBase.java       |  7 +++++++
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/plugins/github/test/org/jetbrains/plugins/github/GithubCreatePullRequestTest.java b/plugins/github/test/org/jetbrains/plugins/github/GithubCreatePullRequestTest.java
index 0d24130ea4ac..f8c9087f23bd 100644
--- a/plugins/github/test/org/jetbrains/plugins/github/GithubCreatePullRequestTest.java
+++ b/plugins/github/test/org/jetbrains/plugins/github/GithubCreatePullRequestTest.java
@@ -26,15 +26,9 @@ public class GithubCreatePullRequestTest extends GithubCreatePullRequestTestBase
   public void testSimple() throws Exception {
     registerDefaultCreatePullRequestDialogHandler(myLogin1 + ":master");
 
-    cd(myProjectRoot.getPath());
-    cloneRepo();
-    createBranch();
-    createChanges();
-
     GithubCreatePullRequestAction.createPullRequest(myProject, myProjectRoot);
 
     checkNotification(NotificationType.INFORMATION, "Successfully created pull request", null);
-    initGitChecks();
     checkRemoteConfigured();
     checkLastCommitPushed();
   }
@@ -42,15 +36,9 @@ public class GithubCreatePullRequestTest extends GithubCreatePullRequestTestBase
   public void testParent() throws Exception {
     registerDefaultCreatePullRequestDialogHandler(myLogin2 + ":file2");
 
-    cd(myProjectRoot.getPath());
-    cloneRepo();
-    createBranch();
-    createChanges();
-
     GithubCreatePullRequestAction.createPullRequest(myProject, myProjectRoot);
 
     checkNotification(NotificationType.INFORMATION, "Successfully created pull request", null);
-    initGitChecks();
     checkRemoteConfigured();
     checkLastCommitPushed();
   }
@@ -58,15 +46,9 @@ public class GithubCreatePullRequestTest extends GithubCreatePullRequestTestBase
   public void testCommitRef1() throws Exception {
     registerDefaultCreatePullRequestDialogHandler(myLogin1 + ":refs/heads/master");
 
-    cd(myProjectRoot.getPath());
-    cloneRepo();
-    createBranch();
-    createChanges();
-
     GithubCreatePullRequestAction.createPullRequest(myProject, myProjectRoot);
 
     checkNotification(NotificationType.INFORMATION, "Successfully created pull request", null);
-    initGitChecks();
     checkRemoteConfigured();
     checkLastCommitPushed();
   }
diff --git a/plugins/github/test/org/jetbrains/plugins/github/GithubCreatePullRequestTestBase.java b/plugins/github/test/org/jetbrains/plugins/github/GithubCreatePullRequestTestBase.java
index 50585138e22c..24bb7800447c 100644
--- a/plugins/github/test/org/jetbrains/plugins/github/GithubCreatePullRequestTestBase.java
+++ b/plugins/github/test/org/jetbrains/plugins/github/GithubCreatePullRequestTestBase.java
@@ -30,6 +30,7 @@ import org.jetbrains.plugins.github.util.GithubUtil;
 
 import java.util.Random;
 
+import static com.intellij.dvcs.test.Executor.cd;
 import static git4idea.test.GitExecutor.git;
 
 /**
@@ -48,6 +49,12 @@ public abstract class GithubCreatePullRequestTestBase extends GithubTest {
     BRANCH_NAME = "branch_" + getTestName(false) + "_" + DateFormatUtil.formatDate(time).replace('/', '-') + "_" + rnd.nextLong();
 
     registerHttpAuthService();
+
+    cd(myProjectRoot.getPath());
+    cloneRepo();
+    createBranch();
+    createChanges();
+    initGitChecks();
   }
 
   @Override