zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-07-09 20:53:26 +02:00
Code Issues Projects Releases Packages Wiki Activity

Reduce excessive visibility levels in test classes (#773)

Browse source 
* Reduce excessive visibility levels in test classes
This commit is contained in:
Ben McIlwain 2020-08-20 18:34:59 -04:00 • committed by GitHub
parent 70274da971
commit a28632dbe1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 90 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/src/test/java/google/registry/beam/initsql/InitSqlPipelineGraphTest.java
View file

@ -51,7 +51,7 @@ class InitSqlPipelineGraphTest {
TestPipelineExtension.create().enableAbandonedNodeEnforcement(false); TestPipelineExtension.create().enableAbandonedNodeEnforcement(false);
@Test @Test
public void createPipeline_compareGraph() throws IOException { void createPipeline_compareGraph() throws IOException {
new InitSqlPipeline(options, testPipeline).setupPipeline(); new InitSqlPipeline(options, testPipeline).setupPipeline();
String dotString = PipelineDotRenderer.toDotString(testPipeline); String dotString = PipelineDotRenderer.toDotString(testPipeline);
URL goldenDotUrl = Resources.getResource(InitSqlPipelineGraphTest.class, GOLDEN_DOT_FILE); URL goldenDotUrl = Resources.getResource(InitSqlPipelineGraphTest.class, GOLDEN_DOT_FILE);

4
core/src/test/java/google/registry/model/history/DomainHistoryTest.java
View file

@ -36,12 +36,12 @@ import org.junit.jupiter.api.Test;
/** Tests for {@link DomainHistory}. */ /** Tests for {@link DomainHistory}. */
public class DomainHistoryTest extends EntityTestCase { public class DomainHistoryTest extends EntityTestCase {
public DomainHistoryTest() { DomainHistoryTest() {
super(JpaEntityCoverageCheck.ENABLED); super(JpaEntityCoverageCheck.ENABLED);
} }
@Test @Test
public void testPersistence() { void testPersistence() {
saveRegistrar("TheRegistrar"); saveRegistrar("TheRegistrar");
HostResource host = newHostResourceWithRoid("ns1.example.com", "host1"); HostResource host = newHostResourceWithRoid("ns1.example.com", "host1");

8
core/src/test/java/google/registry/model/registry/label/ReservedListSqlDaoTest.java
View file

@ -64,7 +64,7 @@ public class ReservedListSqlDaoTest {
} }
@Test @Test
public void save_worksSuccessfully() { void save_worksSuccessfully() {
ReservedListSqlDao.save(testReservedList); ReservedListSqlDao.save(testReservedList);
jpaTm() jpaTm()
.transact( .transact(
@ -82,14 +82,14 @@ public class ReservedListSqlDaoTest {
} }
@Test @Test
public void checkExists_worksSuccessfully() { void checkExists_worksSuccessfully() {
assertThat(ReservedListSqlDao.checkExists("testlist")).isFalse(); assertThat(ReservedListSqlDao.checkExists("testlist")).isFalse();
ReservedListSqlDao.save(testReservedList); ReservedListSqlDao.save(testReservedList);
assertThat(ReservedListSqlDao.checkExists("testlist")).isTrue(); assertThat(ReservedListSqlDao.checkExists("testlist")).isTrue();
} }
@Test @Test
public void getLatestRevision_worksSuccessfully() { void getLatestRevision_worksSuccessfully() {
assertThat(ReservedListSqlDao.getLatestRevision("testlist").isPresent()).isFalse(); assertThat(ReservedListSqlDao.getLatestRevision("testlist").isPresent()).isFalse();
ReservedListSqlDao.save(testReservedList); ReservedListSqlDao.save(testReservedList);
ReservedList persistedList = ReservedListSqlDao.getLatestRevision("testlist").get(); ReservedList persistedList = ReservedListSqlDao.getLatestRevision("testlist").get();
@ -101,7 +101,7 @@ public class ReservedListSqlDaoTest {
} }
@Test @Test
public void getLatestRevision_returnsLatestRevision() { void getLatestRevision_returnsLatestRevision() {
ReservedListSqlDao.save( ReservedListSqlDao.save(
new ReservedList.Builder() new ReservedList.Builder()
.setName("testlist") .setName("testlist")

2
core/src/test/java/google/registry/persistence/converter/DurationConverterTest.java
View file

@ -38,7 +38,7 @@ public class DurationConverterTest {
private final DurationConverter converter = new DurationConverter(); private final DurationConverter converter = new DurationConverter();
@Test @Test
public void testNulls() { void testNulls() {
assertThat(converter.convertToDatabaseColumn(null)).isEqualTo(new PGInterval()); assertThat(converter.convertToDatabaseColumn(null)).isEqualTo(new PGInterval());
assertThat(converter.convertToEntityAttribute(new PGInterval())).isNull(); assertThat(converter.convertToEntityAttribute(new PGInterval())).isNull();
} }

12
core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerImplTest.java
View file

@ -140,7 +140,7 @@ class JpaTransactionManagerImplTest {
} }
@Test @Test
public void transact_retriesOptimisticLockExceptions() { void transact_retriesOptimisticLockExceptions() {
JpaTransactionManager spyJpaTm = spy(jpaTm()); JpaTransactionManager spyJpaTm = spy(jpaTm());
doThrow(OptimisticLockException.class).when(spyJpaTm).delete(any(VKey.class)); doThrow(OptimisticLockException.class).when(spyJpaTm).delete(any(VKey.class));
spyJpaTm.transact(() -> spyJpaTm.saveNew(theEntity)); spyJpaTm.transact(() -> spyJpaTm.saveNew(theEntity));
@ -159,7 +159,7 @@ class JpaTransactionManagerImplTest {
} }
@Test @Test
public void transactNoRetry_doesNotRetryOptimisticLockException() { void transactNoRetry_doesNotRetryOptimisticLockException() {
JpaTransactionManager spyJpaTm = spy(jpaTm()); JpaTransactionManager spyJpaTm = spy(jpaTm());
doThrow(OptimisticLockException.class).when(spyJpaTm).delete(any(VKey.class)); doThrow(OptimisticLockException.class).when(spyJpaTm).delete(any(VKey.class));
spyJpaTm.transactNoRetry(() -> spyJpaTm.saveNew(theEntity)); spyJpaTm.transactNoRetry(() -> spyJpaTm.saveNew(theEntity));
@ -178,7 +178,7 @@ class JpaTransactionManagerImplTest {
} }
@Test @Test
public void transact_retriesNestedOptimisticLockExceptions() { void transact_retriesNestedOptimisticLockExceptions() {
JpaTransactionManager spyJpaTm = spy(jpaTm()); JpaTransactionManager spyJpaTm = spy(jpaTm());
doThrow(new RuntimeException().initCause(new OptimisticLockException())) doThrow(new RuntimeException().initCause(new OptimisticLockException()))
.when(spyJpaTm) .when(spyJpaTm)
@ -198,7 +198,7 @@ class JpaTransactionManagerImplTest {
} }
@Test @Test
public void transactNewReadOnly_retriesJdbcConnectionExceptions() { void transactNewReadOnly_retriesJdbcConnectionExceptions() {
JpaTransactionManager spyJpaTm = spy(jpaTm()); JpaTransactionManager spyJpaTm = spy(jpaTm());
doThrow(JDBCConnectionException.class).when(spyJpaTm).load(any(VKey.class)); doThrow(JDBCConnectionException.class).when(spyJpaTm).load(any(VKey.class));
spyJpaTm.transact(() -> spyJpaTm.saveNew(theEntity)); spyJpaTm.transact(() -> spyJpaTm.saveNew(theEntity));
@ -217,7 +217,7 @@ class JpaTransactionManagerImplTest {
} }
@Test @Test
public void transactNewReadOnly_retriesNestedJdbcConnectionExceptions() { void transactNewReadOnly_retriesNestedJdbcConnectionExceptions() {
JpaTransactionManager spyJpaTm = spy(jpaTm()); JpaTransactionManager spyJpaTm = spy(jpaTm());
doThrow( doThrow(
new RuntimeException() new RuntimeException()
@ -240,7 +240,7 @@ class JpaTransactionManagerImplTest {
} }
@Test @Test
public void doTransactionless_retriesJdbcConnectionExceptions() { void doTransactionless_retriesJdbcConnectionExceptions() {
JpaTransactionManager spyJpaTm = spy(jpaTm()); JpaTransactionManager spyJpaTm = spy(jpaTm());
doThrow(JDBCConnectionException.class).when(spyJpaTm).load(any(VKey.class)); doThrow(JDBCConnectionException.class).when(spyJpaTm).load(any(VKey.class));
spyJpaTm.transact(() -> spyJpaTm.saveNew(theEntity)); spyJpaTm.transact(() -> spyJpaTm.saveNew(theEntity));

20
core/src/test/java/google/registry/persistence/transaction/TransactionTest.java
View file

@ -34,28 +34,26 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.extension.RegisterExtension;
public class TransactionTest { class TransactionTest {
@RegisterExtension @RegisterExtension
public final AppEngineExtension appEngine = final AppEngineExtension appEngine =
AppEngineExtension.builder() AppEngineExtension.builder()
.withDatastoreAndCloudSql() .withDatastoreAndCloudSql()
.withOfyTestEntities(TestEntity.class) .withOfyTestEntities(TestEntity.class)
.withJpaUnitTestEntities(TestEntity.class) .withJpaUnitTestEntities(TestEntity.class)
.build(); .build();
TestEntity fooEntity, barEntity; private TestEntity fooEntity, barEntity;
public TransactionTest() {}
@BeforeEach @BeforeEach
public void setUp() { void beforeEach() {
fooEntity = new TestEntity("foo"); fooEntity = new TestEntity("foo");
barEntity = new TestEntity("bar"); barEntity = new TestEntity("bar");
} }
@Test @Test
public void testTransactionReplay() { void testTransactionReplay() {
Transaction txn = new Transaction.Builder().addUpdate(fooEntity).addUpdate(barEntity).build(); Transaction txn = new Transaction.Builder().addUpdate(fooEntity).addUpdate(barEntity).build();
txn.writeToDatastore(); txn.writeToDatastore();
@ -72,7 +70,7 @@ public class TransactionTest {
} }
@Test @Test
public void testSerialization() throws Exception { void testSerialization() throws Exception {
Transaction txn = new Transaction.Builder().addUpdate(barEntity).build(); Transaction txn = new Transaction.Builder().addUpdate(barEntity).build();
txn.writeToDatastore(); txn.writeToDatastore();
@ -90,7 +88,7 @@ public class TransactionTest {
} }
@Test @Test
public void testDeserializationErrors() throws Exception { void testDeserializationErrors() throws Exception {
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();
ObjectOutputStream out = new ObjectOutputStream(baos); ObjectOutputStream out = new ObjectOutputStream(baos);
out.writeInt(12345); out.writeInt(12345);
@ -103,7 +101,7 @@ public class TransactionTest {
} }
@Test @Test
public void testTransactionSerialization() throws IOException { void testTransactionSerialization() throws IOException {
RegistryConfig.overrideCloudSqlReplicateTransactions(true); RegistryConfig.overrideCloudSqlReplicateTransactions(true);
try { try {
jpaTm() jpaTm()
@ -134,7 +132,7 @@ public class TransactionTest {
} }
@Test @Test
public void testTransactionSerializationDisabledByDefault() { void testTransactionSerializationDisabledByDefault() {
jpaTm() jpaTm()
.transact( .transact(
() -> { () -> {

12
core/src/test/java/google/registry/rde/RdeStagingReducerTest.java
View file

@ -61,7 +61,7 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.extension.RegisterExtension;
/** Unit tests for {@link RdeStagingReducer}. */ /** Unit tests for {@link RdeStagingReducer}. */
public class RdeStagingReducerTest { class RdeStagingReducerTest {
@RegisterExtension @RegisterExtension
AppEngineExtension appEngineRule = AppEngineExtension appEngineRule =
@ -103,7 +103,7 @@ public class RdeStagingReducerTest {
ValidationMode.STRICT); ValidationMode.STRICT);
@BeforeEach @BeforeEach
public void setUp() { void beforeEach() {
createTld("soy"); createTld("soy");
CursorDao.saveCursor(Cursor.create(CursorType.BRDA, now, Registry.get("soy")), "soy"); CursorDao.saveCursor(Cursor.create(CursorType.BRDA, now, Registry.get("soy")), "soy");
CursorDao.saveCursor(Cursor.create(CursorType.RDE_STAGING, now, Registry.get("soy")), "soy"); CursorDao.saveCursor(Cursor.create(CursorType.RDE_STAGING, now, Registry.get("soy")), "soy");
@ -115,7 +115,7 @@ public class RdeStagingReducerTest {
} }
@Test @Test
public void testSuccess_BRDA() throws Exception { void testSuccess_BRDA() throws Exception {
key = PendingDeposit.create("soy", now, THIN, CursorType.BRDA, Duration.standardDays(1)); key = PendingDeposit.create("soy", now, THIN, CursorType.BRDA, Duration.standardDays(1));
reducer.reduce(key, brdaFragments); reducer.reduce(key, brdaFragments);
String outputFile = decryptGhostrydeGcsFile("soy_2000-01-01_thin_S1_R1.xml.ghostryde"); String outputFile = decryptGhostrydeGcsFile("soy_2000-01-01_thin_S1_R1.xml.ghostryde");
@ -143,7 +143,7 @@ public class RdeStagingReducerTest {
} }
@Test @Test
public void testSuccess_BRDA_manual() throws Exception { void testSuccess_BRDA_manual() throws Exception {
key = PendingDeposit.createInManualOperation("soy", now, THIN, "", 0); key = PendingDeposit.createInManualOperation("soy", now, THIN, "", 0);
reducer.reduce(key, brdaFragments); reducer.reduce(key, brdaFragments);
String outputFile = decryptGhostrydeGcsFile("manual/soy_2000-01-01_thin_S1_R0.xml.ghostryde"); String outputFile = decryptGhostrydeGcsFile("manual/soy_2000-01-01_thin_S1_R0.xml.ghostryde");
@ -167,7 +167,7 @@ public class RdeStagingReducerTest {
} }
@Test @Test
public void testSuccess_RDE() throws Exception { void testSuccess_RDE() throws Exception {
key = PendingDeposit.create("soy", now, FULL, CursorType.RDE_STAGING, Duration.standardDays(1)); key = PendingDeposit.create("soy", now, FULL, CursorType.RDE_STAGING, Duration.standardDays(1));
reducer.reduce(key, rdeFragments); reducer.reduce(key, rdeFragments);
String outputFile = decryptGhostrydeGcsFile("soy_2000-01-01_full_S1_R1.xml.ghostryde"); String outputFile = decryptGhostrydeGcsFile("soy_2000-01-01_full_S1_R1.xml.ghostryde");
@ -189,7 +189,7 @@ public class RdeStagingReducerTest {
} }
@Test @Test
public void testSuccess_RDE_manual() throws Exception { void testSuccess_RDE_manual() throws Exception {
key = PendingDeposit.createInManualOperation("soy", now, FULL, "", 0); key = PendingDeposit.createInManualOperation("soy", now, FULL, "", 0);
reducer.reduce(key, rdeFragments); reducer.reduce(key, rdeFragments);
String outputFile = decryptGhostrydeGcsFile("manual/soy_2000-01-01_full_S1_R0.xml.ghostryde"); String outputFile = decryptGhostrydeGcsFile("manual/soy_2000-01-01_full_S1_R0.xml.ghostryde");

48
core/src/test/java/google/registry/schema/cursor/CursorDaoTest.java
View file

@ -42,7 +42,7 @@ public class CursorDaoTest {
private final Logger loggerToIntercept = Logger.getLogger(CursorDao.class.getCanonicalName()); private final Logger loggerToIntercept = Logger.getLogger(CursorDao.class.getCanonicalName());
@RegisterExtension @RegisterExtension
public final AppEngineExtension appEngine = final AppEngineExtension appEngine =
AppEngineExtension.builder() AppEngineExtension.builder()
.withDatastoreAndCloudSql() .withDatastoreAndCloudSql()
.enableJpaEntityCoverageCheck(true) .enableJpaEntityCoverageCheck(true)
@ -50,7 +50,7 @@ public class CursorDaoTest {
.build(); .build();
@Test @Test
public void save_worksSuccessfullyOnNewCursor() { void save_worksSuccessfullyOnNewCursor() {
Cursor cursor = Cursor.create(CursorType.BRDA, "tld", fakeClock.nowUtc()); Cursor cursor = Cursor.create(CursorType.BRDA, "tld", fakeClock.nowUtc());
CursorDao.save(cursor); CursorDao.save(cursor);
Cursor returnedCursor = CursorDao.load(CursorType.BRDA, "tld"); Cursor returnedCursor = CursorDao.load(CursorType.BRDA, "tld");
@ -58,7 +58,7 @@ public class CursorDaoTest {
} }
@Test @Test
public void save_worksSuccessfullyOnExistingCursor() { void save_worksSuccessfullyOnExistingCursor() {
Cursor cursor = Cursor.create(CursorType.RDE_REPORT, "tld", fakeClock.nowUtc()); Cursor cursor = Cursor.create(CursorType.RDE_REPORT, "tld", fakeClock.nowUtc());
CursorDao.save(cursor); CursorDao.save(cursor);
Cursor cursor2 = Cursor.create(CursorType.RDE_REPORT, "tld", fakeClock.nowUtc().plusDays(3)); Cursor cursor2 = Cursor.create(CursorType.RDE_REPORT, "tld", fakeClock.nowUtc().plusDays(3));
@ -68,7 +68,7 @@ public class CursorDaoTest {
} }
@Test @Test
public void save_worksSuccessfullyOnNewGlobalCursor() { void save_worksSuccessfullyOnNewGlobalCursor() {
Cursor cursor = Cursor.createGlobal(CursorType.RECURRING_BILLING, fakeClock.nowUtc()); Cursor cursor = Cursor.createGlobal(CursorType.RECURRING_BILLING, fakeClock.nowUtc());
CursorDao.save(cursor); CursorDao.save(cursor);
Cursor returnedCursor = CursorDao.load(CursorType.RECURRING_BILLING); Cursor returnedCursor = CursorDao.load(CursorType.RECURRING_BILLING);
@ -76,7 +76,7 @@ public class CursorDaoTest {
} }
@Test @Test
public void save_worksSuccessfullyOnExistingGlobalCursor() { void save_worksSuccessfullyOnExistingGlobalCursor() {
Cursor cursor = Cursor.createGlobal(CursorType.RECURRING_BILLING, fakeClock.nowUtc()); Cursor cursor = Cursor.createGlobal(CursorType.RECURRING_BILLING, fakeClock.nowUtc());
CursorDao.save(cursor); CursorDao.save(cursor);
Cursor cursor2 = Cursor cursor2 =
@ -87,7 +87,7 @@ public class CursorDaoTest {
} }
@Test @Test
public void saveAll_worksSuccessfully() { void saveAll_worksSuccessfully() {
Cursor cursor = Cursor.createGlobal(CursorType.RECURRING_BILLING, fakeClock.nowUtc()); Cursor cursor = Cursor.createGlobal(CursorType.RECURRING_BILLING, fakeClock.nowUtc());
Cursor cursor2 = Cursor.create(CursorType.RDE_REPORT, "tld", fakeClock.nowUtc()); Cursor cursor2 = Cursor.create(CursorType.RDE_REPORT, "tld", fakeClock.nowUtc());
ImmutableSet<Cursor> cursors = ImmutableSet.<Cursor>builder().add(cursor, cursor2).build(); ImmutableSet<Cursor> cursors = ImmutableSet.<Cursor>builder().add(cursor, cursor2).build();
@ -98,13 +98,13 @@ public class CursorDaoTest {
} }
@Test @Test
public void saveAll_worksSuccessfullyEmptySet() { void saveAll_worksSuccessfullyEmptySet() {
CursorDao.saveAll(ImmutableSet.of()); CursorDao.saveAll(ImmutableSet.of());
assertThat(CursorDao.loadAll()).isEmpty(); assertThat(CursorDao.loadAll()).isEmpty();
} }
@Test @Test
public void load_worksSuccessfully() { void load_worksSuccessfully() {
Cursor cursor = Cursor.createGlobal(CursorType.RECURRING_BILLING, fakeClock.nowUtc()); Cursor cursor = Cursor.createGlobal(CursorType.RECURRING_BILLING, fakeClock.nowUtc());
Cursor cursor2 = Cursor.create(CursorType.RDE_REPORT, "tld", fakeClock.nowUtc()); Cursor cursor2 = Cursor.create(CursorType.RDE_REPORT, "tld", fakeClock.nowUtc());
Cursor cursor3 = Cursor.create(CursorType.RDE_REPORT, "foo", fakeClock.nowUtc()); Cursor cursor3 = Cursor.create(CursorType.RDE_REPORT, "foo", fakeClock.nowUtc());
@ -119,7 +119,7 @@ public class CursorDaoTest {
} }
@Test @Test
public void loadAll_worksSuccessfully() { void loadAll_worksSuccessfully() {
Cursor cursor = Cursor.createGlobal(CursorType.RECURRING_BILLING, fakeClock.nowUtc()); Cursor cursor = Cursor.createGlobal(CursorType.RECURRING_BILLING, fakeClock.nowUtc());
Cursor cursor2 = Cursor.create(CursorType.RDE_REPORT, "tld", fakeClock.nowUtc()); Cursor cursor2 = Cursor.create(CursorType.RDE_REPORT, "tld", fakeClock.nowUtc());
Cursor cursor3 = Cursor.create(CursorType.RDE_REPORT, "foo", fakeClock.nowUtc()); Cursor cursor3 = Cursor.create(CursorType.RDE_REPORT, "foo", fakeClock.nowUtc());
@ -130,13 +130,13 @@ public class CursorDaoTest {
} }
@Test @Test
public void loadAll_worksSuccessfullyEmptyTable() { void loadAll_worksSuccessfullyEmptyTable() {
List<Cursor> returnedCursors = CursorDao.loadAll(); List<Cursor> returnedCursors = CursorDao.loadAll();
assertThat(returnedCursors.size()).isEqualTo(0); assertThat(returnedCursors.size()).isEqualTo(0);
} }
@Test @Test
public void loadByType_worksSuccessfully() { void loadByType_worksSuccessfully() {
Cursor cursor = Cursor.createGlobal(CursorType.RECURRING_BILLING, fakeClock.nowUtc()); Cursor cursor = Cursor.createGlobal(CursorType.RECURRING_BILLING, fakeClock.nowUtc());
Cursor cursor2 = Cursor.create(CursorType.RDE_REPORT, "tld", fakeClock.nowUtc()); Cursor cursor2 = Cursor.create(CursorType.RDE_REPORT, "tld", fakeClock.nowUtc());
Cursor cursor3 = Cursor.create(CursorType.RDE_REPORT, "foo", fakeClock.nowUtc()); Cursor cursor3 = Cursor.create(CursorType.RDE_REPORT, "foo", fakeClock.nowUtc());
@ -147,13 +147,13 @@ public class CursorDaoTest {
} }
@Test @Test
public void loadByType_worksSuccessfullyNoneOfType() { void loadByType_worksSuccessfullyNoneOfType() {
List<Cursor> returnedCursors = CursorDao.loadByType(CursorType.RDE_REPORT); List<Cursor> returnedCursors = CursorDao.loadByType(CursorType.RDE_REPORT);
assertThat(returnedCursors.size()).isEqualTo(0); assertThat(returnedCursors.size()).isEqualTo(0);
} }
@Test @Test
public void saveCursor_worksSuccessfully() { void saveCursor_worksSuccessfully() {
createTld("tld"); createTld("tld");
google.registry.model.common.Cursor cursor = google.registry.model.common.Cursor cursor =
google.registry.model.common.Cursor.create( google.registry.model.common.Cursor.create(
@ -172,7 +172,7 @@ public class CursorDaoTest {
} }
@Test @Test
public void saveCursor_worksSuccessfullyOnGlobalCursor() { void saveCursor_worksSuccessfullyOnGlobalCursor() {
google.registry.model.common.Cursor cursor = google.registry.model.common.Cursor cursor =
google.registry.model.common.Cursor.createGlobal( google.registry.model.common.Cursor.createGlobal(
CursorType.RECURRING_BILLING, fakeClock.nowUtc()); CursorType.RECURRING_BILLING, fakeClock.nowUtc());
@ -188,7 +188,7 @@ public class CursorDaoTest {
} }
@Test @Test
public void saveCursors_worksSuccessfully() { void saveCursors_worksSuccessfully() {
createTlds("tld", "foo"); createTlds("tld", "foo");
google.registry.model.common.Cursor cursor1 = google.registry.model.common.Cursor cursor1 =
google.registry.model.common.Cursor.create( google.registry.model.common.Cursor.create(
@ -237,7 +237,7 @@ public class CursorDaoTest {
} }
@Test @Test
public void loadAndCompare_worksSuccessfully() { void loadAndCompare_worksSuccessfully() {
loggerToIntercept.addHandler(logHandler); loggerToIntercept.addHandler(logHandler);
createTld("tld"); createTld("tld");
google.registry.model.common.Cursor cursor = google.registry.model.common.Cursor cursor =
@ -249,7 +249,7 @@ public class CursorDaoTest {
} }
@Test @Test
public void loadAndCompare_worksSuccessfullyGlobalCursor() { void loadAndCompare_worksSuccessfullyGlobalCursor() {
loggerToIntercept.addHandler(logHandler); loggerToIntercept.addHandler(logHandler);
google.registry.model.common.Cursor cursor = google.registry.model.common.Cursor cursor =
google.registry.model.common.Cursor.createGlobal( google.registry.model.common.Cursor.createGlobal(
@ -260,7 +260,7 @@ public class CursorDaoTest {
} }
@Test @Test
public void loadAndCompare_worksSuccessfullyCursorNotInCloudSql() { void loadAndCompare_worksSuccessfullyCursorNotInCloudSql() {
loggerToIntercept.addHandler(logHandler); loggerToIntercept.addHandler(logHandler);
createTld("tld"); createTld("tld");
google.registry.model.common.Cursor cursor = google.registry.model.common.Cursor cursor =
@ -275,7 +275,7 @@ public class CursorDaoTest {
} }
@Test @Test
public void loadAndCompare_worksSuccessfullyGlobalCursorNotInCloudSql() { void loadAndCompare_worksSuccessfullyGlobalCursorNotInCloudSql() {
loggerToIntercept.addHandler(logHandler); loggerToIntercept.addHandler(logHandler);
google.registry.model.common.Cursor cursor = google.registry.model.common.Cursor cursor =
google.registry.model.common.Cursor.createGlobal( google.registry.model.common.Cursor.createGlobal(
@ -289,7 +289,7 @@ public class CursorDaoTest {
} }
@Test @Test
public void loadAndCompare_worksSuccessfullyCursorsNotEqual() { void loadAndCompare_worksSuccessfullyCursorsNotEqual() {
loggerToIntercept.addHandler(logHandler); loggerToIntercept.addHandler(logHandler);
createTld("tld"); createTld("tld");
google.registry.model.common.Cursor cursor = google.registry.model.common.Cursor cursor =
@ -310,7 +310,7 @@ public class CursorDaoTest {
} }
@Test @Test
public void loadAndCompareAll_worksSuccessfully() { void loadAndCompareAll_worksSuccessfully() {
loggerToIntercept.addHandler(logHandler); loggerToIntercept.addHandler(logHandler);
// Create Datastore cursors // Create Datastore cursors
@ -335,7 +335,7 @@ public class CursorDaoTest {
} }
@Test @Test
public void loadAndCompareAll_worksSuccessfullyMissingOne() { void loadAndCompareAll_worksSuccessfullyMissingOne() {
loggerToIntercept.addHandler(logHandler); loggerToIntercept.addHandler(logHandler);
// Create Datastore cursors // Create Datastore cursors
@ -371,7 +371,7 @@ public class CursorDaoTest {
} }
@Test @Test
public void loadAndCompareAll_worksSuccessfullyOneWithWrongTime() { void loadAndCompareAll_worksSuccessfullyOneWithWrongTime() {
loggerToIntercept.addHandler(logHandler); loggerToIntercept.addHandler(logHandler);
// Create Datastore cursors // Create Datastore cursors
@ -404,7 +404,7 @@ public class CursorDaoTest {
} }
@Test @Test
public void loadAndCompareAll_worksSuccessfullyEmptyMap() { void loadAndCompareAll_worksSuccessfullyEmptyMap() {
loggerToIntercept.addHandler(logHandler); loggerToIntercept.addHandler(logHandler);
CursorDao.loadAndCompareAll(ImmutableMap.of(), CursorType.ICANN_UPLOAD_ACTIVITY); CursorDao.loadAndCompareAll(ImmutableMap.of(), CursorType.ICANN_UPLOAD_ACTIVITY);
assertAboutLogs().that(logHandler).hasNoLogsAtLevel(Level.WARNING); assertAboutLogs().that(logHandler).hasNoLogsAtLevel(Level.WARNING);

28
core/src/test/java/google/registry/schema/server/LockDaoTest.java
View file

@ -39,14 +39,14 @@ public class LockDaoTest {
@RegisterExtension @RegisterExtension
@Order(value = 1) @Order(value = 1)
public DatastoreEntityExtension datastoreEntityExtension = new DatastoreEntityExtension(); DatastoreEntityExtension datastoreEntityExtension = new DatastoreEntityExtension();
@RegisterExtension @RegisterExtension
public final JpaIntegrationWithCoverageExtension jpa = final JpaIntegrationWithCoverageExtension jpa =
new JpaTestRules.Builder().withClock(fakeClock).buildIntegrationWithCoverageExtension(); new JpaTestRules.Builder().withClock(fakeClock).buildIntegrationWithCoverageExtension();
@Test @Test
public void save_worksSuccessfully() { void save_worksSuccessfully() {
Lock lock = Lock lock =
Lock.create("testResource", "tld", "testLogId", fakeClock.nowUtc(), Duration.millis(2)); Lock.create("testResource", "tld", "testLogId", fakeClock.nowUtc(), Duration.millis(2));
LockDao.save(lock); LockDao.save(lock);
@ -56,7 +56,7 @@ public class LockDaoTest {
} }
@Test @Test
public void save_succeedsWhenLockAlreadyExists() { void save_succeedsWhenLockAlreadyExists() {
Lock lock = Lock lock =
Lock.create("testResource", "tld", "testLogId", fakeClock.nowUtc(), Duration.millis(2)); Lock.create("testResource", "tld", "testLogId", fakeClock.nowUtc(), Duration.millis(2));
LockDao.save(lock); LockDao.save(lock);
@ -67,7 +67,7 @@ public class LockDaoTest {
} }
@Test @Test
public void save_worksSuccesfullyGlobalLock() { void save_worksSuccesfullyGlobalLock() {
Lock lock = Lock lock =
Lock.createGlobal("testResource", "testLogId", fakeClock.nowUtc(), Duration.millis(2)); Lock.createGlobal("testResource", "testLogId", fakeClock.nowUtc(), Duration.millis(2));
LockDao.save(lock); LockDao.save(lock);
@ -77,7 +77,7 @@ public class LockDaoTest {
} }
@Test @Test
public void load_worksSuccessfully() { void load_worksSuccessfully() {
Lock lock = Lock lock =
Lock.create("testResource", "tld", "testLogId", fakeClock.nowUtc(), Duration.millis(2)); Lock.create("testResource", "tld", "testLogId", fakeClock.nowUtc(), Duration.millis(2));
LockDao.save(lock); LockDao.save(lock);
@ -87,7 +87,7 @@ public class LockDaoTest {
} }
@Test @Test
public void load_worksSuccessfullyGlobalLock() { void load_worksSuccessfullyGlobalLock() {
Lock lock = Lock lock =
Lock.createGlobal("testResource", "testLogId", fakeClock.nowUtc(), Duration.millis(2)); Lock.createGlobal("testResource", "testLogId", fakeClock.nowUtc(), Duration.millis(2));
LockDao.save(lock); LockDao.save(lock);
@ -97,13 +97,13 @@ public class LockDaoTest {
} }
@Test @Test
public void load_worksSuccesfullyLockDoesNotExist() { void load_worksSuccesfullyLockDoesNotExist() {
Optional<Lock> returnedLock = LockDao.load("testResource", "tld"); Optional<Lock> returnedLock = LockDao.load("testResource", "tld");
assertThat(returnedLock.isPresent()).isFalse(); assertThat(returnedLock.isPresent()).isFalse();
} }
@Test @Test
public void delete_worksSuccesfully() { void delete_worksSuccesfully() {
Lock lock = Lock lock =
Lock.create("testResource", "tld", "testLogId", fakeClock.nowUtc(), Duration.millis(2)); Lock.create("testResource", "tld", "testLogId", fakeClock.nowUtc(), Duration.millis(2));
LockDao.save(lock); LockDao.save(lock);
@ -115,7 +115,7 @@ public class LockDaoTest {
} }
@Test @Test
public void delete_worksSuccessfullyGlobalLock() { void delete_worksSuccessfullyGlobalLock() {
Lock lock = Lock lock =
Lock.createGlobal("testResource", "testLogId", fakeClock.nowUtc(), Duration.millis(2)); Lock.createGlobal("testResource", "testLogId", fakeClock.nowUtc(), Duration.millis(2));
LockDao.save(lock); LockDao.save(lock);
@ -127,12 +127,12 @@ public class LockDaoTest {
} }
@Test @Test
public void delete_succeedsLockDoesntExist() { void delete_succeedsLockDoesntExist() {
LockDao.delete("testResource"); LockDao.delete("testResource");
} }
@Test @Test
public void compare_logsWarningWhenCloudSqlLockMissing() { void compare_logsWarningWhenCloudSqlLockMissing() {
loggerToIntercept.addHandler(logHandler); loggerToIntercept.addHandler(logHandler);
google.registry.model.server.Lock datastoreLock = google.registry.model.server.Lock datastoreLock =
google.registry.model.server.Lock.create( google.registry.model.server.Lock.create(
@ -146,7 +146,7 @@ public class LockDaoTest {
} }
@Test @Test
public void compare_logsWarningWhenCloudSqlLockExistsWhenItShouldNot() { void compare_logsWarningWhenCloudSqlLockExistsWhenItShouldNot() {
loggerToIntercept.addHandler(logHandler); loggerToIntercept.addHandler(logHandler);
Lock lock = Lock lock =
Lock.createGlobal("testResource", "testLogId", fakeClock.nowUtc(), Duration.millis(2)); Lock.createGlobal("testResource", "testLogId", fakeClock.nowUtc(), Duration.millis(2));
@ -159,7 +159,7 @@ public class LockDaoTest {
} }
@Test @Test
public void compare_logsWarningWhenLocksDontMatch() { void compare_logsWarningWhenLocksDontMatch() {
loggerToIntercept.addHandler(logHandler); loggerToIntercept.addHandler(logHandler);
Lock cloudSqlLock = Lock cloudSqlLock =
Lock.create("testResource", "tld", "testLogId", fakeClock.nowUtc(), Duration.millis(2)); Lock.create("testResource", "tld", "testLogId", fakeClock.nowUtc(), Duration.millis(2));

26
core/src/test/java/google/registry/schema/tld/PremiumListDaoTest.java
View file

@ -46,7 +46,7 @@ public class PremiumListDaoTest {
private final FakeClock fakeClock = new FakeClock(); private final FakeClock fakeClock = new FakeClock();
@RegisterExtension @RegisterExtension
public final AppEngineExtension appEngine = final AppEngineExtension appEngine =
AppEngineExtension.builder() AppEngineExtension.builder()
.withDatastoreAndCloudSql() .withDatastoreAndCloudSql()
.enableJpaEntityCoverageCheck(true) .enableJpaEntityCoverageCheck(true)
@ -58,7 +58,7 @@ public class PremiumListDaoTest {
private PremiumList testList; private PremiumList testList;
@BeforeEach @BeforeEach
void setUp() { void beforeEach() {
testPrices = testPrices =
ImmutableMap.of( ImmutableMap.of(
"silver", "silver",
@ -77,7 +77,7 @@ public class PremiumListDaoTest {
} }
@Test @Test
public void saveNew_worksSuccessfully() { void saveNew_worksSuccessfully() {
PremiumListDao.saveNew(testList); PremiumListDao.saveNew(testList);
jpaTm() jpaTm()
.transact( .transact(
@ -91,7 +91,7 @@ public class PremiumListDaoTest {
} }
@Test @Test
public void update_worksSuccessfully() { void update_worksSuccessfully() {
PremiumListDao.saveNew(testList); PremiumListDao.saveNew(testList);
Optional<PremiumList> persistedList = PremiumListDao.getLatestRevision("testname"); Optional<PremiumList> persistedList = PremiumListDao.getLatestRevision("testname");
assertThat(persistedList).isPresent(); assertThat(persistedList).isPresent();
@ -132,7 +132,7 @@ public class PremiumListDaoTest {
} }
@Test @Test
public void saveNew_throwsWhenPremiumListAlreadyExists() { void saveNew_throwsWhenPremiumListAlreadyExists() {
PremiumListDao.saveNew(testList); PremiumListDao.saveNew(testList);
IllegalArgumentException thrown = IllegalArgumentException thrown =
assertThrows(IllegalArgumentException.class, () -> PremiumListDao.saveNew(testList)); assertThrows(IllegalArgumentException.class, () -> PremiumListDao.saveNew(testList));
@ -142,7 +142,7 @@ public class PremiumListDaoTest {
// TODO(b/147246613): Un-ignore this. // TODO(b/147246613): Un-ignore this.
@Test @Test
@Disabled @Disabled
public void update_throwsWhenListDoesntExist() { void update_throwsWhenListDoesntExist() {
IllegalArgumentException thrown = IllegalArgumentException thrown =
assertThrows(IllegalArgumentException.class, () -> PremiumListDao.update(testList)); assertThrows(IllegalArgumentException.class, () -> PremiumListDao.update(testList));
assertThat(thrown) assertThat(thrown)
@ -151,19 +151,19 @@ public class PremiumListDaoTest {
} }
@Test @Test
public void checkExists_worksSuccessfully() { void checkExists_worksSuccessfully() {
assertThat(PremiumListDao.checkExists("testname")).isFalse(); assertThat(PremiumListDao.checkExists("testname")).isFalse();
PremiumListDao.saveNew(testList); PremiumListDao.saveNew(testList);
assertThat(PremiumListDao.checkExists("testname")).isTrue(); assertThat(PremiumListDao.checkExists("testname")).isTrue();
} }
@Test @Test
public void getLatestRevision_returnsEmptyForNonexistentList() { void getLatestRevision_returnsEmptyForNonexistentList() {
assertThat(PremiumListDao.getLatestRevision("nonexistentlist")).isEmpty(); assertThat(PremiumListDao.getLatestRevision("nonexistentlist")).isEmpty();
} }
@Test @Test
public void getLatestRevision_worksSuccessfully() { void getLatestRevision_worksSuccessfully() {
PremiumListDao.saveNew( PremiumListDao.saveNew(
new PremiumList.Builder() new PremiumList.Builder()
.setName("list1") .setName("list1")
@ -191,13 +191,13 @@ public class PremiumListDaoTest {
} }
@Test @Test
public void getPremiumPrice_returnsNoneWhenNoPremiumListConfigured() { void getPremiumPrice_returnsNoneWhenNoPremiumListConfigured() {
persistResource(newRegistry("foobar", "FOOBAR").asBuilder().setPremiumList(null).build()); persistResource(newRegistry("foobar", "FOOBAR").asBuilder().setPremiumList(null).build());
assertThat(PremiumListDao.getPremiumPrice("rich", Registry.get("foobar"))).isEmpty(); assertThat(PremiumListDao.getPremiumPrice("rich", Registry.get("foobar"))).isEmpty();
} }
@Test @Test
public void getPremiumPrice_worksSuccessfully() { void getPremiumPrice_worksSuccessfully() {
persistResource( persistResource(
newRegistry("foobar", "FOOBAR") newRegistry("foobar", "FOOBAR")
.asBuilder() .asBuilder()
@ -222,7 +222,7 @@ public class PremiumListDaoTest {
} }
@Test @Test
public void testGetPremiumPrice_throwsWhenPremiumListCantBeLoaded() { void testGetPremiumPrice_throwsWhenPremiumListCantBeLoaded() {
createTld("tld"); createTld("tld");
IllegalStateException thrown = IllegalStateException thrown =
assertThrows( assertThrows(
@ -232,7 +232,7 @@ public class PremiumListDaoTest {
} }
@Test @Test
public void testGetPremiumPrice_worksForJPY() { void testGetPremiumPrice_worksForJPY() {
persistResource( persistResource(
newRegistry("foobar", "FOOBAR") newRegistry("foobar", "FOOBAR")
.asBuilder() .asBuilder()

6
core/src/test/java/google/registry/schema/tld/PremiumListTest.java
View file

@ -27,10 +27,10 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.api.extension.RegisterExtension;
/** Unit tests for {@link PremiumList}. */ /** Unit tests for {@link PremiumList}. */
public class PremiumListTest { class PremiumListTest {
@RegisterExtension @RegisterExtension
public DatastoreEntityExtension datastoreEntityExtension = new DatastoreEntityExtension(); DatastoreEntityExtension datastoreEntityExtension = new DatastoreEntityExtension();
private static final ImmutableMap<String, BigDecimal> TEST_PRICES = private static final ImmutableMap<String, BigDecimal> TEST_PRICES =
ImmutableMap.of( ImmutableMap.of(
@ -42,7 +42,7 @@ public class PremiumListTest {
BigDecimal.valueOf(1552.78)); BigDecimal.valueOf(1552.78));
@Test @Test
public void bloomFilter_worksCorrectly() { void bloomFilter_worksCorrectly() {
BloomFilter<String> bloomFilter = BloomFilter<String> bloomFilter =
new PremiumList.Builder() new PremiumList.Builder()
.setName("testname") .setName("testname")

14
core/src/test/java/google/registry/schema/tmch/ClaimsListDaoTest.java
View file

@ -31,15 +31,15 @@ public class ClaimsListDaoTest {
private final FakeClock fakeClock = new FakeClock(); private final FakeClock fakeClock = new FakeClock();
@RegisterExtension @RegisterExtension
public final JpaIntegrationWithCoverageExtension jpa = final JpaIntegrationWithCoverageExtension jpa =
new JpaTestRules.Builder().withClock(fakeClock).buildIntegrationWithCoverageExtension(); new JpaTestRules.Builder().withClock(fakeClock).buildIntegrationWithCoverageExtension();
@RegisterExtension @RegisterExtension
@Order(value = 1) @Order(value = 1)
public final DatastoreEntityExtension datastoreEntityExtension = new DatastoreEntityExtension(); final DatastoreEntityExtension datastoreEntityExtension = new DatastoreEntityExtension();
@Test @Test
public void trySave_insertsClaimsListSuccessfully() { void trySave_insertsClaimsListSuccessfully() {
ClaimsList claimsList = ClaimsList claimsList =
ClaimsList.create(fakeClock.nowUtc(), ImmutableMap.of("label1", "key1", "label2", "key2")); ClaimsList.create(fakeClock.nowUtc(), ImmutableMap.of("label1", "key1", "label2", "key2"));
ClaimsListDao.trySave(claimsList); ClaimsListDao.trySave(claimsList);
@ -49,7 +49,7 @@ public class ClaimsListDaoTest {
} }
@Test @Test
public void trySave_noExceptionThrownWhenSaveFail() { void trySave_noExceptionThrownWhenSaveFail() {
ClaimsList claimsList = ClaimsList claimsList =
ClaimsList.create(fakeClock.nowUtc(), ImmutableMap.of("label1", "key1", "label2", "key2")); ClaimsList.create(fakeClock.nowUtc(), ImmutableMap.of("label1", "key1", "label2", "key2"));
ClaimsListDao.trySave(claimsList); ClaimsListDao.trySave(claimsList);
@ -60,7 +60,7 @@ public class ClaimsListDaoTest {
} }
@Test @Test
public void trySave_claimsListWithNoEntries() { void trySave_claimsListWithNoEntries() {
ClaimsList claimsList = ClaimsList.create(fakeClock.nowUtc(), ImmutableMap.of()); ClaimsList claimsList = ClaimsList.create(fakeClock.nowUtc(), ImmutableMap.of());
ClaimsListDao.trySave(claimsList); ClaimsListDao.trySave(claimsList);
ClaimsList insertedClaimsList = ClaimsListDao.getLatestRevision().get(); ClaimsList insertedClaimsList = ClaimsListDao.getLatestRevision().get();
@ -69,12 +69,12 @@ public class ClaimsListDaoTest {
} }
@Test @Test
public void getCurrent_returnsEmptyListIfTableIsEmpty() { void getCurrent_returnsEmptyListIfTableIsEmpty() {
assertThat(ClaimsListDao.getLatestRevision().isPresent()).isFalse(); assertThat(ClaimsListDao.getLatestRevision().isPresent()).isFalse();
} }
@Test @Test
public void getCurrent_returnsLatestClaims() { void getCurrent_returnsLatestClaims() {
ClaimsList oldClaimsList = ClaimsList oldClaimsList =
ClaimsList.create(fakeClock.nowUtc(), ImmutableMap.of("label1", "key1", "label2", "key2")); ClaimsList.create(fakeClock.nowUtc(), ImmutableMap.of("label1", "key1", "label2", "key2"));
ClaimsList newClaimsList = ClaimsList newClaimsList =