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

Remove some unnecessary uses of MockitoJUnitRunner, which is discouraged

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=153719402
This commit is contained in:
mountford 2017-04-20 09:40:08 -07:00 • committed by Ben McIlwain
parent a259b42b26
commit 89b3e9c55b
15 changed files with 61 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

29
javatests/google/registry/request/RequestHandlerTest.java
View file

@ -17,6 +17,7 @@ package google.registry.request;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.request.Action.Method.GET;
import static google.registry.request.Action.Method.POST;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.verifyZeroInteractions;
@ -51,11 +52,10 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.junit.runners.JUnit4;
/** Unit tests for {@link RequestHandler}. */
@RunWith(MockitoJUnitRunner.class)
@RunWith(JUnit4.class)
public final class RequestHandlerTest {
@Rule
@ -221,23 +221,12 @@ public final class RequestHandlerTest {
}
}
@Mock
private HttpServletRequest req;
@Mock
private HttpServletResponse rsp;
@Mock
private BumblebeeTask bumblebeeTask;
@Mock
private SlothTask slothTask;
@Mock
private UsersOnlyAction usersOnlyAction;
@Mock
private SafeSlothTask safeSlothTask;
private final HttpServletRequest req = mock(HttpServletRequest.class);
private final HttpServletResponse rsp = mock(HttpServletResponse.class);
private final BumblebeeTask bumblebeeTask = mock(BumblebeeTask.class);
private final SlothTask slothTask = mock(SlothTask.class);
private final UsersOnlyAction usersOnlyAction = mock(UsersOnlyAction.class);
private final SafeSlothTask safeSlothTask = mock(SafeSlothTask.class);
private final Component component = new Component();
private final StringWriter httpOutput = new StringWriter();

9
javatests/google/registry/request/RequestParametersTest.java
View file

@ -21,6 +21,7 @@ import static google.registry.request.RequestParameters.extractOptionalDatetimeP
import static google.registry.request.RequestParameters.extractOptionalParameter;
import static google.registry.request.RequestParameters.extractRequiredDatetimeParameter;
import static google.registry.request.RequestParameters.extractRequiredParameter;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import com.google.common.collect.ImmutableMap;
@ -31,18 +32,16 @@ import org.joda.time.DateTime;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.junit.runners.JUnit4;
/** Unit tests for {@link RequestParameters}. */
@RunWith(MockitoJUnitRunner.class)
@RunWith(JUnit4.class)
public class RequestParametersTest {
@Rule
public final ExceptionRule thrown = new ExceptionRule();
@Mock
private HttpServletRequest req;
private final HttpServletRequest req = mock(HttpServletRequest.class);
@Test
public void testExtractRequiredParameter_valuePresent_returnsValue() throws Exception {

9
javatests/google/registry/request/ResponseImplTest.java
View file

@ -16,6 +16,7 @@ package google.registry.request;
import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
@ -27,18 +28,16 @@ import javax.servlet.http.HttpServletResponse;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.junit.runners.JUnit4;
/** Unit tests for {@link ResponseImpl}. */
@RunWith(MockitoJUnitRunner.class)
@RunWith(JUnit4.class)
public class ResponseImplTest {
@Rule
public final ExceptionRule thrown = new ExceptionRule();
@Mock
private HttpServletResponse rsp;
private final HttpServletResponse rsp = mock(HttpServletResponse.class);
@Test
public void testSetStatus() throws Exception {