opendev/gerrit
Code Issues Proposed changes

InlineEdit: Add GET /changes/<id>/edit/path%2fto%2ffile REST endpoint

Browse Source 
Add REST endpoint to retrieve file content for change edit.

Change-Id: I7df93398d057eba7d22e65b913ca9d68851ba0c9
This commit is contained in:
David Ostrovsky
2014-08-01 19:43:21 +02:00
parent 2830c29fab
commit fd6c175abe
5 changed files with 95 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/edit/BUCK
View File

@@ -3,5 +3,8 @@ include_defs('//gerrit-acceptance-tests/tests.defs')
acceptance_tests(
srcs = ['ChangeEditIT.java'],
labels = ['edit'],
deps = ['//lib/joda:joda-time'],
deps = [
'//lib/commons:codec',
'//lib/joda:joda-time',
],
)

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

@@ -39,8 +39,8 @@ import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.change.ChangeEdits.Put;
import com.google.gerrit.server.change.ChangeEdits.Post;
import com.google.gerrit.server.change.ChangeEdits.Put;
import com.google.gerrit.server.change.FileContentUtil;
import com.google.gerrit.server.edit.ChangeEdit;
import com.google.gerrit.server.edit.ChangeEditModifier;
@@ -50,6 +50,8 @@ import com.google.gwtorm.server.SchemaFactory;
import com.google.inject.Inject;
import com.google.inject.util.Providers;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.codec.binary.StringUtils;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.lib.RefUpdate;
@@ -428,6 +430,44 @@ public class ChangeEditIT extends AbstractDaemonTest {
edit.get().getRevision().get(), FILE_NAME)));
}
@Test
public void getFileContentRest() throws Exception {
Put.Input in = new Put.Input();
in.content = RestSession.newRawInput(CONTENT_NEW);
assertEquals(SC_NO_CONTENT, session.putRaw(urlEditFile(),
in.content).getStatusCode());
Optional<ChangeEdit> edit = editUtil.byChange(change);
assertEquals(RefUpdate.Result.FORCED,
modifier.modifyFile(
edit.get(),
FILE_NAME,
CONTENT_NEW2));
edit = editUtil.byChange(change);
RestResponse r = session.get(urlEditFile());
assertEquals(SC_OK, r.getStatusCode());
String content = r.getEntityContent();
assertEquals(StringUtils.newStringUtf8(CONTENT_NEW2),
StringUtils.newStringUtf8(Base64.decodeBase64(content)));
}
@Test
public void getFileNotFoundRest() throws Exception {
assertEquals(RefUpdate.Result.NEW,
modifier.createEdit(
change,
ps));
assertEquals(SC_NO_CONTENT, session.delete(urlEditFile()).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) {
}
RestResponse r = session.get(urlEditFile());
assertEquals(SC_NO_CONTENT, r.getStatusCode());
}
@Test
public void addNewFile() throws Exception {
assertEquals(RefUpdate.Result.NEW,