opendev/gerrit
Code Issues Proposed changes

AbstractSubmit: Move getHead(), etc, up to AbstractDaemonTest

Browse Source 
So they can be reused in other tests.

Remove the duplicate getRemoteHead() method from SubmittedTogetherIT.

Change-Id: I583adec549b6a3b46c63cbd78eec362b6d923a19
This commit is contained in:
David Pursehouse
2016-06-21 12:13:11 +09:00
parent dca76072f4
commit 556fefd607
3 changed files with 25 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
View File

@@ -90,9 +90,12 @@ import org.eclipse.jgit.errors.RepositoryNotFoundException;
import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository;
import org.eclipse.jgit.junit.TestRepository;
import org.eclipse.jgit.lib.Config;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.transport.Transport;
import org.junit.After;
import org.junit.AfterClass;
@@ -815,4 +818,26 @@ public abstract class AbstractDaemonTest {
gApi.groups().create(in);
return name;
}
protected RevCommit getHead(Repository repo, String name) throws Exception {
try (RevWalk rw = new RevWalk(repo)) {
return rw.parseCommit(repo.exactRef(name).getObjectId());
}
}
protected RevCommit getHead(Repository repo) throws Exception {
return getHead(repo, "HEAD");
}
protected RevCommit getRemoteHead(Project.NameKey project, String branch)
throws Exception {
try (Repository repo = repoManager.openRepository(project)) {
return getHead(repo,
branch.startsWith(Constants.R_REFS) ? branch : "refs/heads/" + branch);
}
}
protected RevCommit getRemoteHead() throws Exception {
return getRemoteHead(project, "master");
}
}

22
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
View File

@@ -383,22 +383,6 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
assertThat(remoteHead.getShortMessage()).isEqualTo(localHead.getShortMessage());
}
private RevCommit getHead(Repository repo) throws Exception {
return getHead(repo, "HEAD");
}
protected RevCommit getRemoteHead(Project.NameKey project, String branch)
throws Exception {
try (Repository repo = repoManager.openRepository(project)) {
return getHead(repo, "refs/heads/" + branch);
}
}
protected RevCommit getRemoteHead() throws Exception {
return getRemoteHead(project, "master");
}
protected List<RevCommit> getRemoteLog(Project.NameKey project, String branch)
throws Exception {
try (Repository repo = repoManager.openRepository(project);
@@ -413,12 +397,6 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
return getRemoteLog(project, "master");
}
private RevCommit getHead(Repository repo, String name) throws Exception {
try (RevWalk rw = new RevWalk(repo)) {
return rw.parseCommit(repo.exactRef(name).getObjectId());
}
}
private String getLatestDiff(Repository repo) throws Exception {
ObjectId oldTreeId = repo.resolve("HEAD~1^{tree}");
ObjectId newTreeId = repo.resolve("HEAD^{tree}");

9
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/SubmittedTogetherIT.java
View File

@@ -31,9 +31,7 @@ import com.google.gerrit.testutil.ConfigSuite;
import org.eclipse.jgit.junit.TestRepository;
import org.eclipse.jgit.lib.Config;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
import org.junit.Test;
import java.util.EnumSet;
@@ -351,13 +349,6 @@ public class SubmittedTogetherIT extends AbstractDaemonTest {
assertSubmittedTogether(id2, id2, id1);
}
private RevCommit getRemoteHead() throws Exception {
try (Repository repo = repoManager.openRepository(project);
RevWalk rw = new RevWalk(repo)) {
return rw.parseCommit(repo.exactRef("refs/heads/master").getObjectId());
}
}
private String getChangeId(RevCommit c) throws Exception {
return GitUtil.getChangeId(testRepo, c).get();
}