opendev/gerrit
Code Issues Proposed changes

{Account|Change}IT: Move mail reply-to assertion to AbstractDaemonTest

Browse Source 
Change-Id: Ie5f283685f7d70aa1bcf85939b59145eece02d0e
This commit is contained in:
David Pursehouse
2016-07-14 15:46:16 +09:00
parent e0011872b9
commit d9216de50e
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gerrit-acceptance-framework/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java
View File

@@ -67,6 +67,7 @@ import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.git.MetaDataUpdate;
import com.google.gerrit.server.git.ProjectConfig;
import com.google.gerrit.server.index.change.ChangeIndexer;
import com.google.gerrit.server.mail.EmailHeader;
import com.google.gerrit.server.notedb.ChangeNoteUtil;
import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.server.project.ChangeControl;
@@ -78,6 +79,7 @@ import com.google.gerrit.testutil.ConfigSuite;
import com.google.gerrit.testutil.FakeEmailSender;
import com.google.gerrit.testutil.TempFileUtil;
import com.google.gerrit.testutil.TestNotesMigration;
import com.google.gerrit.testutil.FakeEmailSender.Message;
import com.google.gson.Gson;
import com.google.gwtorm.server.OrmException;
import com.google.gwtorm.server.SchemaFactory;
@@ -880,4 +882,12 @@ public abstract class AbstractDaemonTest {
protected RevCommit getRemoteHead() throws Exception {
return getRemoteHead(project, "master");
}
protected void assertMailFrom(Message message, String email)
throws Exception {
assertThat(message.headers()).containsKey("Reply-To");
EmailHeader.String replyTo =
(EmailHeader.String)message.headers().get("Reply-To");
assertThat(replyTo.getString()).isEqualTo(email);
}
}

6
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/AccountIT.java
View File

@@ -62,7 +62,6 @@ import com.google.gerrit.reviewdb.client.AccountExternalId;
import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.server.config.AllUsersName;
import com.google.gerrit.server.git.ProjectConfig;
import com.google.gerrit.server.mail.EmailHeader;
import com.google.gerrit.server.project.RefPattern;
import com.google.gerrit.server.util.MagicBranch;
import com.google.gerrit.testutil.ConfigSuite;
@@ -331,10 +330,7 @@ public class AccountIT extends AbstractDaemonTest {
assertThat(messages).hasSize(1);
Message message = messages.get(0);
assertThat(message.rcpt()).containsExactly(user.emailAddress);
assertThat(message.headers()).containsKey("Reply-To");
EmailHeader.String replyTo =
(EmailHeader.String)message.headers().get("Reply-To");
assertThat(replyTo.getString()).isEqualTo(admin.email);
assertMailFrom(message, admin.email);
}
@Test

6
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java
View File

@@ -69,7 +69,6 @@ import com.google.gerrit.server.change.ChangeResource;
import com.google.gerrit.server.config.AnonymousCowardNameProvider;
import com.google.gerrit.server.git.ProjectConfig;
import com.google.gerrit.server.group.SystemGroupBackend;
import com.google.gerrit.server.mail.EmailHeader;
import com.google.gerrit.server.project.ChangeControl;
import com.google.gerrit.server.project.Util;
import com.google.gerrit.testutil.FakeEmailSender.Message;
@@ -554,10 +553,7 @@ public class ChangeIT extends AbstractDaemonTest {
assertThat(m.body()).contains("Hello " + user.fullName + ",\n");
assertThat(m.body()).contains("I'd like you to do a code review.");
assertThat(m.body()).contains("Change subject: " + PushOneCommit.SUBJECT + "\n");
assertThat(m.headers()).containsKey("Reply-To");
EmailHeader.String replyTo =
(EmailHeader.String)m.headers().get("Reply-To");
assertThat(replyTo.getString()).isEqualTo(admin.email);
assertMailFrom(m, admin.email);
ChangeInfo c = gApi.changes()
.id(r.getChangeId())
.get();