From 669686f6118544bf2122f1e7f3e39c5dbc9654f5 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Sat, 18 Jun 2011 09:02:00 -0400 Subject: [PATCH] Improved web.xml builder. Now it includes the parameter comments. --- tests/com/gitblit/tests/JGitUtilsTest.java | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/com/gitblit/tests/JGitUtilsTest.java b/tests/com/gitblit/tests/JGitUtilsTest.java index 7196afd..19a4847 100644 --- a/tests/com/gitblit/tests/JGitUtilsTest.java +++ b/tests/com/gitblit/tests/JGitUtilsTest.java @@ -30,7 +30,9 @@ import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.PersonIdent; import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.lib.RepositoryCache.FileKey; import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.util.FS; import com.gitblit.GitBlit; import com.gitblit.Keys; @@ -95,15 +97,10 @@ public void testCreateRepository() throws Exception { String[] repositories = { "NewTestRepository.git", "NewTestRepository" }; for (String repositoryName : repositories) { - boolean isBare = repositoryName.endsWith(".git"); Repository repository = JGitUtils.createRepository(GitBlitSuite.REPOSITORIES, - repositoryName, isBare); - File folder; - if (isBare) { - folder = new File(GitBlitSuite.REPOSITORIES, repositoryName); - } else { - folder = new File(GitBlitSuite.REPOSITORIES, repositoryName + "/.git"); - } + repositoryName); + File folder = FileKey.resolve(new File(GitBlitSuite.REPOSITORIES, repositoryName), + FS.DETECTED); assertTrue(repository != null); assertFalse(JGitUtils.hasCommits(repository)); assertTrue(JGitUtils.getFirstCommit(repository, null) == null); @@ -125,10 +122,12 @@ List<RefModel> list = entry.getValue(); for (RefModel ref : list) { if (ref.displayName.equals("refs/tags/spearce-gpg-pub")) { - assertTrue(ref.getObjectId().getName().equals("8bbde7aacf771a9afb6992434f1ae413e010c6d8")); + assertTrue(ref.toString().equals("refs/tags/spearce-gpg-pub")); + assertTrue(ref.getObjectId().getName() + .equals("8bbde7aacf771a9afb6992434f1ae413e010c6d8")); assertTrue(ref.getAuthorIdent().getEmailAddress().equals("spearce@spearce.org")); assertTrue(ref.getShortMessage().startsWith("GPG key")); - assertTrue(ref.getFullMessage().startsWith("GPG key")); + assertTrue(ref.getFullMessage().startsWith("GPG key")); assertTrue(ref.getReferencedObjectType() == Constants.OBJ_BLOB); } else if (ref.displayName.equals("refs/tags/v0.12.1")) { assertTrue(ref.isAnnotatedTag()); @@ -138,8 +137,8 @@ } public void testBranches() throws Exception { - Repository repository = GitBlitSuite.getTicgitRepository(); - for (RefModel model : JGitUtils.getLocalBranches(repository, -1)) { + Repository repository = GitBlitSuite.getJGitRepository(); + for (RefModel model : JGitUtils.getLocalBranches(repository, true, -1)) { assertTrue(model.getName().startsWith(Constants.R_HEADS)); assertTrue(model.equals(model)); assertFalse(model.equals("")); @@ -147,7 +146,7 @@ + model.getName().hashCode()); assertTrue(model.getShortMessage().equals(model.getShortMessage())); } - for (RefModel model : JGitUtils.getRemoteBranches(repository, -1)) { + for (RefModel model : JGitUtils.getRemoteBranches(repository, true, -1)) { assertTrue(model.getName().startsWith(Constants.R_REMOTES)); assertTrue(model.equals(model)); assertFalse(model.equals("")); @@ -155,14 +154,14 @@ + model.getName().hashCode()); assertTrue(model.getShortMessage().equals(model.getShortMessage())); } - assertTrue(JGitUtils.getRemoteBranches(repository, 10).size() == 10); + assertTrue(JGitUtils.getRemoteBranches(repository, true, 8).size() == 8); repository.close(); } public void testTags() throws Exception { - Repository repository = GitBlitSuite.getTicgitRepository(); - for (RefModel model : JGitUtils.getTags(repository, -1)) { - if (model.getObjectId().getName().equals("283035e4848054ff1803cb0e690270787dc92399")) { + Repository repository = GitBlitSuite.getJGitRepository(); + for (RefModel model : JGitUtils.getTags(repository, true, -1)) { + if (model.getObjectId().getName().equals("d28091fb2977077471138fe97da1440e0e8ae0da")) { assertTrue("Not an annotated tag!", model.isAnnotatedTag()); } assertTrue(model.getName().startsWith(Constants.R_TAGS)); @@ -172,13 +171,14 @@ + model.getName().hashCode()); } repository.close(); - + repository = GitBlitSuite.getBluezGnomeRepository(); - for (RefModel model : JGitUtils.getTags(repository, -1)) { + for (RefModel model : JGitUtils.getTags(repository, true, -1)) { if (model.getObjectId().getName().equals("728643ec0c438c77e182898c2f2967dbfdc231c8")) { assertFalse(model.isAnnotatedTag()); assertTrue(model.getAuthorIdent().getEmailAddress().equals("marcel@holtmann.org")); - assertTrue(model.getFullMessage().equals("Update changelog and bump version number\n")); + assertTrue(model.getFullMessage().equals( + "Update changelog and bump version number\n")); } } repository.close(); -- Gitblit v1.9.1