merge with branch 1.x

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

@@ -0,0 +1,62 @@
+/**
+ * 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.repository;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+/**
+ * Unit tests for {@link GitRepositoryPathMatcher}.
+ * 
+ * @author Sebastian Sdorra
+ * @since 1.54
+ */
+public class GitRepositoryPathMatcherTest {
+
+  private final GitRepositoryPathMatcher pathMatcher = new GitRepositoryPathMatcher();
+
+  @Test
+  public void testIsPathMatching() {
+    assertFalse(pathMatcher.isPathMatching(repository("my-repo"), "my-repoo"));
+    assertFalse(pathMatcher.isPathMatching(repository("my"), "my-repo"));
+    assertFalse(pathMatcher.isPathMatching(repository("my"), "my-repo/with/path"));
+    
+    assertTrue(pathMatcher.isPathMatching(repository("my-repo"), "my-repo"));
+    assertTrue(pathMatcher.isPathMatching(repository("my-repo"), "my-repo.git"));
+    assertTrue(pathMatcher.isPathMatching(repository("my-repo"), "my-repo/with/path"));
+    assertTrue(pathMatcher.isPathMatching(repository("my-repo"), "my-repo.git/with/path"));
+  }
+  
+  private Repository repository(String name) {
+    return new Repository(name, GitRepositoryHandler.TYPE_NAME, name);
+  }
+  
+}

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

@@ -35,15 +35,10 @@ package sonia.scm.repository;
 
 //~--- non-JDK imports --------------------------------------------------------
 
-import org.eclipse.jgit.api.Git;
-import org.eclipse.jgit.api.errors.GitAPIException;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
-import static org.hamcrest.Matchers.*;
-
 import static org.junit.Assert.*;
 
 import static org.mockito.Mockito.*;
@@ -52,8 +47,9 @@ import static org.mockito.Mockito.*;
 
 import java.io.File;
 import java.io.IOException;
+import javax.servlet.http.HttpServletRequest;
 
-import static org.junit.Assert.*;
+import sonia.scm.util.HttpUtil;
 
 /**
  * Unit tests for {@link GitUtil}.
@@ -125,9 +121,25 @@ public class GitUtilTest
     return repo;
   }
 
-  //~--- fields ---------------------------------------------------------------
-
   /** Field description */
   @Rule
   public TemporaryFolder temp = new TemporaryFolder();
+  
+  @Test
+  public void testIsGitClient() {
+    HttpServletRequest request = mockRequestWithUserAgent("Git/2.9.3");
+    assertTrue(GitUtil.isGitClient(request));
+    
+    request = mockRequestWithUserAgent("JGit/2.9.3");
+    assertTrue(GitUtil.isGitClient(request));
+    
+    request = mockRequestWithUserAgent("Mozilla/5.0 (Linux; Android 4.0.4; Galaxy Nexus Build/IMM76B) ...");
+    assertFalse(GitUtil.isGitClient(request));
+  }
+  
+  private HttpServletRequest mockRequestWithUserAgent(String userAgent) {
+    HttpServletRequest request = mock(HttpServletRequest.class);
+    when(request.getHeader(HttpUtil.HEADER_USERAGENT)).thenReturn(userAgent);    
+    return request;
+  }
 }

scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/client/spi/GitRepositoryClientProvider.java

@@ -191,7 +191,7 @@ public class GitRepositoryClientProvider extends RepositoryClientProvider
 
   @Override
   public File getWorkingCopy() {
-    return git.getRepository().getDirectory();
+    return git.getRepository().getWorkTree();
   }
 
   //~--- fields ---------------------------------------------------------------