| // Copyright (C) 2014 The Android Open Source Project |
| // |
| // Licensed under the Apache License, Version 2.0 (the "License"); |
| // you may not use this file except in compliance with the License. |
| // You may obtain a copy of the License at |
| // |
| // http://www.apache.org/licenses/LICENSE-2.0 |
| // |
| // Unless required by applicable law or agreed to in writing, software |
| // distributed under the License is distributed on an "AS IS" BASIS, |
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| // See the License for the specific language governing permissions and |
| // limitations under the License. |
| |
| package com.google.gerrit.acceptance.edit; |
| |
| import static com.google.common.collect.Iterables.getOnlyElement; |
| import static com.google.common.truth.Truth.assertThat; |
| import static com.google.gerrit.extensions.common.EditInfoSubject.assertThat; |
| import static com.google.gerrit.extensions.restapi.BinaryResultSubject.assertThat; |
| import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS; |
| import static java.nio.charset.StandardCharsets.UTF_8; |
| import static java.util.concurrent.TimeUnit.SECONDS; |
| import static java.util.stream.Collectors.toList; |
| |
| import com.google.common.collect.ImmutableList; |
| import com.google.common.collect.ImmutableMap; |
| import com.google.gerrit.acceptance.AbstractDaemonTest; |
| import com.google.gerrit.acceptance.PushOneCommit; |
| import com.google.gerrit.acceptance.RestResponse; |
| import com.google.gerrit.acceptance.TestProjectInput; |
| import com.google.gerrit.common.RawInputUtil; |
| import com.google.gerrit.common.data.LabelType; |
| import com.google.gerrit.common.data.Permission; |
| import com.google.gerrit.extensions.api.changes.AddReviewerInput; |
| import com.google.gerrit.extensions.api.changes.NotifyHandling; |
| import com.google.gerrit.extensions.api.changes.PublishChangeEditInput; |
| import com.google.gerrit.extensions.api.changes.ReviewInput; |
| import com.google.gerrit.extensions.client.InheritableBoolean; |
| import com.google.gerrit.extensions.client.ListChangesOption; |
| import com.google.gerrit.extensions.common.ApprovalInfo; |
| import com.google.gerrit.extensions.common.ChangeInfo; |
| import com.google.gerrit.extensions.common.DiffInfo; |
| import com.google.gerrit.extensions.common.EditInfo; |
| import com.google.gerrit.extensions.common.FileInfo; |
| import com.google.gerrit.extensions.restapi.AuthException; |
| import com.google.gerrit.extensions.restapi.BinaryResult; |
| import com.google.gerrit.extensions.restapi.ResourceConflictException; |
| import com.google.gerrit.reviewdb.client.Patch; |
| import com.google.gerrit.reviewdb.client.PatchSet; |
| import com.google.gerrit.reviewdb.client.Project; |
| import com.google.gerrit.reviewdb.server.ReviewDb; |
| import com.google.gerrit.server.change.ChangeEdits.EditMessage; |
| import com.google.gerrit.server.change.ChangeEdits.Post; |
| import com.google.gerrit.server.change.ChangeEdits.Put; |
| import com.google.gerrit.server.git.ProjectConfig; |
| import com.google.gerrit.server.project.Util; |
| import com.google.gerrit.testutil.TestTimeUtil; |
| import com.google.gson.reflect.TypeToken; |
| import com.google.gson.stream.JsonReader; |
| import com.google.gwtorm.server.SchemaFactory; |
| import com.google.inject.Inject; |
| import java.io.IOException; |
| import java.sql.Timestamp; |
| import java.util.List; |
| import java.util.Map; |
| import java.util.Optional; |
| import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository; |
| import org.eclipse.jgit.junit.TestRepository; |
| import org.eclipse.jgit.lib.ObjectId; |
| import org.eclipse.jgit.lib.PersonIdent; |
| import org.eclipse.jgit.lib.Repository; |
| import org.eclipse.jgit.revwalk.RevCommit; |
| import org.eclipse.jgit.revwalk.RevWalk; |
| import org.junit.After; |
| import org.junit.AfterClass; |
| import org.junit.Before; |
| import org.junit.BeforeClass; |
| import org.junit.Test; |
| |
| public class ChangeEditIT extends AbstractDaemonTest { |
| |
| private static final String FILE_NAME = "foo"; |
| private static final String FILE_NAME2 = "foo2"; |
| private static final String FILE_NAME3 = "foo3"; |
| private static final byte[] CONTENT_OLD = "bar".getBytes(UTF_8); |
| private static final byte[] CONTENT_NEW = "baz".getBytes(UTF_8); |
| private static final String CONTENT_NEW2_STR = "quxÄÜÖßµ"; |
| private static final byte[] CONTENT_NEW2 = CONTENT_NEW2_STR.getBytes(UTF_8); |
| |
| @Inject private SchemaFactory<ReviewDb> reviewDbProvider; |
| |
| private String changeId; |
| private String changeId2; |
| private PatchSet ps; |
| |
| @BeforeClass |
| public static void setTimeForTesting() { |
| TestTimeUtil.resetWithClockStep(1, SECONDS); |
| } |
| |
| @AfterClass |
| public static void restoreTime() { |
| TestTimeUtil.useSystemTime(); |
| } |
| |
| @Before |
| public void setUp() throws Exception { |
| db = reviewDbProvider.open(); |
| changeId = newChange(admin.getIdent()); |
| ps = getCurrentPatchSet(changeId); |
| assertThat(ps).isNotNull(); |
| amendChange(admin.getIdent(), changeId); |
| changeId2 = newChange2(admin.getIdent()); |
| } |
| |
| @After |
| public void cleanup() { |
| db.close(); |
| } |
| |
| @Test |
| public void parseEditRevision() throws Exception { |
| createArbitraryEditFor(changeId); |
| |
| // check that '0' is parsed as edit revision |
| gApi.changes().id(changeId).revision(0).comments(); |
| |
| // check that 'edit' is parsed as edit revision |
| gApi.changes().id(changeId).revision("edit").comments(); |
| } |
| |
| @Test |
| public void deleteEditOfCurrentPatchSet() throws Exception { |
| createArbitraryEditFor(changeId); |
| gApi.changes().id(changeId).edit().delete(); |
| assertThat(getEdit(changeId)).isAbsent(); |
| } |
| |
| @Test |
| public void deleteEditOfOlderPatchSet() throws Exception { |
| createArbitraryEditFor(changeId2); |
| amendChange(admin.getIdent(), changeId2); |
| |
| gApi.changes().id(changeId2).edit().delete(); |
| assertThat(getEdit(changeId2)).isAbsent(); |
| } |
| |
| @Test |
| public void publishEdit() throws Exception { |
| createArbitraryEditFor(changeId); |
| |
| PublishChangeEditInput publishInput = new PublishChangeEditInput(); |
| publishInput.notify = NotifyHandling.NONE; |
| gApi.changes().id(changeId).edit().publish(publishInput); |
| |
| assertThat(getEdit(changeId)).isAbsent(); |
| assertChangeMessages( |
| changeId, |
| ImmutableList.of( |
| "Uploaded patch set 1.", |
| "Uploaded patch set 2.", |
| "Patch Set 3: Published edit on patch set 2.")); |
| } |
| |
| @Test |
| public void publishEditRest() throws Exception { |
| PatchSet oldCurrentPatchSet = getCurrentPatchSet(changeId); |
| createArbitraryEditFor(changeId); |
| |
| adminRestSession.post(urlPublish(changeId)).assertNoContent(); |
| assertThat(getEdit(changeId)).isAbsent(); |
| PatchSet newCurrentPatchSet = getCurrentPatchSet(changeId); |
| assertThat(newCurrentPatchSet.getId()).isNotEqualTo(oldCurrentPatchSet.getId()); |
| assertChangeMessages( |
| changeId, |
| ImmutableList.of( |
| "Uploaded patch set 1.", |
| "Uploaded patch set 2.", |
| "Patch Set 3: Published edit on patch set 2.")); |
| } |
| |
| @Test |
| public void publishEditNotifyRest() throws Exception { |
| AddReviewerInput in = new AddReviewerInput(); |
| in.reviewer = user.email; |
| gApi.changes().id(changeId).addReviewer(in); |
| |
| createArbitraryEditFor(changeId); |
| |
| sender.clear(); |
| PublishChangeEditInput input = new PublishChangeEditInput(); |
| input.notify = NotifyHandling.NONE; |
| adminRestSession.post(urlPublish(changeId), input).assertNoContent(); |
| assertThat(sender.getMessages()).isEmpty(); |
| } |
| |
| @Test |
| public void publishEditWithDefaultNotify() throws Exception { |
| AddReviewerInput in = new AddReviewerInput(); |
| in.reviewer = user.email; |
| gApi.changes().id(changeId).addReviewer(in); |
| |
| createArbitraryEditFor(changeId); |
| |
| sender.clear(); |
| gApi.changes().id(changeId).edit().publish(); |
| assertThat(sender.getMessages()).isNotEmpty(); |
| } |
| |
| @Test |
| public void deleteEditRest() throws Exception { |
| createArbitraryEditFor(changeId); |
| adminRestSession.delete(urlEdit(changeId)).assertNoContent(); |
| assertThat(getEdit(changeId)).isAbsent(); |
| } |
| |
| @Test |
| public void publishEditRestWithoutCLA() throws Exception { |
| createArbitraryEditFor(changeId); |
| setUseContributorAgreements(InheritableBoolean.TRUE); |
| adminRestSession.post(urlPublish(changeId)).assertForbidden(); |
| setUseContributorAgreements(InheritableBoolean.FALSE); |
| adminRestSession.post(urlPublish(changeId)).assertNoContent(); |
| } |
| |
| @Test |
| public void rebaseEdit() throws Exception { |
| PatchSet previousPatchSet = getCurrentPatchSet(changeId2); |
| createEmptyEditFor(changeId2); |
| gApi.changes().id(changeId2).edit().modifyFile(FILE_NAME, RawInputUtil.create(CONTENT_NEW)); |
| amendChange(admin.getIdent(), changeId2); |
| PatchSet currentPatchSet = getCurrentPatchSet(changeId2); |
| |
| Optional<EditInfo> originalEdit = getEdit(changeId2); |
| assertThat(originalEdit).value().baseRevision().isEqualTo(previousPatchSet.getRevision().get()); |
| Timestamp beforeRebase = originalEdit.get().commit.committer.date; |
| gApi.changes().id(changeId2).edit().rebase(); |
| ensureSameBytes(getFileContentOfEdit(changeId2, FILE_NAME), CONTENT_NEW); |
| ensureSameBytes(getFileContentOfEdit(changeId2, FILE_NAME2), CONTENT_NEW2); |
| Optional<EditInfo> rebasedEdit = getEdit(changeId2); |
| assertThat(rebasedEdit).value().baseRevision().isEqualTo(currentPatchSet.getRevision().get()); |
| assertThat(rebasedEdit).value().commit().committer().creationDate().isNotEqualTo(beforeRebase); |
| } |
| |
| @Test |
| public void rebaseEditRest() throws Exception { |
| PatchSet previousPatchSet = getCurrentPatchSet(changeId2); |
| createEmptyEditFor(changeId2); |
| gApi.changes().id(changeId2).edit().modifyFile(FILE_NAME, RawInputUtil.create(CONTENT_NEW)); |
| amendChange(admin.getIdent(), changeId2); |
| PatchSet currentPatchSet = getCurrentPatchSet(changeId2); |
| |
| Optional<EditInfo> originalEdit = getEdit(changeId2); |
| assertThat(originalEdit).value().baseRevision().isEqualTo(previousPatchSet.getRevision().get()); |
| Timestamp beforeRebase = originalEdit.get().commit.committer.date; |
| adminRestSession.post(urlRebase(changeId2)).assertNoContent(); |
| ensureSameBytes(getFileContentOfEdit(changeId2, FILE_NAME), CONTENT_NEW); |
| ensureSameBytes(getFileContentOfEdit(changeId2, FILE_NAME2), CONTENT_NEW2); |
| Optional<EditInfo> rebasedEdit = getEdit(changeId2); |
| assertThat(rebasedEdit).value().baseRevision().isEqualTo(currentPatchSet.getRevision().get()); |
| assertThat(rebasedEdit).value().commit().committer().creationDate().isNotEqualTo(beforeRebase); |
| } |
| |
| @Test |
| public void rebaseEditWithConflictsRest_Conflict() throws Exception { |
| PatchSet currentPatchSet = getCurrentPatchSet(changeId2); |
| createEmptyEditFor(changeId2); |
| gApi.changes().id(changeId2).edit().modifyFile(FILE_NAME, RawInputUtil.create(CONTENT_NEW)); |
| Optional<EditInfo> edit = getEdit(changeId2); |
| assertThat(edit).value().baseRevision().isEqualTo(currentPatchSet.getRevision().get()); |
| PushOneCommit push = |
| pushFactory.create( |
| db, |
| admin.getIdent(), |
| testRepo, |
| PushOneCommit.SUBJECT, |
| FILE_NAME, |
| new String(CONTENT_NEW2, UTF_8), |
| changeId2); |
| push.to("refs/for/master").assertOkStatus(); |
| adminRestSession.post(urlRebase(changeId2)).assertConflict(); |
| } |
| |
| @Test |
| public void updateExistingFile() throws Exception { |
| createEmptyEditFor(changeId); |
| gApi.changes().id(changeId).edit().modifyFile(FILE_NAME, RawInputUtil.create(CONTENT_NEW)); |
| assertThat(getEdit(changeId)).isPresent(); |
| ensureSameBytes(getFileContentOfEdit(changeId, FILE_NAME), CONTENT_NEW); |
| ensureSameBytes(getFileContentOfEdit(changeId, FILE_NAME), CONTENT_NEW); |
| } |
| |
| @Test |
| @TestProjectInput(createEmptyCommit = false) |
| public void updateRootCommitMessage() throws Exception { |
| // Re-clone empty repo; TestRepository doesn't let us reset to unborn head. |
| testRepo = cloneProject(project); |
| changeId = newChange(admin.getIdent()); |
| |
| createEmptyEditFor(changeId); |
| Optional<EditInfo> edit = getEdit(changeId); |
| assertThat(edit).value().commit().parents().isEmpty(); |
| |
| String msg = String.format("New commit message\n\nChange-Id: %s\n", changeId); |
| gApi.changes().id(changeId).edit().modifyCommitMessage(msg); |
| String commitMessage = gApi.changes().id(changeId).edit().getCommitMessage(); |
| assertThat(commitMessage).isEqualTo(msg); |
| } |
| |
| @Test |
| public void updateMessageNoChange() throws Exception { |
| createEmptyEditFor(changeId); |
| String commitMessage = gApi.changes().id(changeId).edit().getCommitMessage(); |
| |
| exception.expect(ResourceConflictException.class); |
| exception.expectMessage("New commit message cannot be same as existing commit message"); |
| gApi.changes().id(changeId).edit().modifyCommitMessage(commitMessage); |
| } |
| |
| @Test |
| public void updateMessageOnlyAddTrailingNewLines() throws Exception { |
| createEmptyEditFor(changeId); |
| String commitMessage = gApi.changes().id(changeId).edit().getCommitMessage(); |
| |
| exception.expect(ResourceConflictException.class); |
| exception.expectMessage("New commit message cannot be same as existing commit message"); |
| gApi.changes().id(changeId).edit().modifyCommitMessage(commitMessage + "\n\n"); |
| } |
| |
| @Test |
| public void updateMessage() throws Exception { |
| createEmptyEditFor(changeId); |
| String msg = String.format("New commit message\n\nChange-Id: %s\n", changeId); |
| gApi.changes().id(changeId).edit().modifyCommitMessage(msg); |
| String commitMessage = gApi.changes().id(changeId).edit().getCommitMessage(); |
| assertThat(commitMessage).isEqualTo(msg); |
| |
| PublishChangeEditInput publishInput = new PublishChangeEditInput(); |
| publishInput.notify = NotifyHandling.NONE; |
| gApi.changes().id(changeId).edit().publish(publishInput); |
| assertThat(getEdit(changeId)).isAbsent(); |
| |
| ChangeInfo info = |
| get(changeId, ListChangesOption.CURRENT_COMMIT, ListChangesOption.CURRENT_REVISION); |
| assertThat(info.revisions.get(info.currentRevision).commit.message).isEqualTo(msg); |
| assertThat(info.revisions.get(info.currentRevision).description) |
| .isEqualTo("Edit commit message"); |
| |
| assertChangeMessages( |
| changeId, |
| ImmutableList.of( |
| "Uploaded patch set 1.", |
| "Uploaded patch set 2.", |
| "Patch Set 3: Commit message was updated.")); |
| } |
| |
| @Test |
| public void updateMessageRest() throws Exception { |
| adminRestSession.get(urlEditMessage(changeId, false)).assertNotFound(); |
| EditMessage.Input in = new EditMessage.Input(); |
| in.message = |
| String.format( |
| "New commit message\n\n" + CONTENT_NEW2_STR + "\n\nChange-Id: %s\n", changeId); |
| adminRestSession.put(urlEditMessage(changeId, false), in).assertNoContent(); |
| RestResponse r = adminRestSession.getJsonAccept(urlEditMessage(changeId, false)); |
| r.assertOK(); |
| assertThat(readContentFromJson(r)).isEqualTo(in.message); |
| String commitMessage = gApi.changes().id(changeId).edit().getCommitMessage(); |
| assertThat(commitMessage).isEqualTo(in.message); |
| in.message = String.format("New commit message2\n\nChange-Id: %s\n", changeId); |
| adminRestSession.put(urlEditMessage(changeId, false), in).assertNoContent(); |
| String updatedCommitMessage = gApi.changes().id(changeId).edit().getCommitMessage(); |
| assertThat(updatedCommitMessage).isEqualTo(in.message); |
| |
| r = adminRestSession.getJsonAccept(urlEditMessage(changeId, true)); |
| try (Repository repo = repoManager.openRepository(project); |
| RevWalk rw = new RevWalk(repo)) { |
| RevCommit commit = rw.parseCommit(ObjectId.fromString(ps.getRevision().get())); |
| assertThat(readContentFromJson(r)).isEqualTo(commit.getFullMessage()); |
| } |
| |
| PublishChangeEditInput publishInput = new PublishChangeEditInput(); |
| publishInput.notify = NotifyHandling.NONE; |
| gApi.changes().id(changeId).edit().publish(publishInput); |
| assertChangeMessages( |
| changeId, |
| ImmutableList.of( |
| "Uploaded patch set 1.", |
| "Uploaded patch set 2.", |
| "Patch Set 3: Commit message was updated.")); |
| } |
| |
| @Test |
| public void retrieveEdit() throws Exception { |
| adminRestSession.get(urlEdit(changeId)).assertNoContent(); |
| createArbitraryEditFor(changeId); |
| EditInfo editInfo = getEditInfo(changeId, false); |
| ChangeInfo changeInfo = get(changeId); |
| assertThat(editInfo.commit.commit).isNotEqualTo(changeInfo.currentRevision); |
| assertThat(editInfo).commit().parents().hasSize(1); |
| assertThat(editInfo).baseRevision().isEqualTo(changeInfo.currentRevision); |
| |
| gApi.changes().id(changeId).edit().delete(); |
| |
| adminRestSession.get(urlEdit(changeId)).assertNoContent(); |
| } |
| |
| @Test |
| public void retrieveFilesInEdit() throws Exception { |
| createEmptyEditFor(changeId); |
| gApi.changes().id(changeId).edit().modifyFile(FILE_NAME, RawInputUtil.create(CONTENT_NEW)); |
| |
| EditInfo info = getEditInfo(changeId, true); |
| assertThat(info.files).isNotNull(); |
| assertThat(info.files.keySet()).containsExactly(Patch.COMMIT_MSG, FILE_NAME, FILE_NAME2); |
| } |
| |
| @Test |
| public void deleteExistingFile() throws Exception { |
| createEmptyEditFor(changeId); |
| gApi.changes().id(changeId).edit().deleteFile(FILE_NAME); |
| assertThat(getFileContentOfEdit(changeId, FILE_NAME)).isAbsent(); |
| } |
| |
| @Test |
| public void renameExistingFile() throws Exception { |
| createEmptyEditFor(changeId); |
| gApi.changes().id(changeId).edit().renameFile(FILE_NAME, FILE_NAME3); |
| ensureSameBytes(getFileContentOfEdit(changeId, FILE_NAME3), CONTENT_OLD); |
| assertThat(getFileContentOfEdit(changeId, FILE_NAME)).isAbsent(); |
| } |
| |
| @Test |
| public void createEditByDeletingExistingFileRest() throws Exception { |
| adminRestSession.delete(urlEditFile(changeId, FILE_NAME)).assertNoContent(); |
| assertThat(getFileContentOfEdit(changeId, FILE_NAME)).isAbsent(); |
| } |
| |
| @Test |
| public void deletingNonExistingEditRest() throws Exception { |
| adminRestSession.delete(urlEdit(changeId)).assertNotFound(); |
| } |
| |
| @Test |
| public void deleteExistingFileRest() throws Exception { |
| createEmptyEditFor(changeId); |
| adminRestSession.delete(urlEditFile(changeId, FILE_NAME)).assertNoContent(); |
| assertThat(getFileContentOfEdit(changeId, FILE_NAME)).isAbsent(); |
| } |
| |
| @Test |
| public void restoreDeletedFileInPatchSet() throws Exception { |
| createEmptyEditFor(changeId2); |
| gApi.changes().id(changeId2).edit().restoreFile(FILE_NAME); |
| ensureSameBytes(getFileContentOfEdit(changeId2, FILE_NAME), CONTENT_OLD); |
| } |
| |
| @Test |
| public void revertChanges() throws Exception { |
| createEmptyEditFor(changeId2); |
| gApi.changes().id(changeId2).edit().restoreFile(FILE_NAME); |
| ensureSameBytes(getFileContentOfEdit(changeId2, FILE_NAME), CONTENT_OLD); |
| gApi.changes().id(changeId2).edit().modifyFile(FILE_NAME, RawInputUtil.create(CONTENT_NEW)); |
| ensureSameBytes(getFileContentOfEdit(changeId2, FILE_NAME), CONTENT_NEW); |
| gApi.changes().id(changeId2).edit().restoreFile(FILE_NAME); |
| ensureSameBytes(getFileContentOfEdit(changeId2, FILE_NAME), CONTENT_OLD); |
| } |
| |
| @Test |
| public void renameFileRest() throws Exception { |
| createEmptyEditFor(changeId); |
| Post.Input in = new Post.Input(); |
| in.oldPath = FILE_NAME; |
| in.newPath = FILE_NAME3; |
| adminRestSession.post(urlEdit(changeId), in).assertNoContent(); |
| ensureSameBytes(getFileContentOfEdit(changeId, FILE_NAME3), CONTENT_OLD); |
| assertThat(getFileContentOfEdit(changeId, FILE_NAME)).isAbsent(); |
| } |
| |
| @Test |
| public void restoreDeletedFileInPatchSetRest() throws Exception { |
| Post.Input in = new Post.Input(); |
| in.restorePath = FILE_NAME; |
| adminRestSession.post(urlEdit(changeId2), in).assertNoContent(); |
| ensureSameBytes(getFileContentOfEdit(changeId2, FILE_NAME), CONTENT_OLD); |
| } |
| |
| @Test |
| public void amendExistingFile() throws Exception { |
| createEmptyEditFor(changeId); |
| gApi.changes().id(changeId).edit().modifyFile(FILE_NAME, RawInputUtil.create(CONTENT_NEW)); |
| ensureSameBytes(getFileContentOfEdit(changeId, FILE_NAME), CONTENT_NEW); |
| gApi.changes().id(changeId).edit().modifyFile(FILE_NAME, RawInputUtil.create(CONTENT_NEW2)); |
| ensureSameBytes(getFileContentOfEdit(changeId, FILE_NAME), CONTENT_NEW2); |
| } |
| |
| @Test |
| public void createAndChangeEditInOneRequestRest() throws Exception { |
| Put.Input in = new Put.Input(); |
| in.content = RawInputUtil.create(CONTENT_NEW); |
| adminRestSession.putRaw(urlEditFile(changeId, FILE_NAME), in.content).assertNoContent(); |
| ensureSameBytes(getFileContentOfEdit(changeId, FILE_NAME), CONTENT_NEW); |
| in.content = RawInputUtil.create(CONTENT_NEW2); |
| adminRestSession.putRaw(urlEditFile(changeId, FILE_NAME), in.content).assertNoContent(); |
| ensureSameBytes(getFileContentOfEdit(changeId, FILE_NAME), CONTENT_NEW2); |
| } |
| |
| @Test |
| public void changeEditRest() throws Exception { |
| createEmptyEditFor(changeId); |
| Put.Input in = new Put.Input(); |
| in.content = RawInputUtil.create(CONTENT_NEW); |
| adminRestSession.putRaw(urlEditFile(changeId, FILE_NAME), in.content).assertNoContent(); |
| ensureSameBytes(getFileContentOfEdit(changeId, FILE_NAME), CONTENT_NEW); |
| } |
| |
| @Test |
| public void emptyPutRequest() throws Exception { |
| createEmptyEditFor(changeId); |
| adminRestSession.put(urlEditFile(changeId, FILE_NAME)).assertNoContent(); |
| ensureSameBytes(getFileContentOfEdit(changeId, FILE_NAME), "".getBytes(UTF_8)); |
| } |
| |
| @Test |
| public void createEmptyEditRest() throws Exception { |
| adminRestSession.post(urlEdit(changeId)).assertNoContent(); |
| ensureSameBytes(getFileContentOfEdit(changeId, FILE_NAME), CONTENT_OLD); |
| } |
| |
| @Test |
| public void getFileContentRest() throws Exception { |
| Put.Input in = new Put.Input(); |
| in.content = RawInputUtil.create(CONTENT_NEW); |
| adminRestSession.putRaw(urlEditFile(changeId, FILE_NAME), in.content).assertNoContent(); |
| gApi.changes().id(changeId).edit().modifyFile(FILE_NAME, RawInputUtil.create(CONTENT_NEW2)); |
| RestResponse r = adminRestSession.getJsonAccept(urlEditFile(changeId, FILE_NAME)); |
| r.assertOK(); |
| assertThat(readContentFromJson(r)).isEqualTo(new String(CONTENT_NEW2, UTF_8)); |
| |
| r = adminRestSession.getJsonAccept(urlEditFile(changeId, FILE_NAME, true)); |
| r.assertOK(); |
| assertThat(readContentFromJson(r)).isEqualTo(new String(CONTENT_OLD, UTF_8)); |
| } |
| |
| @Test |
| public void getFileNotFoundRest() throws Exception { |
| createEmptyEditFor(changeId); |
| adminRestSession.delete(urlEditFile(changeId, FILE_NAME)).assertNoContent(); |
| adminRestSession.get(urlEditFile(changeId, FILE_NAME)).assertNoContent(); |
| assertThat(getFileContentOfEdit(changeId, FILE_NAME)).isAbsent(); |
| } |
| |
| @Test |
| public void addNewFile() throws Exception { |
| createEmptyEditFor(changeId); |
| gApi.changes().id(changeId).edit().modifyFile(FILE_NAME3, RawInputUtil.create(CONTENT_NEW)); |
| ensureSameBytes(getFileContentOfEdit(changeId, FILE_NAME3), CONTENT_NEW); |
| } |
| |
| @Test |
| public void addNewFileAndAmend() throws Exception { |
| createEmptyEditFor(changeId); |
| gApi.changes().id(changeId).edit().modifyFile(FILE_NAME3, RawInputUtil.create(CONTENT_NEW)); |
| ensureSameBytes(getFileContentOfEdit(changeId, FILE_NAME3), CONTENT_NEW); |
| gApi.changes().id(changeId).edit().modifyFile(FILE_NAME3, RawInputUtil.create(CONTENT_NEW2)); |
| ensureSameBytes(getFileContentOfEdit(changeId, FILE_NAME3), CONTENT_NEW2); |
| } |
| |
| @Test |
| public void writeNoChanges() throws Exception { |
| createEmptyEditFor(changeId); |
| exception.expect(ResourceConflictException.class); |
| exception.expectMessage("no changes were made"); |
| gApi.changes().id(changeId).edit().modifyFile(FILE_NAME, RawInputUtil.create(CONTENT_OLD)); |
| } |
| |
| @Test |
| public void editCommitMessageCopiesLabelScores() throws Exception { |
| String cr = "Code-Review"; |
| ProjectConfig cfg = projectCache.checkedGet(project).getConfig(); |
| LabelType codeReview = Util.codeReview(); |
| codeReview.setCopyAllScoresIfNoCodeChange(true); |
| cfg.getLabelSections().put(cr, codeReview); |
| saveProjectConfig(project, cfg); |
| |
| ReviewInput r = new ReviewInput(); |
| r.labels = ImmutableMap.of(cr, (short) 1); |
| gApi.changes().id(changeId).current().review(r); |
| |
| createEmptyEditFor(changeId); |
| String newSubj = "New commit message"; |
| String newMsg = newSubj + "\n\nChange-Id: " + changeId + "\n"; |
| gApi.changes().id(changeId).edit().modifyCommitMessage(newMsg); |
| PublishChangeEditInput publishInput = new PublishChangeEditInput(); |
| publishInput.notify = NotifyHandling.NONE; |
| gApi.changes().id(changeId).edit().publish(publishInput); |
| |
| ChangeInfo info = get(changeId); |
| assertThat(info.subject).isEqualTo(newSubj); |
| List<ApprovalInfo> approvals = info.labels.get(cr).all; |
| assertThat(approvals).hasSize(1); |
| assertThat(approvals.get(0).value).isEqualTo(1); |
| } |
| |
| @Test |
| public void hasEditPredicate() throws Exception { |
| createEmptyEditFor(changeId); |
| assertThat(queryEdits()).hasSize(1); |
| |
| createEmptyEditFor(changeId2); |
| gApi.changes().id(changeId2).edit().modifyFile(FILE_NAME, RawInputUtil.create(CONTENT_NEW)); |
| assertThat(queryEdits()).hasSize(2); |
| |
| gApi.changes().id(changeId).edit().modifyFile(FILE_NAME, RawInputUtil.create(CONTENT_NEW)); |
| gApi.changes().id(changeId).edit().delete(); |
| assertThat(queryEdits()).hasSize(1); |
| |
| PublishChangeEditInput publishInput = new PublishChangeEditInput(); |
| publishInput.notify = NotifyHandling.NONE; |
| gApi.changes().id(changeId2).edit().publish(publishInput); |
| assertThat(queryEdits()).isEmpty(); |
| |
| setApiUser(user); |
| createEmptyEditFor(changeId); |
| assertThat(queryEdits()).hasSize(1); |
| |
| setApiUser(admin); |
| assertThat(queryEdits()).isEmpty(); |
| } |
| |
| @Test |
| public void files() throws Exception { |
| createEmptyEditFor(changeId); |
| gApi.changes().id(changeId).edit().modifyFile(FILE_NAME, RawInputUtil.create(CONTENT_NEW)); |
| Optional<EditInfo> edit = getEdit(changeId); |
| assertThat(edit).isPresent(); |
| String editCommitId = edit.get().commit.commit; |
| |
| RestResponse r = adminRestSession.getJsonAccept(urlRevisionFiles(changeId, editCommitId)); |
| Map<String, FileInfo> files = readContentFromJson(r, new TypeToken<Map<String, FileInfo>>() {}); |
| assertThat(files).containsKey(FILE_NAME); |
| |
| r = adminRestSession.getJsonAccept(urlRevisionFiles(changeId)); |
| files = readContentFromJson(r, new TypeToken<Map<String, FileInfo>>() {}); |
| assertThat(files).containsKey(FILE_NAME); |
| } |
| |
| @Test |
| public void diff() throws Exception { |
| createEmptyEditFor(changeId); |
| gApi.changes().id(changeId).edit().modifyFile(FILE_NAME, RawInputUtil.create(CONTENT_NEW)); |
| Optional<EditInfo> edit = getEdit(changeId); |
| assertThat(edit).isPresent(); |
| String editCommitId = edit.get().commit.commit; |
| |
| RestResponse r = adminRestSession.getJsonAccept(urlDiff(changeId, editCommitId, FILE_NAME)); |
| DiffInfo diff = readContentFromJson(r, DiffInfo.class); |
| assertThat(diff.diffHeader.get(0)).contains(FILE_NAME); |
| |
| r = adminRestSession.getJsonAccept(urlDiff(changeId, FILE_NAME)); |
| diff = readContentFromJson(r, DiffInfo.class); |
| assertThat(diff.diffHeader.get(0)).contains(FILE_NAME); |
| } |
| |
| @Test |
| public void createEditWithoutPushPatchSetPermission() throws Exception { |
| // Create new project with clean permissions |
| Project.NameKey p = createProject("addPatchSetEdit"); |
| // Clone repository as user |
| TestRepository<InMemoryRepository> userTestRepo = cloneProject(p, user); |
| |
| // Block default permission |
| block(Permission.ADD_PATCH_SET, REGISTERED_USERS, "refs/for/*", p); |
| |
| // Create change as user |
| PushOneCommit push = pushFactory.create(db, user.getIdent(), userTestRepo); |
| PushOneCommit.Result r1 = push.to("refs/for/master"); |
| r1.assertOkStatus(); |
| |
| // Try to create edit as admin |
| exception.expect(AuthException.class); |
| createEmptyEditFor(r1.getChangeId()); |
| } |
| |
| private void createArbitraryEditFor(String changeId) throws Exception { |
| createEmptyEditFor(changeId); |
| arbitrarilyModifyEditOf(changeId); |
| } |
| |
| private void createEmptyEditFor(String changeId) throws Exception { |
| gApi.changes().id(changeId).edit().create(); |
| } |
| |
| private void arbitrarilyModifyEditOf(String changeId) throws Exception { |
| gApi.changes().id(changeId).edit().modifyFile(FILE_NAME, RawInputUtil.create(CONTENT_NEW)); |
| } |
| |
| private Optional<BinaryResult> getFileContentOfEdit(String changeId, String filePath) |
| throws Exception { |
| return gApi.changes().id(changeId).edit().getFile(filePath); |
| } |
| |
| private List<ChangeInfo> queryEdits() throws Exception { |
| return query("project:{" + project.get() + "} has:edit"); |
| } |
| |
| private String newChange(PersonIdent ident) throws Exception { |
| PushOneCommit push = |
| pushFactory.create( |
| db, ident, testRepo, PushOneCommit.SUBJECT, FILE_NAME, new String(CONTENT_OLD, UTF_8)); |
| return push.to("refs/for/master").getChangeId(); |
| } |
| |
| private String amendChange(PersonIdent ident, String changeId) throws Exception { |
| PushOneCommit push = |
| pushFactory.create( |
| db, |
| ident, |
| testRepo, |
| PushOneCommit.SUBJECT, |
| FILE_NAME2, |
| new String(CONTENT_NEW2, UTF_8), |
| changeId); |
| return push.to("refs/for/master").getChangeId(); |
| } |
| |
| private String newChange2(PersonIdent ident) throws Exception { |
| PushOneCommit push = |
| pushFactory.create( |
| db, ident, testRepo, PushOneCommit.SUBJECT, FILE_NAME, new String(CONTENT_OLD, UTF_8)); |
| return push.rm("refs/for/master").getChangeId(); |
| } |
| |
| private PatchSet getCurrentPatchSet(String changeId) throws Exception { |
| return getOnlyElement(queryProvider.get().byKeyPrefix(changeId)).currentPatchSet(); |
| } |
| |
| private void ensureSameBytes(Optional<BinaryResult> fileContent, byte[] expectedFileBytes) |
| throws IOException { |
| assertThat(fileContent).value().bytes().isEqualTo(expectedFileBytes); |
| } |
| |
| private String urlEdit(String changeId) { |
| return "/changes/" + changeId + "/edit"; |
| } |
| |
| private String urlEditMessage(String changeId, boolean base) { |
| return "/changes/" + changeId + "/edit:message" + (base ? "?base" : ""); |
| } |
| |
| private String urlEditFile(String changeId, String fileName) { |
| return urlEditFile(changeId, fileName, false); |
| } |
| |
| private String urlEditFile(String changeId, String fileName, boolean base) { |
| return urlEdit(changeId) + "/" + fileName + (base ? "?base" : ""); |
| } |
| |
| private String urlGetFiles(String changeId) { |
| return urlEdit(changeId) + "?list"; |
| } |
| |
| private String urlRevisionFiles(String changeId, String revisionId) { |
| return "/changes/" + changeId + "/revisions/" + revisionId + "/files"; |
| } |
| |
| private String urlRevisionFiles(String changeId) { |
| return "/changes/" + changeId + "/revisions/0/files"; |
| } |
| |
| private String urlPublish(String changeId) { |
| return "/changes/" + changeId + "/edit:publish"; |
| } |
| |
| private String urlRebase(String changeId) { |
| return "/changes/" + changeId + "/edit:rebase"; |
| } |
| |
| private String urlDiff(String changeId, String fileName) { |
| return "/changes/" |
| + changeId |
| + "/revisions/0/files/" |
| + fileName |
| + "/diff?context=ALL&intraline"; |
| } |
| |
| private String urlDiff(String changeId, String revisionId, String fileName) { |
| return "/changes/" |
| + changeId |
| + "/revisions/" |
| + revisionId |
| + "/files/" |
| + fileName |
| + "/diff?context=ALL&intraline"; |
| } |
| |
| private EditInfo getEditInfo(String changeId, boolean files) throws Exception { |
| RestResponse r = adminRestSession.get(files ? urlGetFiles(changeId) : urlEdit(changeId)); |
| return readContentFromJson(r, EditInfo.class); |
| } |
| |
| private <T> T readContentFromJson(RestResponse r, Class<T> clazz) throws Exception { |
| r.assertOK(); |
| JsonReader jsonReader = new JsonReader(r.getReader()); |
| jsonReader.setLenient(true); |
| return newGson().fromJson(jsonReader, clazz); |
| } |
| |
| private <T> T readContentFromJson(RestResponse r, TypeToken<T> typeToken) throws Exception { |
| r.assertOK(); |
| JsonReader jsonReader = new JsonReader(r.getReader()); |
| jsonReader.setLenient(true); |
| return newGson().fromJson(jsonReader, typeToken.getType()); |
| } |
| |
| private String readContentFromJson(RestResponse r) throws Exception { |
| return readContentFromJson(r, String.class); |
| } |
| |
| private void assertChangeMessages(String changeId, List<String> expectedMessages) |
| throws Exception { |
| ChangeInfo ci = get(changeId); |
| assertThat(ci.messages).isNotNull(); |
| assertThat(ci.messages).hasSize(expectedMessages.size()); |
| List<String> actualMessages = |
| ci.messages.stream().map(message -> message.message).collect(toList()); |
| assertThat(actualMessages).containsExactlyElementsIn(expectedMessages).inOrder(); |
| } |
| } |