Inline AbstractDaemonTest#getRemoteHead

The ProjectOperations API is designed to be readable. It's slightly more
verbose, but looking at the actual call sites, we can live with it.

Change-Id: Iccd122f261f3667d481e70e180215e634d5dfa2a
This commit is contained in:
Dave Borowitz
2019-05-13 11:38:42 +02:00
parent e15c1a6a39
commit edb599b65e
29 changed files with 197 additions and 193 deletions

View File

@@ -60,7 +60,7 @@ public abstract class AbstractPushTag extends AbstractDaemonTest {
// clone with user to avoid inherited tag permissions of admin user
testRepo = cloneProject(project, user);
initialHead = getRemoteHead();
initialHead = projectOperations.project(project).getHead("master");
tagType = getTagType();
}

View File

@@ -127,7 +127,7 @@ public class AccessIT extends AbstractDaemonTest {
@Test
public void addAccessSection() throws Exception {
RevCommit initialHead = getRemoteHead(newProjectName, RefNames.REFS_CONFIG);
RevCommit initialHead = projectOperations.project(newProjectName).getHead(RefNames.REFS_CONFIG);
ProjectAccessInput accessInput = newProjectAccessInput();
AccessSectionInfo accessSectionInfo = createDefaultAccessSectionInfo();
@@ -137,7 +137,7 @@ public class AccessIT extends AbstractDaemonTest {
assertThat(pApi().access().local).isEqualTo(accessInput.add);
RevCommit updatedHead = getRemoteHead(newProjectName, RefNames.REFS_CONFIG);
RevCommit updatedHead = projectOperations.project(newProjectName).getHead(RefNames.REFS_CONFIG);
eventRecorder.assertRefUpdatedEvents(
newProjectName.get(), RefNames.REFS_CONFIG, null, initialHead, initialHead, updatedHead);
}

View File

@@ -44,7 +44,7 @@ public class CheckMergeabilityIT extends AbstractDaemonTest {
@Test
public void checkMergeableCommit() throws Exception {
RevCommit initialHead = getRemoteHead();
RevCommit initialHead = projectOperations.project(project).getHead("master");
testRepo
.branch("HEAD")
.commit()
@@ -79,7 +79,7 @@ public class CheckMergeabilityIT extends AbstractDaemonTest {
@Test
public void checkUnMergeableCommit() throws Exception {
RevCommit initialHead = getRemoteHead();
RevCommit initialHead = projectOperations.project(project).getHead("master");
testRepo
.branch("HEAD")
.commit()
@@ -114,7 +114,7 @@ public class CheckMergeabilityIT extends AbstractDaemonTest {
@Test
public void checkOursMergeStrategy() throws Exception {
RevCommit initialHead = getRemoteHead();
RevCommit initialHead = projectOperations.project(project).getHead("master");
testRepo
.branch("HEAD")
.commit()
@@ -208,7 +208,7 @@ public class CheckMergeabilityIT extends AbstractDaemonTest {
cherry.current().review(ReviewInput.approve());
cherry.current().submit();
ObjectId remoteId = getRemoteHead();
ObjectId remoteId = projectOperations.project(project).getHead("master");
assertThat(remoteId).isNotEqualTo(commitId);
assertContentMerged("master", commitId.getName(), "recursive");
}
@@ -234,7 +234,7 @@ public class CheckMergeabilityIT extends AbstractDaemonTest {
@Test
public void checkInvalidStrategy() throws Exception {
RevCommit initialHead = getRemoteHead();
RevCommit initialHead = projectOperations.project(project).getHead("master");
testRepo
.branch("HEAD")
.commit()

View File

@@ -169,7 +169,7 @@ public class DeleteBranchesIT extends AbstractDaemonTest {
private HashMap<String, RevCommit> initialRevisions(List<String> branches) throws Exception {
HashMap<String, RevCommit> result = new HashMap<>();
for (String branch : branches) {
result.put(branch, getRemoteHead(project, branch));
result.put(branch, projectOperations.project(project).getHead(branch));
}
return result;
}

View File

@@ -120,7 +120,7 @@ public class DeleteTagsIT extends AbstractDaemonTest {
HashMap<String, RevCommit> result = new HashMap<>();
for (String tag : tags) {
String ref = prefixRef(tag);
result.put(ref, getRemoteHead(project, ref));
result.put(ref, projectOperations.project(project).getHead(ref));
}
return result;
}

View File

@@ -69,7 +69,7 @@ public class ListBranchesIT extends AbstractDaemonTest {
public void listBranches() throws Exception {
String master = pushTo("refs/heads/master").getCommit().name();
String dev = pushTo("refs/heads/dev").getCommit().name();
String refsConfig = getRemoteHead(project, RefNames.REFS_CONFIG).name();
String refsConfig = projectOperations.project(project).getHead(RefNames.REFS_CONFIG).name();
assertRefs(
ImmutableList.of(
branch("HEAD", "master", false),
@@ -114,7 +114,10 @@ public class ListBranchesIT extends AbstractDaemonTest {
public void listBranchesUsingPagination() throws Exception {
BranchInfo head = branch("HEAD", "master", false);
BranchInfo refsConfig =
branch(RefNames.REFS_CONFIG, getRemoteHead(project, RefNames.REFS_CONFIG).name(), false);
branch(
RefNames.REFS_CONFIG,
projectOperations.project(project).getHead(RefNames.REFS_CONFIG).name(),
false);
BranchInfo master =
branch("refs/heads/master", pushTo("refs/heads/master").getCommit().getName(), false);
BranchInfo branch1 =