Merge pull request jenkinsci#256 from MarkEWaite/test-more-cases

Test more cases of fetch options

Author: MarkEWaite

src/main/java/org/jenkinsci/plugins/gitclient/JGitAPIImpl.java

@@ -1382,7 +1382,7 @@ public void execute() throws GitException, InterruptedException {
                             // we use origin as reference
                             reference = url;
                         } else {
-                            listener.getLogger().println("[WARNING] Both 'shared' and 'reference' is used, shared is ignored.");
+                            listener.getLogger().println("[WARNING] Both 'shared' and 'reference' are used, shared is ignored.");
                         }
                     }
 

src/main/java/org/jenkinsci/plugins/gitclient/PushCommand.java

@@ -1,10 +1,7 @@
 package org.jenkinsci.plugins.gitclient;
 
-import org.eclipse.jgit.transport.RefSpec;
 import org.eclipse.jgit.transport.URIish;
 
-import java.util.List;
-
 /**
  * PushCommand interface.
  *

src/test/java/org/jenkinsci/plugins/gitclient/GitAPITestCase.java

@@ -8,7 +8,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 import static org.jenkinsci.plugins.gitclient.StringSharesPrefix.sharesPrefix;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.*;
 
 import hudson.FilePath;
 import hudson.Launcher;
@@ -254,7 +254,11 @@ WorkingArea init(boolean bare) throws IOException, InterruptedException {
         }
 
         void tag(String tag) throws IOException, InterruptedException {
-            cmd("git tag " + tag);
+            tag(tag, false);
+        }
+
+        void tag(String tag, boolean force) throws IOException, InterruptedException {
+            cmd("git tag" + (force ? " --force " : " ") + tag);
         }
 
         void commitEmpty(String msg) throws IOException, InterruptedException {
@@ -543,13 +547,12 @@ public void test_clone_repositoryName() throws IOException, InterruptedException
 
     public void test_clone_shallow() throws Exception
     {
-        w.git.clone_().url(localMirror()).repositoryName("origin").shallow().execute();
+        w.git.clone_().url(localMirror()).repositoryName("origin").shallow(true).execute();
         createRevParseBranch(); // Verify JENKINS-32258 is fixed
         w.git.checkout("origin/master", "master");
         check_remote_url("origin");
         assertBranchesExist(w.git.getBranches(), "master");
-        final String alternates = ".git" + File.separator + "objects" + File.separator + "info" + File.separator + "alternates";
-        assertFalse("Alternates file found: " + alternates, w.exists(alternates));
+        assertAlternatesFileNotFound();
         /* JGit does not support shallow clone */
         assertEquals("isShallow?", w.igit() instanceof CliGitAPIImpl, w.cgit().isShallowRepository());
         final String shallow = ".git" + File.separator + "shallow";
@@ -558,12 +561,11 @@ public void test_clone_shallow() throws Exception
 
     public void test_clone_shallow_with_depth() throws IOException, InterruptedException
     {
-        w.git.clone_().url(localMirror()).repositoryName("origin").shallow().depth(2).execute();
+        w.git.clone_().url(localMirror()).repositoryName("origin").shallow(true).depth(2).execute();
         w.git.checkout("origin/master", "master");
         check_remote_url("origin");
         assertBranchesExist(w.git.getBranches(), "master");
-        final String alternates = ".git" + File.separator + "objects" + File.separator + "info" + File.separator + "alternates";
-        assertFalse("Alternates file found: " + alternates, w.exists(alternates));
+        assertAlternatesFileNotFound();
         /* JGit does not support shallow clone */
         final String shallow = ".git" + File.separator + "shallow";
         assertEquals("Shallow file existence: " + shallow, w.igit() instanceof CliGitAPIImpl, w.exists(shallow));
@@ -580,6 +582,16 @@ public void test_clone_shared() throws IOException, InterruptedException
         assertNoObjectsInRepository();
     }
 
+    public void test_clone_unshared() throws IOException, InterruptedException
+    {
+        w.git.clone_().url(localMirror()).repositoryName("origin").shared(false).execute();
+        createRevParseBranch(); // Verify JENKINS-32258 is fixed
+        w.git.checkout("origin/master", "master");
+        check_remote_url("origin");
+        assertBranchesExist(w.git.getBranches(), "master");
+        assertAlternatesFileNotFound();
+    }
+
     public void test_clone_reference() throws IOException, InterruptedException
     {
         w.git.clone_().url(localMirror()).repositoryName("origin").reference(localMirror()).execute();
@@ -604,6 +616,11 @@ private void assertNoObjectsInRepository() {
 
     }
 
+    private void assertAlternatesFileNotFound() {
+        final String alternates = ".git" + File.separator + "objects" + File.separator + "info" + File.separator + "alternates";
+        assertFalse("Alternates file found: " + alternates, w.exists(alternates));
+    }
+
     private void assertAlternateFilePointsToLocalMirror() throws IOException, InterruptedException {
         final String alternates = ".git" + File.separator + "objects" + File.separator + "info" + File.separator + "alternates";
 
@@ -1033,11 +1050,46 @@ public void test_push_tags() throws Exception {
         assertEquals("bare != working", commit1, bareCommit1);
         assertEquals(commit1, bare.git.getHeadRev(bare.repoPath(), "refs/heads/master"));
 
-        /* Add tag to working repo and without pushing it to the bare repo */
+        /* Add tag1 to working repo without pushing it to bare repo */
         w.tag("tag1");
         assertTrue("tag1 wasn't created", w.git.tagExists("tag1"));
+        assertEquals("tag1 points to wrong commit", commit1, w.git.revParse("tag1"));
         w.git.push().ref("master").to(new URIish(bare.repoPath())).tags(false).execute();
-        assertFalse("tag1 wasn't pushed", bare.cmd("git tag").contains("tag1"));
+        assertFalse("tag1 pushed unexpectedly", bare.cmd("git tag").contains("tag1"));
+
+        /* Push tag1 to bare repo */
+        w.git.push().ref("master").to(new URIish(bare.repoPath())).tags(true).execute();
+        assertTrue("tag1 not pushed", bare.cmd("git tag").contains("tag1"));
+
+        /* Create a new commit, move tag1 to that commit, attempt push */
+        w.touch("file1", "file1 content " + java.util.UUID.randomUUID().toString());
+        w.git.add("file1");
+        w.git.commit("commit2");
+        ObjectId commit2 = w.head();
+        w.tag("tag1", true); /* Tag already exists, move from commit1 to commit2 */
+        assertTrue("tag1 wasn't created", w.git.tagExists("tag1"));
+        assertEquals("tag1 points to wrong commit", commit2, w.git.revParse("tag1"));
+        try {
+            w.git.push().ref("master").to(new URIish(bare.repoPath())).tags(true).execute();
+            /* JGit does not throw exception updating existing tag - ugh */
+            /* CliGit before 1.8 does not throw exception updating existing tag - ugh */
+            if (w.git instanceof CliGitAPIImpl && w.cgit().isAtLeastVersion(1, 8, 0, 0)) {
+	        fail("Modern CLI git should throw exception pushing a change to existing tag");
+	    }
+        } catch (GitException ge) {
+            assertThat(ge.getMessage(), containsString("already exists"));
+        }
+        try {
+            w.git.push().ref("master").to(new URIish(bare.repoPath())).tags(true).force(false).execute();
+            /* JGit does not throw exception updating existing tag - ugh */
+            /* CliGit before 1.8 does not throw exception updating existing tag - ugh */
+            if (w.git instanceof CliGitAPIImpl && w.cgit().isAtLeastVersion(1, 8, 0, 0)) {
+	        fail("Modern CLI git should throw exception pushing a change to existing tag");
+	    }
+        } catch (GitException ge) {
+            assertThat(ge.getMessage(), containsString("already exists"));
+        }
+        w.git.push().ref("master").to(new URIish(bare.repoPath())).tags(true).force(true).execute();
 
         /* Add tag to working repo without pushing it to the bare
          * repo, tests the default behavior when tags() is not added