opendev/gerrit
Code Issues Proposed changes

AbstractQueryChangesTest: Factor out a method for adding files

Browse Source 
Change-Id: I72a862546cf3fef55606bd14b0ae23ae9a421ebd
This commit is contained in:
Dave Borowitz
2019-01-11 10:08:59 -08:00
parent 90fa2ceb4b
commit 6205cad8aa
1 changed files with 14 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
View File

@@ -126,6 +126,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.eclipse.jgit.junit.TestRepository; import org.eclipse.jgit.junit.TestRepository;
import org.eclipse.jgit.junit.TestRepository.CommitBuilder;
import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.ObjectInserter; import org.eclipse.jgit.lib.ObjectInserter;
import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.lib.ObjectReader;
@@ -1323,14 +1324,7 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests {
@Test @Test
public void byFileExact() throws Exception { public void byFileExact() throws Exception {
TestRepository<Repo> repo = createProject("repo"); TestRepository<Repo> repo = createProject("repo");
RevCommit commit = Change change = insert(repo, newChangeWithFiles(repo, "dir/file1", "dir/file2"));
repo.parseBody(
repo.commit()
.message("one")
.add("dir/file1", "contents1")
.add("dir/file2", "contents2")
.create());
Change change = insert(repo, newChangeForCommit(repo, commit));
assertQuery("file:file"); assertQuery("file:file");
assertQuery("file:dir", change); assertQuery("file:dir", change);
@@ -1343,14 +1337,7 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests {
@Test @Test
public void byFileRegex() throws Exception { public void byFileRegex() throws Exception {
TestRepository<Repo> repo = createProject("repo"); TestRepository<Repo> repo = createProject("repo");
RevCommit commit = Change change = insert(repo, newChangeWithFiles(repo, "dir/file1", "dir/file2"));
repo.parseBody(
repo.commit()
.message("one")
.add("dir/file1", "contents1")
.add("dir/file2", "contents2")
.create());
Change change = insert(repo, newChangeForCommit(repo, commit));
assertQuery("file:.*file.*"); assertQuery("file:.*file.*");
assertQuery("file:^file.*"); // Whole path only. assertQuery("file:^file.*"); // Whole path only.
@@ -1360,14 +1347,7 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests {
@Test @Test
public void byPathExact() throws Exception { public void byPathExact() throws Exception {
TestRepository<Repo> repo = createProject("repo"); TestRepository<Repo> repo = createProject("repo");
RevCommit commit = Change change = insert(repo, newChangeWithFiles(repo, "dir/file1", "dir/file2"));
repo.parseBody(
repo.commit()
.message("one")
.add("dir/file1", "contents1")
.add("dir/file2", "contents2")
.create());
Change change = insert(repo, newChangeForCommit(repo, commit));
assertQuery("path:file"); assertQuery("path:file");
assertQuery("path:dir"); assertQuery("path:dir");
@@ -1380,14 +1360,7 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests {
@Test @Test
public void byPathRegex() throws Exception { public void byPathRegex() throws Exception {
TestRepository<Repo> repo = createProject("repo"); TestRepository<Repo> repo = createProject("repo");
RevCommit commit = Change change = insert(repo, newChangeWithFiles(repo, "dir/file1", "dir/file2"));
repo.parseBody(
repo.commit()
.message("one")
.add("dir/file1", "contents1")
.add("dir/file2", "contents2")
.create());
Change change = insert(repo, newChangeForCommit(repo, commit));
assertQuery("path:.*file.*"); assertQuery("path:.*file.*");
assertQuery("path:^dir.file.*", change); assertQuery("path:^dir.file.*", change);
@@ -2879,6 +2852,15 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests {
return newChange(repo, commit, null, null, null, false); return newChange(repo, commit, null, null, null, false);
} }
protected ChangeInserter newChangeWithFiles(TestRepository<Repo> repo, String... paths)
throws Exception {
CommitBuilder b = repo.commit().message("Change with files");
for (String path : paths) {
b.add(path, "contents of " + path);
}
return newChangeForCommit(repo, repo.parseBody(b.create()));
}
protected ChangeInserter newChangeForBranch(TestRepository<Repo> repo, String branch) protected ChangeInserter newChangeForBranch(TestRepository<Repo> repo, String branch)
throws Exception { throws Exception {
return newChange(repo, null, branch, null, null, false); return newChange(repo, null, branch, null, null, false);