opendev/gerrit
Code Issues Proposed changes

Merge "ChangeEditIT: Always specify charset"

Browse Source
This commit is contained in:
ekempin 2017-01-27 12:34:20 +00:00 committed by Gerrit Code Review
commit 2556e4eedf
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -307,7 +307,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
assertThat(edit).value().baseRevision() assertThat(edit).value().baseRevision()
.isEqualTo(currentPatchSet.getRevision().get()); .isEqualTo(currentPatchSet.getRevision().get());
PushOneCommit push = pushFactory.create(db, admin.getIdent(), testRepo, PushOneCommit push = pushFactory.create(db, admin.getIdent(), testRepo,
PushOneCommit.SUBJECT, FILE_NAME, new String(CONTENT_NEW2), PushOneCommit.SUBJECT, FILE_NAME, new String(CONTENT_NEW2, UTF_8),
changeId2); changeId2);
push.to("refs/for/master").assertOkStatus(); push.to("refs/for/master").assertOkStatus();
adminRestSession.post(urlRebase(changeId2)).assertConflict(); adminRestSession.post(urlRebase(changeId2)).assertConflict();
@ -627,7 +627,8 @@ public class ChangeEditIT extends AbstractDaemonTest {
public void emptyPutRequest() throws Exception { public void emptyPutRequest() throws Exception {
createEmptyEditFor(changeId); createEmptyEditFor(changeId);
adminRestSession.put(urlEditFile(changeId, FILE_NAME)).assertNoContent(); adminRestSession.put(urlEditFile(changeId, FILE_NAME)).assertNoContent();
ensureSameBytes(getFileContentOfEdit(changeId, FILE_NAME), "".getBytes()); ensureSameBytes(getFileContentOfEdit(changeId, FILE_NAME),
"".getBytes(UTF_8));
} }
@Test @Test