opendev/gerrit
Code Issues Proposed changes

InlineEdit: Add DELETE /changes/<id>/edit REST endpoint

Browse Source 
Add REST endpoint to delete a file in change edit or change edit itself.

Change-Id: Ieeb15d0a91ab678f53db367bacd231314c1cf0be
This commit is contained in:
David Ostrovsky
2014-08-10 00:36:31 +02:00
parent 46999d2aa1
commit 8e75f5070e
4 changed files with 126 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/edit/ChangeEditIT.java
View File

@@ -17,6 +17,7 @@ package com.google.gerrit.acceptance.edit;
import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.apache.http.HttpStatus.SC_BAD_REQUEST;
import static org.apache.http.HttpStatus.SC_NO_CONTENT;
import static org.apache.http.HttpStatus.SC_OK;
import static org.junit.Assert.assertArrayEquals;
@@ -188,6 +189,24 @@ public class ChangeEditIT extends AbstractDaemonTest {
assertFalse(oldCurrentPatchSet.getId().equals(newCurrentPatchSet.getId()));
}
@Test
public void deleteEditRest() throws Exception {
assertEquals(RefUpdate.Result.NEW,
modifier.createEdit(
change,
ps));
assertEquals(RefUpdate.Result.FORCED,
modifier.modifyFile(
editUtil.byChange(change).get(),
FILE_NAME,
CONTENT_NEW));
Optional<ChangeEdit> edit = editUtil.byChange(change);
RestResponse r = session.delete(urlEdit());
assertEquals(SC_NO_CONTENT, r.getStatusCode());
edit = editUtil.byChange(change);
assertFalse(edit.isPresent());
}
@Test
public void rebaseEdit() throws Exception {
assertEquals(RefUpdate.Result.NEW,
@@ -316,6 +335,25 @@ public class ChangeEditIT extends AbstractDaemonTest {
}
}
@Test
public void createEditByDeletingExistingFileRest() throws Exception {
RestResponse r = session.delete(urlEditFile());
assertEquals(SC_NO_CONTENT, r.getStatusCode());
Optional<ChangeEdit> edit = editUtil.byChange(change);
try {
fileUtil.getContent(edit.get().getChange().getProject(),
edit.get().getRevision().get(), FILE_NAME);
fail("ResourceNotFoundException expected");
} catch (ResourceNotFoundException rnfe) {
}
}
@Test
public void deletingNonExistingEditRest() throws Exception {
RestResponse r = session.delete(urlEdit());
assertEquals(SC_BAD_REQUEST, r.getStatusCode());
}
@Test
public void deleteExistingFileRest() throws Exception {
assertEquals(RefUpdate.Result.NEW,