opendev/gerrit
Code Issues Proposed changes

Use AccountOperations to create/update accounts in more tests

Browse Source 
MailProcessorIT.parseAndPersistMessageFromInactiveAccount doesn't need
to reset the account status because this is already handled by
ProjectResetter.

Change-Id: Idf7bb86e0de06e3b850d1c6e6a5a64ca9a23fcc5
Signed-off-by: Edwin Kempin <ekempin@google.com>
This commit is contained in:
Edwin Kempin
2018-11-09 12:51:59 +01:00
parent 5297c3cb21
commit 1f56a79c6b
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
View File

@@ -1692,7 +1692,7 @@ public class ChangeIT extends AbstractDaemonTest {
PushOneCommit.Result result = createChange(); PushOneCommit.Result result = createChange();
String username = name("new-user"); String username = name("new-user");
gApi.accounts().create(username).setActive(false); accountOperations.newAccount().username(username).inactive().create();
AddReviewerInput in = new AddReviewerInput(); AddReviewerInput in = new AddReviewerInput();
in.reviewer = username; in.reviewer = username;
@@ -1714,7 +1714,7 @@ public class ChangeIT extends AbstractDaemonTest {
PushOneCommit.Result result = createChange(); PushOneCommit.Result result = createChange();
String username = "user@domain.com"; String username = "user@domain.com";
gApi.accounts().create(username).setActive(false); accountOperations.newAccount().username(username).inactive().create();
AddReviewerInput in = new AddReviewerInput(); AddReviewerInput in = new AddReviewerInput();
in.reviewer = username; in.reviewer = username;
@@ -2096,7 +2096,7 @@ public class ChangeIT extends AbstractDaemonTest {
ChangeResource rsrc = parseResource(r); ChangeResource rsrc = parseResource(r);
String oldETag = rsrc.getETag(); String oldETag = rsrc.getETag();
gApi.accounts().id(admin.id.get()).setStatus("new status"); accountOperations.account(admin.id).forUpdate().status("new status").update();
rsrc = parseResource(r); rsrc = parseResource(r);
assertThat(rsrc.getETag()).isNotEqualTo(oldETag); assertThat(rsrc.getETag()).isNotEqualTo(oldETag);
} }

7
javatests/com/google/gerrit/acceptance/server/mail/MailProcessorIT.java
View File

@@ -17,6 +17,7 @@ package com.google.gerrit.acceptance.server.mail;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import com.google.gerrit.acceptance.testsuite.account.AccountOperations;
import com.google.gerrit.extensions.common.ChangeInfo; import com.google.gerrit.extensions.common.ChangeInfo;
import com.google.gerrit.extensions.common.ChangeMessageInfo; import com.google.gerrit.extensions.common.ChangeMessageInfo;
import com.google.gerrit.extensions.common.CommentInfo; import com.google.gerrit.extensions.common.CommentInfo;
@@ -33,6 +34,7 @@ import org.junit.Test;
public class MailProcessorIT extends AbstractMailIT { public class MailProcessorIT extends AbstractMailIT {
@Inject private MailProcessor mailProcessor; @Inject private MailProcessor mailProcessor;
@Inject private AccountOperations accountOperations;
@Test @Test
public void parseAndPersistChangeMessage() throws Exception { public void parseAndPersistChangeMessage() throws Exception {
@@ -163,16 +165,13 @@ public class MailProcessorIT extends AbstractMailIT {
b.textContent(txt + textFooterForChange(changeInfo._number, ts)); b.textContent(txt + textFooterForChange(changeInfo._number, ts));
// Set account state to inactive // Set account state to inactive
gApi.accounts().id("user").setActive(false); accountOperations.account(user.id).forUpdate().inactive().update();
mailProcessor.process(b.build()); mailProcessor.process(b.build());
comments = gApi.changes().id(changeId).current().commentsAsList(); comments = gApi.changes().id(changeId).current().commentsAsList();
// Check that comment size has not changed // Check that comment size has not changed
assertThat(comments).hasSize(2); assertThat(comments).hasSize(2);
// Reset
gApi.accounts().id("user").setActive(true);
} }
@Test @Test