Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 00:15:44 +01:00
Code Issues Packages Projects Releases Activity

Fix offset in recursion

Browse Source
This commit is contained in:
René Pfeuffer
2020-02-26 11:10:01 +01:00
parent 67192a203e
commit 4e7381b98f
2 changed files with 73 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBrowseCommand.java
View File

@@ -269,13 +269,13 @@ public class GitBrowseCommand extends AbstractGitCommand
TreeEntry entry = entryIterator.next(); TreeEntry entry = entryIterator.next();
FileObject fileObject = createFileObject(repo, request, revId, entry); FileObject fileObject = createFileObject(repo, request, revId, entry);
if (resultCount > request.getOffset()) {
files.add(fileObject);
}
if (request.isRecursive() && fileObject.isDirectory()) { if (request.isRecursive() && fileObject.isDirectory()) {
convertToFileObject(fileObject, repo, request, revId, entry.getChildren()); convertToFileObject(fileObject, repo, request, revId, entry.getChildren());
} }
if (resultCount > request.getOffset()) {
files.add(fileObject);
}
} }
parent.setChildren(files); parent.setChildren(files);

69
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBrowseCommandTest.java
View File

@@ -268,6 +268,75 @@ public class GitBrowseCommandTest extends AbstractGitCommandTestBase {
assertFalse(root.isTruncated()); assertFalse(root.isTruncated());
} }
@Test
public void testRecursiveLimit() throws IOException {
BrowseCommandRequest request = new BrowseCommandRequest();
request.setLimit(4);
request.setRecursive(true);
FileObject root = createCommand().getBrowserResult(request).getFile();
Collection<FileObject> foList = root.getChildren();
assertThat(foList)
.extracting("name")
.containsExactly("c", "a.txt");
FileObject c = findFile(foList, "c");
Collection<FileObject> cChildren = c.getChildren();
assertThat(cChildren)
.extracting("name")
.containsExactly("d.txt", "e.txt");
}
@Test
public void testRecursiveLimitInSubDir() throws IOException {
BrowseCommandRequest request = new BrowseCommandRequest();
request.setLimit(2);
request.setRecursive(true);
FileObject root = createCommand().getBrowserResult(request).getFile();
Collection<FileObject> foList = root.getChildren();
assertThat(foList)
.extracting("name")
.containsExactly("c");
FileObject c = findFile(foList, "c");
Collection<FileObject> cChildren = c.getChildren();
assertThat(cChildren)
.extracting("name")
.containsExactly("d.txt");
}
@Test
public void testRecursiveOffset() throws IOException {
BrowseCommandRequest request = new BrowseCommandRequest();
request.setOffset(2);
request.setRecursive(true);
FileObject root = createCommand().getBrowserResult(request).getFile();
Collection<FileObject> foList = root.getChildren();
assertThat(foList)
.extracting("name")
.containsExactly("c", "a.txt", "b.txt", "f.txt");
FileObject c = findFile(foList, "c");
Collection<FileObject> cChildren = c.getChildren();
assertThat(cChildren)
.extracting("name")
.containsExactly("e.txt");
}
private FileObject findFile(Collection<FileObject> foList, String name) { private FileObject findFile(Collection<FileObject> foList, String name) {
return foList.stream() return foList.stream()
.filter(f -> name.equals(f.getName())) .filter(f -> name.equals(f.getName()))