opendev/gerrit
Code Issues Proposed changes

Merge "Get rid of AbstractDaemonTest#getRemoteHead(String project, String branch)"

Browse Source
This commit is contained in:
Alice Kober-Sotzek
2018-12-13 13:55:25 +00:00
committed by Gerrit Code Review
parent 591a3e293a d8ec49643c
commit e4054b6e8c
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/com/google/gerrit/acceptance/AbstractDaemonTest.java
View File

@@ -1183,11 +1183,6 @@ public abstract class AbstractDaemonTest {
}
}
@Nullable
protected RevCommit getRemoteHead(String project, String branch) throws Exception {
return getRemoteHead(new Project.NameKey(project), branch);
}
@Nullable
protected RevCommit getRemoteHead() throws Exception {
return getRemoteHead(project, "master");

6
javatests/com/google/gerrit/acceptance/api/project/ProjectIT.java
View File

@@ -32,6 +32,7 @@ import com.google.gerrit.acceptance.GitUtil;
import com.google.gerrit.acceptance.NoHttpd;
import com.google.gerrit.acceptance.PushOneCommit;
import com.google.gerrit.acceptance.testsuite.project.ProjectOperations;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.common.data.Permission;
import com.google.gerrit.extensions.api.projects.BranchInput;
import com.google.gerrit.extensions.api.projects.CommentLinkInfo;
@@ -715,4 +716,9 @@ public class ProjectIT extends AbstractDaemonTest {
clear();
}
}
@Nullable
protected RevCommit getRemoteHead(String project, String branch) throws Exception {
return getRemoteHead(new Project.NameKey(project), branch);
}
}

4
javatests/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsWholeTopicMergeIT.java
View File

@@ -839,13 +839,13 @@ public class SubmoduleSubscriptionsWholeTopicMergeIT extends AbstractSubmoduleSu
sub1.git().fetch().call();
RevWalk rw1 = sub1.getRevWalk();
RevCommit master1 = rw1.parseCommit(getRemoteHead(subKey1.get(), "master"));
RevCommit master1 = rw1.parseCommit(getRemoteHead(subKey1, "master"));
RevCommit change1Ps = parseCurrentRevision(rw1, changeId1);
assertThat(rw1.isMergedInto(change1Ps, master1)).isTrue();
sub2.git().fetch().call();
RevWalk rw2 = sub2.getRevWalk();
RevCommit master2 = rw2.parseCommit(getRemoteHead(subKey2.get(), "master"));
RevCommit master2 = rw2.parseCommit(getRemoteHead(subKey2, "master"));
RevCommit change2Ps = parseCurrentRevision(rw2, changeId2);
assertThat(rw2.isMergedInto(change2Ps, master2)).isTrue();