opendev/gerrit
Code Issues Proposed changes

ChangeIT: Add test cases for rebase API with abandoned changes

Browse Source 
Add test cases for:

- rebase a change that is abandoned
- rebase a change onto another change that is abandoned

Change-Id: I971c73c1479155dba2c4d6f327d462c61e922c67
This commit is contained in:
David Pursehouse
2016-02-25 17:20:24 +09:00
parent 36878b75ce
commit 37181a36ec
1 changed files with 46 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java
View File

@@ -438,6 +438,52 @@ public class ChangeIT extends AbstractDaemonTest {
.rebase(ri);
}
@Test
public void rebaseAbandonedChange() throws Exception {
PushOneCommit.Result r = createChange();
String changeId = r.getChangeId();
assertThat(info(changeId).status).isEqualTo(ChangeStatus.NEW);
gApi.changes()
.id(changeId)
.abandon();
ChangeInfo info = get(changeId);
assertThat(info.status).isEqualTo(ChangeStatus.ABANDONED);
exception.expect(ResourceConflictException.class);
exception.expectMessage("change is abandoned");
gApi.changes()
.id(changeId)
.revision(r.getCommit().name())
.rebase();
}
@Test
public void rebaseOntoAbandonedChange() throws Exception {
// Create two changes both with the same parent
PushOneCommit.Result r = createChange();
testRepo.reset("HEAD~1");
PushOneCommit.Result r2 = createChange();
// Abandon the first change
String changeId = r.getChangeId();
assertThat(info(changeId).status).isEqualTo(ChangeStatus.NEW);
gApi.changes()
.id(changeId)
.abandon();
ChangeInfo info = get(changeId);
assertThat(info.status).isEqualTo(ChangeStatus.ABANDONED);
RebaseInput ri = new RebaseInput();
ri.base = r.getCommit().name();
exception.expect(ResourceConflictException.class);
exception.expectMessage("base change is abandoned: " + r.getChangeId());
gApi.changes()
.id(r2.getChangeId())
.revision(r2.getCommit().name())
.rebase(ri);
}
@Test
public void addReviewer() throws Exception {
PushOneCommit.Result r = createChange();