getTagsOnRevision() fixed

getBranches() fixed

Author: host6

build.gradle

@@ -48,12 +48,10 @@ dependencies {
 		add(configuration ?: name.contains('test') ? 'testCompile' : 'compile', "$group:$name:${version?:''}${classifier?:''}${ext?:''}")
 	}
 
-	//compile 'com.github.scm4j:scm4j-vcs-api:master-SNAPSHOT'
 	compile 'org.tmatesoft.svnkit:svnkit:1.8.14'
 	compile 'org.apache.commons:commons-lang3:3.5'
 
 	testCompile 'junit:junit:4.12'
-	//testCompile 'com.github.scm4j:scm4j-vcs-test:master-SNAPSHOT'
 	testCompile 'org.mockito:mockito-core:2.0.62-beta'
 }
 

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

@@ -9,6 +9,7 @@
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
@@ -451,7 +452,7 @@ public List<VCSDiffEntry> getBranchesDiff(final String srcBranchName, final Stri
 	@Override
 	public Set<String> getBranches(String path) {
 		try {
-			List<String> entries = listEntries(SVNVCS.BRANCHES_PATH, path == null ? "" : path);
+			List<String> entries = listEntries(SVNVCS.BRANCHES_PATH + (path == null ? "" : path));
 			Set<String> tempRes = new HashSet<>(entries);
 			if (repository.checkPath(MASTER_PATH, -1) == SVNNodeKind.DIR) {
 				if (path == null || MASTER_PATH.startsWith(path) ) {
@@ -470,15 +471,15 @@ public Set<String> getBranches(String path) {
 		}
 	}
 
-	protected List<String> listEntries(String path, String subdirStartsWith) throws Exception {
+	protected List<String> listEntries(String path) throws Exception {
 		List<String> res = new ArrayList<>();
-		if (repository.checkPath(path ,  -1) == SVNNodeKind.NONE) {
+		if (repository.checkPath(path , -1) == SVNNodeKind.NONE) {
 			return res;
 		}
 		@SuppressWarnings("unchecked")
-		Collection<SVNDirEntry> subEntries = repository.getDir(path, -1, null, (Collection<SVNDirEntry>) null);
-		List<SVNDirEntry> list = new ArrayList<>(subEntries);
-		Collections.sort(list, new Comparator<SVNDirEntry>() {
+		Collection<SVNDirEntry> entries = repository.getDir(path, -1 , null , (Collection<SVNDirEntry>) null);
+		List<SVNDirEntry> entriesList = new ArrayList<>(entries);
+		Collections.sort(entriesList, new Comparator<SVNDirEntry>() {
 			@Override
 			public int compare(SVNDirEntry o1, SVNDirEntry o2) {
 				if (o1.getRevision() < o2.getRevision()) {
@@ -490,11 +491,16 @@ public int compare(SVNDirEntry o1, SVNDirEntry o2) {
 				return 0;
 			}
 		});
-		for (SVNDirEntry entry : list) {
-			if (entry.getKind() == SVNNodeKind.DIR && entry.getName().startsWith(subdirStartsWith)) {
-				res.add(path + entry.getName());
+		Iterator<SVNDirEntry> entriesIterator = entriesList.iterator();
+		while (entriesIterator.hasNext()) {
+			SVNDirEntry entry = (SVNDirEntry) entriesIterator.next();
+			
+			if (entry.getKind() == SVNNodeKind.DIR) {
+				res.add((path.isEmpty() ? "" : StringUtils.appendIfMissing(path, "/")) + entry.getName());
+				res.addAll(listEntries((path.equals("")) ? entry.getName( ) : path + entry.getName()));
 			}
 		}
+		
 		return res;
 	}
 
@@ -693,7 +699,7 @@ public void handleLogEntry(SVNLogEntry logEntry) throws SVNException {
 	@Override
 	public List<VCSTag> getTags() {
 		try {
-			List<String> entries = listEntries(TAGS_PATH, "");
+			List<String> entries = listEntries(TAGS_PATH);
 
 			List<VCSTag> res = new ArrayList<>();
 			SVNTagBaseCommit handler;
@@ -748,8 +754,19 @@ public void checkout(String branchName, String targetPath, String revision) {
 	@Override
 	public List<VCSTag> getTagsOnRevision(String revision) {
 		try {
-			List<String> tagEntries = listEntries(TAGS_PATH, "");
 			List<VCSTag> res = new ArrayList<>();
+			if (repository.checkPath(TAGS_PATH , -1) == SVNNodeKind.NONE) {
+				return res;
+			}
+			List<String> tagEntries = new ArrayList<>();
+			@SuppressWarnings("unchecked")
+			Collection<SVNDirEntry> entries = repository.getDir(TAGS_PATH, -1 , null , (Collection<SVNDirEntry>) null);
+			for (SVNDirEntry entry : entries) {
+				if (entry.getKind() == SVNNodeKind.DIR) {
+					tagEntries.add(TAGS_PATH + entry.getName());
+				}
+			}
+			
 			SVNTagBaseCommit handler;
 			for (String tagEntryStr : tagEntries) {
 

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

@@ -175,7 +175,7 @@ private void testExceptionThrowing(Exception testException, Method m, Object[] p
 		reset(svn);
 		doThrow(testException).when(svn).checkout(any(SVNURL.class), any(File.class), (String) isNull());
 		doThrow(testException).when(svn).getBranchUrl(null);
-		doThrow(testException).when(svn).listEntries(anyString(), anyString());
+		doThrow(testException).when(svn).listEntries(anyString());
 		doThrow(testException).when(svn).getBranchFirstCommit(null);
 		doThrow(testException).when(svn).revToSVNEntry(anyString(), any(Long.class));
 		try {
@@ -207,7 +207,7 @@ private boolean wasMockedMethodInvoked() throws Exception {
 		} catch (WantedButNotInvoked e1) {
 		}
 		try {
-			verify(svn).listEntries(anyString(), anyString());
+			verify(svn).listEntries(anyString());
 			return true;
 		} catch (WantedButNotInvoked e1) {
 		}
@@ -401,12 +401,12 @@ public void testListEntriesSorting() throws Exception {
 		doReturn(Arrays.asList(entry1, entry2)).when(mockedRepo).getDir(anyString(), anyLong(), any(SVNProperties.class),
 				Matchers.<Collection<SVNDirEntry>>any());
 
-		List<String> entries = svn.listEntries("", "");
+		List<String> entries = svn.listEntries("");
 		assertEquals(entries.get(0), entry1.getName());
 		assertEquals(entries.get(1), entry2.getName());
 		doReturn(Arrays.asList(entry1, entry1)).when(mockedRepo).getDir(anyString(), anyLong(), any(SVNProperties.class),
 				Matchers.<Collection<SVNDirEntry>>any());
-		entries = svn.listEntries("", "");
+		entries = svn.listEntries("");
 		assertEquals(entries.get(0), entry1.getName());
 		assertEquals(entries.get(1), entry1.getName());
 	}
@@ -436,6 +436,36 @@ public void testListEntriesNone() throws Exception {
 		SVNRepository mockedRepo = spy(svn.getSVNRepository());
 		svn.setSVNRepository(mockedRepo);
 		doReturn(SVNNodeKind.NONE).when(mockedRepo).checkPath((String) isNull(), anyLong());
-		svn.listEntries(null, null); // expecting no NPE 
+		svn.listEntries(null); // expecting no NPE 
+	}
+	
+	@Test
+	public void testGetTagsOnRevisionNoTagsDir() throws SVNException {
+		svn.getClientManager()
+				.getCommitClient()
+				.doDelete(new SVNURL[] { SVNURL.parseURIEncoded(svn.getRepoUrl() + "/" + SVNVCS.TAGS_PATH)}, "tags/ deleted");
+		assertTrue(vcs.getTagsOnRevision("0").isEmpty());
+	}
+	
+	@Test
+	public void testGetTagsOnRevisionExceptions() throws Exception {
+		SVNRepository mockedRepo = spy(svn.getSVNRepository());
+		svn.setSVNRepository(mockedRepo);
+		vcs.createTag(null, TAG_NAME_1, TAG_MESSAGE_1, null);
+		doThrow(testCommonException).when(svn).revToSVNEntry(anyString(), anyLong());
+		try {
+			vcs.getTagsOnRevision("");
+			fail();
+		} catch (RuntimeException e) {
+			checkCommonException(e);
+		}
+		
+		doThrow(testSVNException).when(mockedRepo).checkPath(anyString(), anyLong());
+		try {
+			vcs.getTagsOnRevision("");
+			fail();
+		} catch (EVCSException e) {
+			checkEVCSException(e);
+		}
 	}
 }