Change SendEmailService to an instance field.

This allows us to inject it with Dagger and avoid using InjectRule to set it
in unit tests.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=217571475
This commit is contained in:
jianglai 2018-10-17 12:55:22 -07:00
parent 06ce429c5a
commit 84c3544097
5 changed files with 14 additions and 20 deletions

View file

@ -25,7 +25,6 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import com.google.common.collect.ImmutableList;
import google.registry.testing.InjectRule;
import google.registry.util.SendEmailService;
import java.util.Properties;
import javax.mail.Message;
@ -35,7 +34,6 @@ import javax.mail.Session;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@ -44,9 +42,6 @@ import org.junit.runners.JUnit4;
@RunWith(JUnit4.class)
public class SendEmailUtilsTest {
@Rule
public final InjectRule inject = new InjectRule();
private final SendEmailService emailService = mock(SendEmailService.class);
private Message message;
@ -54,11 +49,11 @@ public class SendEmailUtilsTest {
@Before
public void init() {
inject.setStaticField(SendEmailUtils.class, "emailService", emailService);
message = new MimeMessage(Session.getDefaultInstance(new Properties(), null));
when(emailService.createMessage()).thenReturn(message);
sendEmailUtils =
new SendEmailUtils(getGSuiteOutgoingEmailAddress(), getGSuiteOutgoingEmailDisplayName());
new SendEmailUtils(
getGSuiteOutgoingEmailAddress(), getGSuiteOutgoingEmailDisplayName(), emailService);
}
@Test