zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-08-05 01:11:50 +02:00
Code Issues Projects Releases Packages Wiki Activity

Automatically refactor more exception testing to use new JUnit rules

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=178911894
This commit is contained in:
mcilwain 2017-08-14 09:20:03 -04:00 • committed by Ben McIlwain
parent 36ad38e5df
commit 7dc224627f
125 changed files with 1970 additions and 1982 deletions
Download patch file Download diff file Expand all files Collapse all files

12
javatests/google/registry/ui/forms/FormFieldExceptionTest.java
View file

@ -15,21 +15,16 @@
package google.registry.ui.forms;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.JUnitBackports.assertThrows;
import com.google.common.testing.NullPointerTester;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
/** Unit tests for {@link FormFieldException}. */
@RunWith(JUnit4.class)
public class FormFieldExceptionTest {
@Rule
public ExpectedException thrown = ExpectedException.none();
@Test
public void testGetFieldName_multiplePropagations_joinsUsingJsonNotation() throws Exception {
assertThat(
@ -53,8 +48,9 @@ public class FormFieldExceptionTest {
@Test
public void testGetFieldName_noPropagations_throwsIse() throws Exception {
thrown.expect(IllegalStateException.class);
new FormFieldException("This field is required.").getFieldName();
assertThrows(
IllegalStateException.class,
() -> new FormFieldException("This field is required.").getFieldName());
}
@Test

4
javatests/google/registry/ui/server/registrar/SendEmailUtilsTest.java
View file

@ -37,7 +37,6 @@ import javax.mail.internet.MimeMessage;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@ -45,9 +44,6 @@ import org.junit.runners.JUnit4;
@RunWith(JUnit4.class)
public class SendEmailUtilsTest {
@Rule
public final ExpectedException thrown = ExpectedException.none();
@Rule
public final InjectRule inject = new InjectRule();

14
javatests/google/registry/ui/server/registrar/SessionUtilsTest.java
View file

@ -19,6 +19,7 @@ import static google.registry.testing.AppEngineRule.THE_REGISTRAR_GAE_USER_ID;
import static google.registry.testing.DatastoreHelper.deleteResource;
import static google.registry.testing.DatastoreHelper.loadRegistrar;
import static google.registry.testing.DatastoreHelper.persistResource;
import static google.registry.testing.JUnitBackports.assertThrows;
import static google.registry.testing.LogsSubject.assertAboutLogs;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
@ -41,7 +42,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@ -50,9 +50,6 @@ import org.junit.runners.JUnit4;
public class SessionUtilsTest {
@Rule public final AppEngineRule appEngine = AppEngineRule.builder().withDatastore().build();
@Rule public final ExpectedException thrown = ExpectedException.none();
@Rule public final InjectRule inject = new InjectRule();
private final HttpServletRequest req = mock(HttpServletRequest.class);
@ -96,9 +93,12 @@ public class SessionUtilsTest {
@Test
public void testCheckRegistrarConsoleLogin_notLoggedIn_throwsIllegalStateException()
throws Exception {
thrown.expect(IllegalStateException.class);
@SuppressWarnings("unused")
boolean unused = sessionUtils.checkRegistrarConsoleLogin(req, null);
assertThrows(
IllegalStateException.class,
() -> {
@SuppressWarnings("unused")
boolean unused = sessionUtils.checkRegistrarConsoleLogin(req, null);
});
}
/**