opendev/gerrit
Code Issues Proposed changes

AbstractDaemonTest: Add user SSH session

Browse Source 
Rename the adminSession and userSession members to adminRestSession
and userRestSession.

Rename sshSession to adminSshSession.  Add userSshSession.

Change-Id: Id705a04317d146cea48b6215e78d8f8ea7fa95a1
This commit is contained in:
David Pursehouse
2016-04-22 18:39:34 +09:00
parent 84cd28a063
commit 8f02dff77f
35 changed files with 199 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -171,7 +171,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
modifier.modifyFile(editUtil.byChange(change).get(), FILE_NAME,
RawInputUtil.create(CONTENT_NEW))).isEqualTo(RefUpdate.Result.FORCED);
Optional<ChangeEdit> edit = editUtil.byChange(change);
adminSession.post(urlPublish()).assertNoContent();
adminRestSession.post(urlPublish()).assertNoContent();
edit = editUtil.byChange(change);
assertThat(edit.isPresent()).isFalse();
PatchSet newCurrentPatchSet = getCurrentPatchSet(changeId);
@@ -189,7 +189,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
modifier.modifyFile(editUtil.byChange(change).get(), FILE_NAME,
RawInputUtil.create(CONTENT_NEW))).isEqualTo(RefUpdate.Result.FORCED);
Optional<ChangeEdit> edit = editUtil.byChange(change);
adminSession.delete(urlEdit()).assertNoContent();
adminRestSession.delete(urlEdit()).assertNoContent();
edit = editUtil.byChange(change);
assertThat(edit.isPresent()).isFalse();
}
@@ -203,9 +203,9 @@ public class ChangeEditIT extends AbstractDaemonTest {
assertThat(
modifier.modifyFile(editUtil.byChange(change).get(), FILE_NAME,
RawInputUtil.create(CONTENT_NEW))).isEqualTo(RefUpdate.Result.FORCED);
adminSession.post(urlPublish()).assertForbidden();
adminRestSession.post(urlPublish()).assertForbidden();
setUseContributorAgreements(InheritableBoolean.FALSE);
adminSession.post(urlPublish()).assertNoContent();
adminRestSession.post(urlPublish()).assertNoContent();
}
@Test
@@ -242,7 +242,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
assertThat(edit.getBasePatchSet().getPatchSetId()).isEqualTo(
current.getPatchSetId() - 1);
Date beforeRebase = edit.getEditCommit().getCommitterIdent().getWhen();
adminSession.post(urlRebase()).assertNoContent();
adminRestSession.post(urlRebase()).assertNoContent();
edit = editUtil.byChange(change).get();
assertByteArray(fileUtil.getContent(projectCache.get(edit.getChange().getProject()),
ObjectId.fromString(edit.getRevision().get()), FILE_NAME), CONTENT_NEW);
@@ -268,7 +268,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
pushFactory.create(db, admin.getIdent(), testRepo, PushOneCommit.SUBJECT, FILE_NAME,
new String(CONTENT_NEW2), changeId2);
push.to("refs/for/master").assertOkStatus();
adminSession.post(urlRebase()).assertConflict();
adminRestSession.post(urlRebase()).assertConflict();
}
@Test
@@ -362,13 +362,13 @@ public class ChangeEditIT extends AbstractDaemonTest {
@Test
public void updateMessageRest() throws Exception {
adminSession.get(urlEditMessage()).assertNotFound();
adminRestSession.get(urlEditMessage()).assertNotFound();
EditMessage.Input in = new EditMessage.Input();
in.message = String.format("New commit message\n\n" +
CONTENT_NEW2_STR + "\n\nChange-Id: %s\n",
change.getKey());
adminSession.put(urlEditMessage(), in).assertNoContent();
RestResponse r = adminSession.getJsonAccept(urlEditMessage());
adminRestSession.put(urlEditMessage(), in).assertNoContent();
RestResponse r = adminRestSession.getJsonAccept(urlEditMessage());
r.assertOK();
assertThat(readContentFromJson(r)).isEqualTo(in.message);
Optional<ChangeEdit> edit = editUtil.byChange(change);
@@ -376,7 +376,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
.isEqualTo(in.message);
in.message = String.format("New commit message2\n\nChange-Id: %s\n",
change.getKey());
adminSession.put(urlEditMessage(), in).assertNoContent();
adminRestSession.put(urlEditMessage(), in).assertNoContent();
edit = editUtil.byChange(change);
assertThat(edit.get().getEditCommit().getFullMessage())
.isEqualTo(in.message);
@@ -389,7 +389,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
@Test
public void retrieveEdit() throws Exception {
adminSession.get(urlEdit()).assertNoContent();
adminRestSession.get(urlEdit()).assertNoContent();
assertThat(modifier.createEdit(change, ps)).isEqualTo(RefUpdate.Result.NEW);
Optional<ChangeEdit> edit = editUtil.byChange(change);
assertThat(modifier.modifyFile(edit.get(), FILE_NAME, RawInputUtil.create(CONTENT_NEW)))
@@ -402,7 +402,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
edit = editUtil.byChange(change);
editUtil.delete(edit.get());
adminSession.get(urlEdit()).assertNoContent();
adminRestSession.get(urlEdit()).assertNoContent();
}
@Test
@@ -447,7 +447,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
@Test
public void createEditByDeletingExistingFileRest() throws Exception {
adminSession.delete(urlEditFile()).assertNoContent();
adminRestSession.delete(urlEditFile()).assertNoContent();
Optional<ChangeEdit> edit = editUtil.byChange(change);
exception.expect(ResourceNotFoundException.class);
fileUtil.getContent(projectCache.get(edit.get().getChange().getProject()),
@@ -456,13 +456,13 @@ public class ChangeEditIT extends AbstractDaemonTest {
@Test
public void deletingNonExistingEditRest() throws Exception {
adminSession.delete(urlEdit()).assertNotFound();
adminRestSession.delete(urlEdit()).assertNotFound();
}
@Test
public void deleteExistingFileRest() throws Exception {
assertThat(modifier.createEdit(change, ps)).isEqualTo(RefUpdate.Result.NEW);
adminSession.delete(urlEditFile()).assertNoContent();
adminRestSession.delete(urlEditFile()).assertNoContent();
Optional<ChangeEdit> edit = editUtil.byChange(change);
exception.expect(ResourceNotFoundException.class);
fileUtil.getContent(projectCache.get(edit.get().getChange().getProject()),
@@ -511,7 +511,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
Post.Input in = new Post.Input();
in.oldPath = FILE_NAME;
in.newPath = FILE_NAME3;
adminSession.post(urlEdit(), in).assertNoContent();
adminRestSession.post(urlEdit(), in).assertNoContent();
Optional<ChangeEdit> edit = editUtil.byChange(change);
assertByteArray(fileUtil.getContent(projectCache.get(edit.get().getChange().getProject()),
ObjectId.fromString(edit.get().getRevision().get()), FILE_NAME3), CONTENT_OLD);
@@ -524,7 +524,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
public void restoreDeletedFileInPatchSetRest() throws Exception {
Post.Input in = new Post.Input();
in.restorePath = FILE_NAME;
adminSession.post(urlEdit2(), in).assertNoContent();
adminRestSession.post(urlEdit2(), in).assertNoContent();
Optional<ChangeEdit> edit = editUtil.byChange(change2);
assertByteArray(fileUtil.getContent(projectCache.get(edit.get().getChange().getProject()),
ObjectId.fromString(edit.get().getRevision().get()), FILE_NAME), CONTENT_OLD);
@@ -550,12 +550,12 @@ public class ChangeEditIT extends AbstractDaemonTest {
public void createAndChangeEditInOneRequestRest() throws Exception {
Put.Input in = new Put.Input();
in.content = RawInputUtil.create(CONTENT_NEW);
adminSession.putRaw(urlEditFile(), in.content).assertNoContent();
adminRestSession.putRaw(urlEditFile(), in.content).assertNoContent();
Optional<ChangeEdit> edit = editUtil.byChange(change);
assertByteArray(fileUtil.getContent(projectCache.get(edit.get().getChange().getProject()),
ObjectId.fromString(edit.get().getRevision().get()), FILE_NAME), CONTENT_NEW);
in.content = RawInputUtil.create(CONTENT_NEW2);
adminSession.putRaw(urlEditFile(), in.content).assertNoContent();
adminRestSession.putRaw(urlEditFile(), in.content).assertNoContent();
edit = editUtil.byChange(change);
assertByteArray(fileUtil.getContent(projectCache.get(edit.get().getChange().getProject()),
ObjectId.fromString(edit.get().getRevision().get()), FILE_NAME), CONTENT_NEW2);
@@ -566,7 +566,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
assertThat(modifier.createEdit(change, ps)).isEqualTo(RefUpdate.Result.NEW);
Put.Input in = new Put.Input();
in.content = RawInputUtil.create(CONTENT_NEW);
adminSession.putRaw(urlEditFile(), in.content).assertNoContent();
adminRestSession.putRaw(urlEditFile(), in.content).assertNoContent();
Optional<ChangeEdit> edit = editUtil.byChange(change);
assertByteArray(fileUtil.getContent(projectCache.get(edit.get().getChange().getProject()),
ObjectId.fromString(edit.get().getRevision().get()), FILE_NAME), CONTENT_NEW);
@@ -575,7 +575,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
@Test
public void emptyPutRequest() throws Exception {
assertThat(modifier.createEdit(change, ps)).isEqualTo(RefUpdate.Result.NEW);
adminSession.put(urlEditFile()).assertNoContent();
adminRestSession.put(urlEditFile()).assertNoContent();
Optional<ChangeEdit> edit = editUtil.byChange(change);
assertByteArray(fileUtil.getContent(projectCache.get(edit.get().getChange().getProject()),
ObjectId.fromString(edit.get().getRevision().get()), FILE_NAME), "".getBytes());
@@ -583,7 +583,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
@Test
public void createEmptyEditRest() throws Exception {
adminSession.post(urlEdit()).assertNoContent();
adminRestSession.post(urlEdit()).assertNoContent();
Optional<ChangeEdit> edit = editUtil.byChange(change);
assertByteArray(fileUtil.getContent(projectCache.get(edit.get().getChange().getProject()),
ObjectId.fromString(edit.get().getRevision().get()), FILE_NAME), CONTENT_OLD);
@@ -593,12 +593,12 @@ public class ChangeEditIT extends AbstractDaemonTest {
public void getFileContentRest() throws Exception {
Put.Input in = new Put.Input();
in.content = RawInputUtil.create(CONTENT_NEW);
adminSession.putRaw(urlEditFile(), in.content).assertNoContent();
adminRestSession.putRaw(urlEditFile(), in.content).assertNoContent();
Optional<ChangeEdit> edit = editUtil.byChange(change);
assertThat(modifier.modifyFile(edit.get(), FILE_NAME, RawInputUtil.create(CONTENT_NEW2)))
.isEqualTo(RefUpdate.Result.FORCED);
edit = editUtil.byChange(change);
RestResponse r = adminSession.getJsonAccept(urlEditFile());
RestResponse r = adminRestSession.getJsonAccept(urlEditFile());
r.assertOK();
assertThat(readContentFromJson(r)).isEqualTo(
StringUtils.newStringUtf8(CONTENT_NEW2));
@@ -607,9 +607,9 @@ public class ChangeEditIT extends AbstractDaemonTest {
@Test
public void getFileNotFoundRest() throws Exception {
assertThat(modifier.createEdit(change, ps)).isEqualTo(RefUpdate.Result.NEW);
adminSession.delete(urlEditFile()).assertNoContent();
adminRestSession.delete(urlEditFile()).assertNoContent();
Optional<ChangeEdit> edit = editUtil.byChange(change);
adminSession.get(urlEditFile()).assertNoContent();
adminRestSession.get(urlEditFile()).assertNoContent();
exception.expect(ResourceNotFoundException.class);
fileUtil.getContent(projectCache.get(edit.get().getChange().getProject()),
ObjectId.fromString(edit.get().getRevision().get()), FILE_NAME);
@@ -724,12 +724,12 @@ public class ChangeEditIT extends AbstractDaemonTest {
.isEqualTo(RefUpdate.Result.FORCED);
edit = editUtil.byChange(change).get();
RestResponse r = adminSession.getJsonAccept(urlRevisionFiles(edit));
RestResponse r = adminRestSession.getJsonAccept(urlRevisionFiles(edit));
Map<String, FileInfo> files = readContentFromJson(
r, new TypeToken<Map<String, FileInfo>>() {});
assertThat(files).containsKey(FILE_NAME);
r = adminSession.getJsonAccept(urlRevisionFiles());
r = adminRestSession.getJsonAccept(urlRevisionFiles());
files = readContentFromJson(r, new TypeToken<Map<String, FileInfo>>() {});
assertThat(files).containsKey(FILE_NAME);
}
@@ -742,11 +742,11 @@ public class ChangeEditIT extends AbstractDaemonTest {
.isEqualTo(RefUpdate.Result.FORCED);
edit = editUtil.byChange(change).get();
RestResponse r = adminSession.getJsonAccept(urlDiff(edit));
RestResponse r = adminRestSession.getJsonAccept(urlDiff(edit));
DiffInfo diff = readContentFromJson(r, DiffInfo.class);
assertThat(diff.diffHeader.get(0)).contains(FILE_NAME);
r = adminSession.getJsonAccept(urlDiff());
r = adminRestSession.getJsonAccept(urlDiff());
diff = readContentFromJson(r, DiffInfo.class);
assertThat(diff.diffHeader.get(0)).contains(FILE_NAME);
}
@@ -866,7 +866,7 @@ public class ChangeEditIT extends AbstractDaemonTest {
}
private EditInfo toEditInfo(boolean files) throws Exception {
RestResponse r = adminSession.get(files ? urlGetFiles() : urlEdit());
RestResponse r = adminRestSession.get(files ? urlGetFiles() : urlEdit());
return readContentFromJson(r, EditInfo.class);
}