getTags() fixed

tests updated

Author: host6

src/main/java/org/scm4j/vcs/GitVCS.java

@@ -12,6 +12,7 @@
 import org.eclipse.jgit.diff.DiffEntry.ChangeType;
 import org.eclipse.jgit.diff.DiffEntry.Side;
 import org.eclipse.jgit.diff.DiffFormatter;
+import org.eclipse.jgit.errors.IncorrectObjectTypeException;
 import org.eclipse.jgit.lib.*;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevSort;
@@ -259,8 +260,8 @@ public String getRepoUrl() {
 
 	private File getFileFromRepo(String branchName, String fileRelativePath) {
 		try (IVCSLockedWorkingCopy wc = repo.getVCSLockedWorkingCopy();
-				 Git git = getLocalGit(wc);
-				 Repository gitRepo = git.getRepository()) {
+			 Git git = getLocalGit(wc);
+			 Repository gitRepo = git.getRepository()) {
 
 			checkout(git, gitRepo, branchName);
 
@@ -678,10 +679,16 @@ public List<VCSTag> getTags() {
 	        RevCommit revCommit;
 	        for (Ref ref : tagRefs) {
 	        	ObjectId relatedCommitObjectId = ref.getPeeledObjectId() == null ? ref.getObjectId() : ref.getPeeledObjectId();
-	        	revTag = rw.parseTag(ref.getObjectId());
 	        	revCommit = rw.parseCommit(relatedCommitObjectId);
 	        	VCSCommit relatedCommit = getVCSCommit(revCommit);
-	        	VCSTag tag = new VCSTag(revTag.getTagName(), revTag.getFullMessage(), revTag.getTaggerIdent().getName(), relatedCommit);
+	        	VCSTag tag;
+	        	try {
+	        		revTag = rw.parseTag(ref.getObjectId());
+	        		tag = new VCSTag(revTag.getTagName(), revTag.getFullMessage(), revTag.getTaggerIdent().getName(), relatedCommit);
+	        	} catch (IncorrectObjectTypeException e) {
+	        		// tag is unannonated
+	        		tag = new VCSTag(ref.getName().replace("refs/tags/", ""), null, null, relatedCommit);
+	        	} 
 	        	res.add(tag);
 	        }
 	        return res;

src/test/java/org/scm4j/vcs/GitVCSTest.java

@@ -196,17 +196,17 @@ public void testExceptions() throws Exception {
 	private void testExceptionThrowingNoMock(Exception testException, Method m, Object[] params) throws Exception {
 		try {
 			m.invoke(vcs, params);
-			if (wasGetLocalGitInvoked(vcs)) {
+			if (!m.getName().equals("checkout") && wasGetLocalGitInvoked(vcs)) {
 				fail();
 			}
 		} catch (InvocationTargetException e) {
-			if (wasGetLocalGitInvoked(vcs)) {
+			if (!m.getName().equals("checkout") && wasGetLocalGitInvoked(vcs)) {
 				// InvocationTargetException <- EVCSException <- GitAPIException 
 				assertTrue(e.getCause().getCause().getClass().isAssignableFrom(testException.getClass()));
 				assertTrue(e.getCause().getMessage().contains(testException.getMessage()));
 			}
 		} catch (Exception e) {
-			if (wasGetLocalGitInvoked(vcs)) {
+			if (!m.getName().equals("checkout") && wasGetLocalGitInvoked(vcs)) {
 				fail();
 			}
 		}
@@ -287,6 +287,18 @@ public void testGetLastTagUnannotatedTag() throws Exception {
 		assertEquals(tag.getRelatedCommit(), vcs.getHeadCommit(null));
 	}
 
+	@Test
+	public void testGetTagsUnannotated() throws Exception {
+		createUnannotatedTag(null, TAG_NAME_1);
+		List<VCSTag> tags = vcs.getTags();
+		assertTrue(tags.size() == 1);
+		VCSTag tag = tags.get(0);
+		assertNull(tag.getAuthor());
+		assertNull(tag.getTagMessage());
+		assertEquals(tag.getTagName(), TAG_NAME_1);
+		assertEquals(tag.getRelatedCommit(), vcs.getHeadCommit(null));
+	}
+	
 	public void createUnannotatedTag(String branchName, String tagName) throws Exception {
 		try (IVCSLockedWorkingCopy wc = localVCSRepo.getVCSLockedWorkingCopy();
 			 Git localGit = git.getLocalGit(wc);
@@ -330,5 +342,18 @@ public void testGetLastTagExceptions() throws Exception {
 		Mockito.doThrow(eCommon).when(git).getLocalGit(mockedLWC);
 		testExceptionThrowingNoMock(eCommon, vcs.getClass().getDeclaredMethod("getLastTag"), new Object[0]);
 	}
+	
+	@Test
+	public void testCheckoutExceptions() throws Exception {
+		Exception eCommon = new Exception("test common exception");
+		Mockito.doThrow(eCommon).when(git).getLocalGit((String) null);
+		try {
+			git.checkout(null, null);
+			fail();
+		} catch (RuntimeException e) {
+			assertTrue(e.getCause().getClass().isAssignableFrom(eCommon.getClass()));
+			assertTrue(e.getCause().getMessage().contains(eCommon.getMessage()));
+		}
+	}
 }