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

Remove backported MockitoJUnitRule

Browse source 
Mockito in third_party is updated to 1.10. We do not need to backport this rule anymore.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=237496086
This commit is contained in:
jianglai 2019-03-08 12:15:16 -08:00
parent 5056e48363
commit b573b10ae1
38 changed files with 85 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

5
javatests/google/registry/export/datastore/DatastoreAdminTest.java
View file

@ -24,7 +24,6 @@ import com.google.api.client.http.HttpTransport;
import com.google.api.client.http.javanet.NetHttpTransport;
import com.google.api.client.json.jackson2.JacksonFactory;
import com.google.common.collect.ImmutableList;
import google.registry.testing.MockitoJUnitRule;
import google.registry.testing.TestDataHelper;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@ -35,6 +34,8 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
/** Unit tests for {@link DatastoreAdmin}. */
@RunWith(JUnit4.class)
@ -45,7 +46,7 @@ public class DatastoreAdminTest {
private static final ImmutableList<String> KINDS =
ImmutableList.of("Registry", "Registrar", "DomainBase");
@Rule public final MockitoJUnitRule mocks = MockitoJUnitRule.create();
@Rule public final MockitoRule mocks = MockitoJUnit.rule();
private HttpTransport httpTransport;
private GoogleCredential googleCredential;