Skip to content

Commit 4847a6b

Browse files
committed
testGetTagByNameUnannotated() test added
1 parent fe0fa38 commit 4847a6b

File tree

2 files changed

+22
-3
lines changed

2 files changed

+22
-3
lines changed

src/main/java/org/scm4j/vcs/svn/SVNVCS.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -617,10 +617,10 @@ public VCSTag createTag(String branchName, String tagName, String tagMessage, St
617617

618618
SVNDirEntry entry = repository.info(TAGS_PATH + tagName, -1);
619619

620-
SVNLogEntry copyFromEntry = revToSVNEntry(getBranchName(branchName), Long.parseLong(revisionToTag));
620+
SVNLogEntry copyFromEntry = revToSVNEntry(getBranchName(branchName),
621+
revisionToTag == null ? SVNRevision.HEAD.getNumber() : Long.parseLong(revisionToTag));
621622

622-
VCSTag tag = new VCSTag(tagName, tagMessage, entry.getAuthor(), svnLogEntryToVCSCommit(copyFromEntry));
623-
return tag;
623+
return new VCSTag(tagName, tagMessage, entry.getAuthor(), svnLogEntryToVCSCommit(copyFromEntry));
624624
} catch (SVNException e) {
625625
if (e.getErrorMessage().getErrorCode().getCode() == SVN_ITEM_EXISTS_ERROR_CODE) {
626626
throw new EVCSTagExists(e);

src/test/java/org/scm4j/vcs/svn/SVNVCSTest.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,4 +433,23 @@ public void testListEntriesNone() throws Exception {
433433
doReturn(SVNNodeKind.NONE).when(mockedRepo).checkPath(anyString(), anyLong());
434434
svn.listEntries(null, null, null); // expecting no NPE
435435
}
436+
437+
@Test
438+
public void testGetTagByNameExceptions() throws Exception {
439+
doThrow(testSVNException).when(svn).revToSVNEntry(anyString(), anyLong());
440+
try {
441+
vcs.getTagByName("");
442+
fail();
443+
} catch (EVCSException e) {
444+
checkEVCSException(e);
445+
}
446+
447+
doThrow(testCommonException).when(svn).revToSVNEntry(anyString(), anyLong());
448+
try {
449+
vcs.getTagByName("");
450+
fail();
451+
} catch (RuntimeException e) {
452+
checkCommonException(e);
453+
}
454+
}
436455
}

0 commit comments

Comments
 (0)