merge with branch 1.x

scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/api/GitHookTagProviderTest.java

@@ -32,20 +32,23 @@
 package sonia.scm.repository.api;
 
 import com.google.common.collect.Lists;
-import java.util.List;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.transport.ReceiveCommand;
-import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
-import static org.hamcrest.Matchers.*;
 import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
-import org.mockito.stubbing.OngoingStubbing;
 import sonia.scm.repository.Tag;
 
+import java.util.List;
+
+import static org.hamcrest.Matchers.empty;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.when;
+
 /**
  * Unit tests for {@link GitHookTagProvider}.
  * 
@@ -54,6 +57,11 @@ import sonia.scm.repository.Tag;
 @RunWith(MockitoJUnitRunner.class)
 public class GitHookTagProviderTest {
 
+  private static final String ZERO = ObjectId.zeroId().getName();
+
+  @Rule
+  public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
   @Mock
   private ReceiveCommand command;
   
@@ -73,7 +81,7 @@ public class GitHookTagProviderTest {
   @Test
   public void testGetCreatedTags() {
     String revision = "b2002b64013e54b78eac251df0672bd5d6a83aa7";
-    GitHookTagProvider provider = createProvider(ReceiveCommand.Type.CREATE, "refs/tags/1.0.0", revision);
+    GitHookTagProvider provider = createProvider(ReceiveCommand.Type.CREATE, "refs/tags/1.0.0", revision, ZERO);
     
     assertTag("1.0.0", revision, provider.getCreatedTags());
     assertThat(provider.getDeletedTags(), empty());
@@ -85,7 +93,7 @@ public class GitHookTagProviderTest {
   @Test
   public void testGetDeletedTags() {
     String revision = "b2002b64013e54b78eac251df0672bd5d6a83aa7";
-    GitHookTagProvider provider = createProvider(ReceiveCommand.Type.DELETE, "refs/tags/1.0.0", revision);
+    GitHookTagProvider provider = createProvider(ReceiveCommand.Type.DELETE, "refs/tags/1.0.0", ZERO, revision);
     
     assertThat(provider.getCreatedTags(), empty());
     assertTag("1.0.0", revision, provider.getDeletedTags());
@@ -97,12 +105,25 @@ public class GitHookTagProviderTest {
   @Test
   public void testWithBranch(){
     String revision = "b2002b64013e54b78eac251df0672bd5d6a83aa7";
-    GitHookTagProvider provider = createProvider(ReceiveCommand.Type.CREATE, "refs/heads/1.0.0", revision);
+    GitHookTagProvider provider = createProvider(ReceiveCommand.Type.CREATE, "refs/heads/1.0.0", revision, revision);
     
     assertThat(provider.getCreatedTags(), empty());
     assertThat(provider.getDeletedTags(), empty());
   }
-  
+
+  /**
+   * Tests {@link GitHookTagProvider} with update command.
+   */
+  @Test
+  public void testUpdateTags() {
+    String newId = "b2002b64013e54b78eac251df0672bd5d6a83aa7";
+    String oldId = "e0f2be968b147ff7043684a7715d2fe852553db4";
+
+    GitHookTagProvider provider = createProvider(ReceiveCommand.Type.UPDATE, "refs/tags/1.0.0", newId, oldId);
+    assertTag("1.0.0", newId, provider.getCreatedTags());
+    assertTag("1.0.0", oldId, provider.getDeletedTags());
+  }
+
   private void assertTag(String name, String revision, List<Tag> tags){
     assertNotNull(tags);
     assertFalse(tags.isEmpty());
@@ -112,18 +133,11 @@ public class GitHookTagProviderTest {
     assertEquals(revision, tag.getRevision());
   }
   
-  private GitHookTagProvider createProvider(ReceiveCommand.Type type, String ref, String id){
-    OngoingStubbing<ObjectId> ongoing;
-    if (type == ReceiveCommand.Type.CREATE){
-      ongoing = when(command.getNewId());
-    } else {
-      ongoing = when(command.getOldId());
-    }
-    ongoing.thenReturn(ObjectId.fromString(id));
-    
+  private GitHookTagProvider createProvider(ReceiveCommand.Type type, String ref, String newId, String oldId){
+    when(command.getNewId()).thenReturn(ObjectId.fromString(newId));
+    when(command.getOldId()).thenReturn(ObjectId.fromString(oldId));
     when(command.getType()).thenReturn(type);
     when(command.getRefName()).thenReturn(ref);
-    
     return new GitHookTagProvider(commands);
   }
 

scm-plugins/scm-git-plugin/src/test/java/sonia/scm/web/GitReceivePackFactoryTest.java

@@ -0,0 +1,117 @@
+/**
+ * Copyright (c) 2010, Sebastian Sdorra
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither the name of SCM-Manager; nor the names of its
+ *    contributors may be used to endorse or promote products derived from this
+ *    software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * http://bitbucket.org/sdorra/scm-manager
+ *
+ */
+
+package sonia.scm.web;
+
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.errors.GitAPIException;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.transport.ReceivePack;
+import org.eclipse.jgit.transport.resolver.ReceivePackFactory;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import sonia.scm.repository.GitConfig;
+import sonia.scm.repository.GitRepositoryHandler;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.io.IOException;
+
+import static org.hamcrest.Matchers.instanceOf;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.when;
+
+
+/**
+ * Unit tests for {@link GitReceivePackFactory}.
+ */
+@RunWith(MockitoJUnitRunner.class)
+public class GitReceivePackFactoryTest {
+
+  @Mock
+  private GitRepositoryHandler handler;
+
+  private GitConfig config;
+
+  @Mock
+  private ReceivePackFactory wrappedReceivePackFactory;
+
+  private GitReceivePackFactory factory;
+
+  @Mock
+  private HttpServletRequest request;
+
+  private Repository repository;
+
+  @Rule
+  public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
+  @Before
+  public void setUpObjectUnderTest() throws Exception {
+    this.repository = createRepositoryForTesting();
+
+    config = new GitConfig();
+    when(handler.getConfig()).thenReturn(config);
+
+    ReceivePack receivePack = new ReceivePack(repository);
+    when(wrappedReceivePackFactory.create(request, repository)).thenReturn(receivePack);
+
+    factory = new GitReceivePackFactory(handler, null);
+    factory.setWrapped(wrappedReceivePackFactory);
+  }
+
+  private Repository createRepositoryForTesting() throws GitAPIException, IOException {
+    File directory = temporaryFolder.newFolder();
+    return Git.init().setDirectory(directory).call().getRepository();
+  }
+
+  @Test
+  public void testCreate() throws Exception {
+    ReceivePack receivePack = factory.create(request, repository);
+    assertThat(receivePack.getPackParserListener(), instanceOf(CollectingPackParserListener.class));
+    assertThat(receivePack.getPreReceiveHook(), instanceOf(GitReceiveHook.class));
+    assertThat(receivePack.getPostReceiveHook(), instanceOf(GitReceiveHook.class));
+    assertTrue(receivePack.isAllowNonFastForwards());
+  }
+
+  @Test
+  public void testCreateWithDisabledNonFastForward() throws Exception {
+    config.setNonFastForwardDisallowed(true);
+    ReceivePack receivePack = factory.create(request, repository);
+    assertFalse(receivePack.isAllowNonFastForwards());
+  }
+
+}