zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-08-03 16:32:11 +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

4
javatests/google/registry/rde/RdeUploadActionTest.java
View file

@ -89,11 +89,11 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
import org.mockito.runners.MockitoJUnitRunner;
import org.junit.runners.JUnit4;
import org.mockito.stubbing.OngoingStubbing;
/** Unit tests for {@link RdeUploadAction}. */
@RunWith(MockitoJUnitRunner.class)
@RunWith(JUnit4.class)
public class RdeUploadActionTest {
private static final int BUFFER_SIZE = 64 * 1024;

4
javatests/google/registry/rde/imports/RdeContactImportActionTest.java
View file

@ -46,10 +46,10 @@ import org.joda.time.DateTime;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.runners.MockitoJUnitRunner;
import org.junit.runners.JUnit4;
/** Unit tests for {@link RdeContactImportAction}. */
@RunWith(MockitoJUnitRunner.class)
@RunWith(JUnit4.class)
public class RdeContactImportActionTest extends MapreduceTestCase<RdeContactImportAction> {
private static final ByteSource DEPOSIT_1_CONTACT =

4
javatests/google/registry/rde/imports/RdeContactInputTest.java
View file

@ -33,10 +33,10 @@ import java.util.List;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.runners.MockitoJUnitRunner;
import org.junit.runners.JUnit4;
/** Unit tests for {@link RdeContactInput} */
@RunWith(MockitoJUnitRunner.class)
@RunWith(JUnit4.class)
public class RdeContactInputTest {
private static final ByteSource DEPOSIT_0_CONTACT =

4
javatests/google/registry/rde/imports/RdeContactReaderTest.java
View file

@ -40,10 +40,10 @@ import java.util.NoSuchElementException;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.runners.MockitoJUnitRunner;
import org.junit.runners.JUnit4;
/** Unit tests for {@link RdeContactReader} */
@RunWith(MockitoJUnitRunner.class)
@RunWith(JUnit4.class)
public class RdeContactReaderTest {
private static final ByteSource DEPOSIT_1_CONTACT =

4
javatests/google/registry/rde/imports/RdeDomainImportActionTest.java
View file

@ -60,10 +60,10 @@ import org.joda.time.Seconds;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.runners.MockitoJUnitRunner;
import org.junit.runners.JUnit4;
/** Unit tests for {@link RdeDomainImportAction}. */
@RunWith(MockitoJUnitRunner.class)
@RunWith(JUnit4.class)
public class RdeDomainImportActionTest extends MapreduceTestCase<RdeDomainImportAction> {
private static final ByteSource DEPOSIT_1_DOMAIN = RdeImportsTestData.get("deposit_1_domain.xml");

4
javatests/google/registry/rde/imports/RdeHostImportActionTest.java
View file

@ -46,10 +46,10 @@ import org.joda.time.DateTime;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.runners.MockitoJUnitRunner;
import org.junit.runners.JUnit4;
/** Unit tests for {@link RdeHostImportAction}. */
@RunWith(MockitoJUnitRunner.class)
@RunWith(JUnit4.class)
public class RdeHostImportActionTest extends MapreduceTestCase<RdeHostImportAction> {
private static final ByteSource DEPOSIT_1_HOST = RdeImportsTestData.get("deposit_1_host.xml");

4
javatests/google/registry/rde/imports/RdeHostReaderTest.java
View file

@ -40,10 +40,10 @@ import java.util.NoSuchElementException;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.runners.MockitoJUnitRunner;
import org.junit.runners.JUnit4;
/** Unit tests for {@link RdeHostReader} */
@RunWith(MockitoJUnitRunner.class)
@RunWith(JUnit4.class)
public class RdeHostReaderTest {
private static final ByteSource DEPOSIT_1_HOST = RdeImportsTestData.get("deposit_1_host.xml");

9
javatests/google/registry/rde/imports/RdeImportUtilsTest.java
View file

@ -23,6 +23,7 @@ import static google.registry.testing.DatastoreHelper.persistResource;
import static org.joda.time.DateTimeZone.UTC;
import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@ -61,11 +62,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 RdeImportUtils} */
@RunWith(MockitoJUnitRunner.class)
@RunWith(JUnit4.class)
public class RdeImportUtilsTest extends ShardableTestCase {
private static final ByteSource DEPOSIT_XML = RdeImportsTestData.get("deposit_full.xml");
@ -84,8 +84,7 @@ public class RdeImportUtilsTest extends ShardableTestCase {
@Rule
public final ExceptionRule thrown = new ExceptionRule();
@Mock
private GcsUtils gcsUtils;
private final GcsUtils gcsUtils = mock(GcsUtils.class);
private RdeImportUtils rdeImportUtils;
private FakeClock clock;