getCommitMessages() -> log()

Author: host6

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

@@ -458,17 +458,18 @@ public int compare(SVNDirEntry o1, SVNDirEntry o2) {
 			}
 		}
 	}
-
+	
 	@Override
-	public List<String> getCommitMessages(String branchName, Integer limit) {
-		final List<String> res = new ArrayList<>();
+	public List<VCSCommit> log(String branchName, int limit) {
+		final List<VCSCommit> res = new ArrayList<>();
 		try {
+			getBranchUrl(branchName); // for exception test only
 			repository.log(new String[] { getBranchName(branchName) }, 
 					-1L /* start from head descending */, 
 					0L, true, true, limit, new ISVNLogEntryHandler() {
 				@Override
 				public void handleLogEntry(SVNLogEntry logEntry) throws SVNException {
-					res.add(logEntry.getMessage());
+					res.add(svnLogEntryToVCSCommit(logEntry));
 				}
 			});
 			return res;
@@ -518,8 +519,7 @@ public List<VCSCommit> getCommitsRange(String branchName, String firstCommitId,
 					new ISVNLogEntryHandler() {
 				@Override
 				public void handleLogEntry(SVNLogEntry logEntry) throws SVNException {
-					VCSCommit commit = new VCSCommit(Long.toString(logEntry.getRevision()), logEntry.getMessage(),
-							logEntry.getAuthor());
+					VCSCommit commit = svnLogEntryToVCSCommit(logEntry);
 					res.add(commit);
 				}
 			});
@@ -530,6 +530,11 @@ public void handleLogEntry(SVNLogEntry logEntry) throws SVNException {
 			throw new RuntimeException(e);
 		}
 	}
+	
+	private VCSCommit svnLogEntryToVCSCommit(SVNLogEntry logEntry) {
+		return new VCSCommit(Long.toString(logEntry.getRevision()), logEntry.getMessage(),
+				logEntry.getAuthor());
+	}
 
 	@Override
 	public List<VCSCommit> getCommitsRange(String branchName, String firstCommitId, String untilCommitId) {
@@ -543,9 +548,7 @@ public List<VCSCommit> getCommitsRange(String branchName, String firstCommitId,
 					new ISVNLogEntryHandler() {
 				@Override
 				public void handleLogEntry(SVNLogEntry logEntry) throws SVNException {
-					VCSCommit commit = new VCSCommit(Long.toString(logEntry.getRevision()), logEntry.getMessage(),
-							logEntry.getAuthor());
-					res.add(commit);
+					res.add(svnLogEntryToVCSCommit(logEntry));
 				}
 			});
 			return res;
@@ -566,8 +569,7 @@ public VCSCommit getHeadCommit(String branchName) {
 		try {
 			SVNLogEntry entry = revToSVNEntry(getBranchName(branchName), -1L);
 			if (entry != null) {
-				return new VCSCommit(Long.toString(entry.getRevision()), entry.getMessage(),
-						entry.getAuthor());
+				return svnLogEntryToVCSCommit(entry);
 			}
 			return null;
 		} catch (SVNException e) {
@@ -688,8 +690,7 @@ public VCSTag getLastTag() {
 				tagName = name.replace("/" + TAGS_PATH, "") ;
 			}
 
-			return new VCSTag(tagName, entry.getMessage(), entry.getAuthor(), new VCSCommit(Long.toString(copyFromEntry.getRevision()),
-					copyFromEntry.getMessage(), copyFromEntry.getAuthor()));
+			return new VCSTag(tagName, entry.getMessage(), entry.getAuthor(), svnLogEntryToVCSCommit(copyFromEntry));
 		} catch (SVNException e) {
 			throw new EVCSException(e);
 		} catch (Exception e) {

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

@@ -158,7 +158,7 @@ private void testExceptionThrowing(Exception testException, Method m, Object[] p
 		doThrow(testException).when(svn).getBranchFirstCommit(null);
 		doThrow(testException).when(svn).revToSVNEntry(anyString(), any(Long.class));
 		try {
-			m.invoke(vcs, params);
+			m.invoke(vcs, params); 
 			if (wasMockedMethodInvoked()) {
 				fail();
 			}
@@ -325,20 +325,6 @@ public void testAddTrunkIfExistsExceptions() throws Exception {
 		}
 	}
 
-	@Test
-	public void testGetCommitMessagesExceptions() throws Exception {
-		SVNRepository mockedRepo = spy(svn.getSVNRepository());
-		svn.setSVNRepository(mockedRepo);
-		doThrow(testSVNException).when(mockedRepo).log(any(String[].class), anyLong(), anyLong(), anyBoolean(), anyBoolean(),
-				any(Integer.class), any(ISVNLogEntryHandler.class));
-		try {
-			vcs.getCommitMessages(null, 0);
-			fail();
-		} catch (EVCSException e) {
-			checkEVCSException(e);
-		}
-	}
-
 	private void checkEVCSException(EVCSException e) {
 		assertTrue(e.getCause() instanceof SVNException);
 		assertTrue(e.getCause().getMessage().contains(testSVNException.getMessage()));