From 18d398e3ab5227fe10fe3f322798a51ce0cd10ca Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 23 Feb 2012 17:44:53 -0500 Subject: [PATCH] Documentation --- tests/com/gitblit/tests/JGitUtilsTest.java | 32 +++++++++++++++++++++++++++----- 1 files changed, 27 insertions(+), 5 deletions(-) diff --git a/tests/com/gitblit/tests/JGitUtilsTest.java b/tests/com/gitblit/tests/JGitUtilsTest.java index 7c3f8ab..e649769 100644 --- a/tests/com/gitblit/tests/JGitUtilsTest.java +++ b/tests/com/gitblit/tests/JGitUtilsTest.java @@ -66,7 +66,7 @@ @Test public void testFindRepositories() { - List<String> list = JGitUtils.getRepositoryList(null, true, true); + List<String> list = JGitUtils.getRepositoryList(null, false, true); assertEquals(0, list.size()); list.addAll(JGitUtils.getRepositoryList(new File("DoesNotExist"), true, true)); assertEquals(0, list.size()); @@ -190,12 +190,12 @@ } repository.close(); - repository = GitBlitSuite.getBluezGnomeRepository(); + repository = GitBlitSuite.getGitectiveRepository(); for (RefModel model : JGitUtils.getTags(repository, true, -1)) { - if (model.getObjectId().getName().equals("728643ec0c438c77e182898c2f2967dbfdc231c8")) { + if (model.getObjectId().getName().equals("035254295a9bba11f72b1f9d6791a6b957abee7b")) { assertFalse(model.isAnnotatedTag()); - assertTrue(model.getAuthorIdent().getEmailAddress().equals("marcel@holtmann.org")); - assertEquals("Update changelog and bump version number\n", model.getFullMessage()); + assertTrue(model.getAuthorIdent().getEmailAddress().equals("kevinsawicki@gmail.com")); + assertEquals("Add scm and issue tracker elements to pom.xml\n", model.getFullMessage()); } } repository.close(); @@ -212,6 +212,28 @@ assertEquals("183474d554e6f68478a02d9d7888b67a9338cdff", list.get(0).notesRef .getReferencedObjectId().getName()); } + + @Test + public void testRelinkHEAD() throws Exception { + Repository repository = GitBlitSuite.getJGitRepository(); + // confirm HEAD is master + String currentRef = JGitUtils.getHEADRef(repository); + assertEquals("refs/heads/master", currentRef); + List<String> availableHeads = JGitUtils.getAvailableHeadTargets(repository); + assertTrue(availableHeads.size() > 0); + + // set HEAD to stable-1.2 + JGitUtils.setHEADtoRef(repository, "refs/heads/stable-1.2"); + currentRef = JGitUtils.getHEADRef(repository); + assertEquals("refs/heads/stable-1.2", currentRef); + + // restore HEAD to master + JGitUtils.setHEADtoRef(repository, "refs/heads/master"); + currentRef = JGitUtils.getHEADRef(repository); + assertEquals("refs/heads/master", currentRef); + + repository.close(); + } @Test public void testCreateOrphanedBranch() throws Exception { -- Gitblit v1.9.1