James Moger
2012-08-01 0adceb4b64dfe0dd509da33c6d733a47fbf803a2
tests/com/gitblit/tests/GitServletTest.java
@@ -13,6 +13,7 @@
import org.eclipse.jgit.api.CloneCommand;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
import org.eclipse.jgit.util.FileUtils;
import org.junit.AfterClass;
@@ -30,6 +31,8 @@
   static File ticgit2Folder = new File(GitBlitSuite.REPOSITORIES, "working/ticgit2");
   static File jgitFolder = new File(GitBlitSuite.REPOSITORIES, "working/jgit");
   static File jgit2Folder = new File(GitBlitSuite.REPOSITORIES, "working/jgit2");
   String url = GitBlitSuite.url;
   String account = GitBlitSuite.account;
@@ -39,7 +42,6 @@
   @BeforeClass
   public static void startGitblit() throws Exception {
      deleteWorkingFolders();
      started.set(GitBlitSuite.startGitblit());
   }
@@ -47,11 +49,11 @@
   public static void stopGitblit() throws Exception {
      if (started.get()) {
         GitBlitSuite.stopGitblit();
         deleteWorkingFolders();
      }
      deleteWorkingFolders();
   }
   
   private static void deleteWorkingFolders() throws Exception {
   public static void deleteWorkingFolders() throws Exception {
      if (ticgitFolder.exists()) {
         FileUtils.delete(ticgitFolder, FileUtils.RECURSIVE);
      }
@@ -60,6 +62,9 @@
      }
      if (jgitFolder.exists()) {
         FileUtils.delete(jgitFolder, FileUtils.RECURSIVE);
      }
      if (jgit2Folder.exists()) {
         FileUtils.delete(jgit2Folder, FileUtils.RECURSIVE);
      }
   }
@@ -108,9 +113,9 @@
   public void testAnonymousPush() throws Exception {
      Git git = Git.open(ticgitFolder);
      File file = new File(ticgitFolder, "TODO");
      OutputStreamWriter os = new OutputStreamWriter(new FileOutputStream(file, true));
      OutputStreamWriter os = new OutputStreamWriter(new FileOutputStream(file, true), Constants.CHARSET);
      BufferedWriter w = new BufferedWriter(os);
      w.write("// " + new Date().toString() + "\n");
      w.write("// hellol中文 " + new Date().toString() + "\n");
      w.close();
      git.add().addFilepattern(file.getName()).call();
      git.commit().setMessage("test commit").call();
@@ -131,7 +136,7 @@
      Git git = Git.open(jgitFolder);
      File file = new File(jgitFolder, "TODO");
      OutputStreamWriter os = new OutputStreamWriter(new FileOutputStream(file, true));
      OutputStreamWriter os = new OutputStreamWriter(new FileOutputStream(file, true), Constants.CHARSET);
      BufferedWriter w = new BufferedWriter(os);
      w.write("// " + new Date().toString() + "\n");
      w.close();
@@ -141,6 +146,34 @@
      close(git);
   }
   
   @Test
   public void testPushToNonBareRepository() throws Exception {
      CloneCommand clone = Git.cloneRepository();
      clone.setURI(MessageFormat.format("{0}/git/working/jgit", url));
      clone.setDirectory(jgit2Folder);
      clone.setBare(false);
      clone.setCloneAllBranches(true);
      clone.setCredentialsProvider(new UsernamePasswordCredentialsProvider(account, password));
      close(clone.call());
      assertTrue(true);
      Git git = Git.open(jgit2Folder);
      File file = new File(jgit2Folder, "NONBARE");
      OutputStreamWriter os = new OutputStreamWriter(new FileOutputStream(file, true), Constants.CHARSET);
      BufferedWriter w = new BufferedWriter(os);
      w.write("// " + new Date().toString() + "\n");
      w.close();
      git.add().addFilepattern(file.getName()).call();
      git.commit().setMessage("test commit followed by push to non-bare repository").call();
      try {
         git.push().setPushAll().call();
         assertTrue(false);
      } catch (Exception e) {
         assertTrue(e.getCause().getMessage().contains("git-receive-pack not permitted"));
      }
      close(git);
   }
   private void close(Git git) {
      // really close the repository
      // decrement the use counter to 0