From 54d4709af7eb9b32c4c07ff89e560d540b28e0f1 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Wed, 2 Dec 2015 17:03:21 +0300
Subject: [PATCH] git: tests on "checkout tag or revision"

---
 .../git4idea/branch/GitBranchWorkerTest.java  | 87 ++++++++++++++++++-
 1 file changed, 85 insertions(+), 2 deletions(-)

diff --git a/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.java b/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.java
index 78719faddaf9..2169231e747c 100644
--- a/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.java
+++ b/plugins/git4idea/tests/git4idea/branch/GitBranchWorkerTest.java
@@ -218,6 +218,52 @@ public class GitBranchWorkerTest extends GitPlatformTest {
     assertCurrentBranch(myContrib, "master");
   }
 
+  public void test_checkout_revision_checkout_branch_with_complete_success() {
+    branchWithCommit(myRepositories, "feature");
+
+    checkoutRevision("feature", new TestUiHandler());
+
+    assertDetachedState("feature");
+    assertEquals("Notification about successful branch checkout is incorrect", "Checked out " + bcode("feature"),
+                 myVcsNotifier.getLastNotification().getContent());
+  }
+
+  public void test_checkout_revision_checkout_ref_with_complete_success() {
+    branchWithCommit(myRepositories, "feature");
+
+    checkoutRevision("feature~1", new TestUiHandler());
+
+    assertDetachedState("master");
+    assertEquals("Notification about successful branch checkout is incorrect", "Checked out " + bcode("feature~1"),
+                 myVcsNotifier.getLastNotification().getContent());
+  }
+
+  public void test_checkout_revision_checkout_ref_with_complete_failure() {
+    branchWithCommit(myRepositories, "feature");
+
+    checkoutRevision("unknown_ref", new TestUiHandler());
+
+    assertCurrentBranch("master");
+    assertCurrentRevision("master");
+    assertEquals("Notification about successful branch checkout is incorrect", "Revision not found in project, community and contrib",
+                 myVcsNotifier.getLastNotification().getContent());
+  }
+
+  public void test_checkout_revision_checkout_ref_with_partial_success() {
+    branchWithCommit(ContainerUtil.list(myCommunity, myContrib), "feature");
+
+    checkoutRevision("feature", new TestUiHandler());
+
+    assertCurrentBranch(myUltimate, "master");
+    assertDetachedState(myCommunity, "feature");
+    assertDetachedState(myContrib, "feature");
+
+    assertEquals("Notification about successful branch checkout is incorrect",
+                 "Checked out " + bcode("feature") + " in community and contrib" + "<br>" +
+                 "Revision not found in project" + "<br><a href='rollback'>Rollback</a>",
+                 myVcsNotifier.getLastNotification().getContent());
+  }
+
   public void test_checkout_with_untracked_files_overwritten_by_checkout_in_first_repo_should_show_notification() {
     test_untracked_files_overwritten_by_in_first_repo("checkout", 1);
   }
@@ -807,14 +853,40 @@ public class GitBranchWorkerTest extends GitPlatformTest {
     assertCurrentBranch(myContrib, "master");
   }
 
+  static private void assertDetachedState(GitRepository repository, String reference) {
+    assertCurrentRevision(repository, reference);
+
+    String curBranch = getCurrentBranch(repository);
+    boolean isDetached = curBranch.contains("detached");
+    assertTrue("Current branch is not detached in ${repository} - " + curBranch, isDetached);
+  }
+
   static private void assertCurrentBranch(GitRepository repository, String name) {
-    String curBranch = ObjectUtils.assertNotNull(ContainerUtil.find(git(repository, "branch").split("\n"), new Condition<String>() {
+    String curBranch = getCurrentBranch(repository);
+    assertEquals("Current branch is incorrect in ${repository}", name, curBranch);
+  }
+
+  @NotNull
+  private static String getCurrentBranch(GitRepository repository) {
+    return ObjectUtils.assertNotNull(ContainerUtil.find(git(repository, "branch").split("\n"), new Condition<String>() {
       @Override
       public boolean value(String s) {
         return s.contains("*");
       }
     })).replace('*', ' ').trim();
-    assertEquals("Current branch is incorrect in ${repository}", name, curBranch);
+  }
+
+  static private void assertCurrentRevision(GitRepository repository, String reference) {
+    String expectedRef = git(repository, "rev-parse " + "HEAD");
+    String currentRef = git(repository, "rev-parse " + reference);
+
+    assertEquals("Current revision is incorrect in ${repository}", expectedRef, currentRef);
+  }
+
+  private void assertDetachedState(String reference) {
+    for (GitRepository repository : myRepositories) {
+      assertDetachedState(repository, reference);
+    }
   }
 
   private void assertCurrentBranch(String name) {
@@ -823,6 +895,12 @@ public class GitBranchWorkerTest extends GitPlatformTest {
     }
   }
 
+  private void assertCurrentRevision(String reference) {
+    for (GitRepository repository : myRepositories) {
+      assertCurrentRevision(repository, reference);
+    }
+  }
+
   private void checkoutNewBranch(String name, GitBranchUiHandler uiHandler) {
     GitBranchWorker brancher = new GitBranchWorker(myProject, myPlatformFacade, myGit, uiHandler);
     brancher.checkoutNewBranch(name, myRepositories);
@@ -833,6 +911,11 @@ public class GitBranchWorkerTest extends GitPlatformTest {
     brancher.checkout(name, false, myRepositories);
   }
 
+  private void checkoutRevision(String reference, GitBranchUiHandler uiHandler) {
+    GitBranchWorker brancher = new GitBranchWorker(myProject, myPlatformFacade, myGit, uiHandler);
+    brancher.checkout(reference, true, myRepositories);
+  }
+
   private void mergeBranch(String name, GitBranchUiHandler uiHandler) {
     GitBranchWorker brancher = new GitBranchWorker(myProject, myPlatformFacade, myGit, uiHandler);
     brancher.merge(name, GitBrancher.DeleteOnMergeOption.PROPOSE, myRepositories);