diff --git a/core/src/test/java/google/registry/beam/initsql/InitSqlPipelineGraphTest.java b/core/src/test/java/google/registry/beam/initsql/InitSqlPipelineGraphTest.java index a62a01124..0e62a09c5 100644 --- a/core/src/test/java/google/registry/beam/initsql/InitSqlPipelineGraphTest.java +++ b/core/src/test/java/google/registry/beam/initsql/InitSqlPipelineGraphTest.java @@ -51,7 +51,7 @@ class InitSqlPipelineGraphTest { TestPipelineExtension.create().enableAbandonedNodeEnforcement(false); @Test - public void createPipeline_compareGraph() throws IOException { + void createPipeline_compareGraph() throws IOException { new InitSqlPipeline(options, testPipeline).setupPipeline(); String dotString = PipelineDotRenderer.toDotString(testPipeline); URL goldenDotUrl = Resources.getResource(InitSqlPipelineGraphTest.class, GOLDEN_DOT_FILE); diff --git a/core/src/test/java/google/registry/model/history/DomainHistoryTest.java b/core/src/test/java/google/registry/model/history/DomainHistoryTest.java index d6ca11d33..a05fc4cd4 100644 --- a/core/src/test/java/google/registry/model/history/DomainHistoryTest.java +++ b/core/src/test/java/google/registry/model/history/DomainHistoryTest.java @@ -36,12 +36,12 @@ import org.junit.jupiter.api.Test; /** Tests for {@link DomainHistory}. */ public class DomainHistoryTest extends EntityTestCase { - public DomainHistoryTest() { + DomainHistoryTest() { super(JpaEntityCoverageCheck.ENABLED); } @Test - public void testPersistence() { + void testPersistence() { saveRegistrar("TheRegistrar"); HostResource host = newHostResourceWithRoid("ns1.example.com", "host1"); diff --git a/core/src/test/java/google/registry/model/registry/label/ReservedListSqlDaoTest.java b/core/src/test/java/google/registry/model/registry/label/ReservedListSqlDaoTest.java index 574cecfd9..fe425695c 100644 --- a/core/src/test/java/google/registry/model/registry/label/ReservedListSqlDaoTest.java +++ b/core/src/test/java/google/registry/model/registry/label/ReservedListSqlDaoTest.java @@ -64,7 +64,7 @@ public class ReservedListSqlDaoTest { } @Test - public void save_worksSuccessfully() { + void save_worksSuccessfully() { ReservedListSqlDao.save(testReservedList); jpaTm() .transact( @@ -82,14 +82,14 @@ public class ReservedListSqlDaoTest { } @Test - public void checkExists_worksSuccessfully() { + void checkExists_worksSuccessfully() { assertThat(ReservedListSqlDao.checkExists("testlist")).isFalse(); ReservedListSqlDao.save(testReservedList); assertThat(ReservedListSqlDao.checkExists("testlist")).isTrue(); } @Test - public void getLatestRevision_worksSuccessfully() { + void getLatestRevision_worksSuccessfully() { assertThat(ReservedListSqlDao.getLatestRevision("testlist").isPresent()).isFalse(); ReservedListSqlDao.save(testReservedList); ReservedList persistedList = ReservedListSqlDao.getLatestRevision("testlist").get(); @@ -101,7 +101,7 @@ public class ReservedListSqlDaoTest { } @Test - public void getLatestRevision_returnsLatestRevision() { + void getLatestRevision_returnsLatestRevision() { ReservedListSqlDao.save( new ReservedList.Builder() .setName("testlist") diff --git a/core/src/test/java/google/registry/persistence/converter/DurationConverterTest.java b/core/src/test/java/google/registry/persistence/converter/DurationConverterTest.java index 46766371b..ef4dd101a 100644 --- a/core/src/test/java/google/registry/persistence/converter/DurationConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/DurationConverterTest.java @@ -38,7 +38,7 @@ public class DurationConverterTest { private final DurationConverter converter = new DurationConverter(); @Test - public void testNulls() { + void testNulls() { assertThat(converter.convertToDatabaseColumn(null)).isEqualTo(new PGInterval()); assertThat(converter.convertToEntityAttribute(new PGInterval())).isNull(); } diff --git a/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerImplTest.java b/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerImplTest.java index 360773061..5daa39f50 100644 --- a/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerImplTest.java +++ b/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerImplTest.java @@ -140,7 +140,7 @@ class JpaTransactionManagerImplTest { } @Test - public void transact_retriesOptimisticLockExceptions() { + void transact_retriesOptimisticLockExceptions() { JpaTransactionManager spyJpaTm = spy(jpaTm()); doThrow(OptimisticLockException.class).when(spyJpaTm).delete(any(VKey.class)); spyJpaTm.transact(() -> spyJpaTm.saveNew(theEntity)); @@ -159,7 +159,7 @@ class JpaTransactionManagerImplTest { } @Test - public void transactNoRetry_doesNotRetryOptimisticLockException() { + void transactNoRetry_doesNotRetryOptimisticLockException() { JpaTransactionManager spyJpaTm = spy(jpaTm()); doThrow(OptimisticLockException.class).when(spyJpaTm).delete(any(VKey.class)); spyJpaTm.transactNoRetry(() -> spyJpaTm.saveNew(theEntity)); @@ -178,7 +178,7 @@ class JpaTransactionManagerImplTest { } @Test - public void transact_retriesNestedOptimisticLockExceptions() { + void transact_retriesNestedOptimisticLockExceptions() { JpaTransactionManager spyJpaTm = spy(jpaTm()); doThrow(new RuntimeException().initCause(new OptimisticLockException())) .when(spyJpaTm) @@ -198,7 +198,7 @@ class JpaTransactionManagerImplTest { } @Test - public void transactNewReadOnly_retriesJdbcConnectionExceptions() { + void transactNewReadOnly_retriesJdbcConnectionExceptions() { JpaTransactionManager spyJpaTm = spy(jpaTm()); doThrow(JDBCConnectionException.class).when(spyJpaTm).load(any(VKey.class)); spyJpaTm.transact(() -> spyJpaTm.saveNew(theEntity)); @@ -217,7 +217,7 @@ class JpaTransactionManagerImplTest { } @Test - public void transactNewReadOnly_retriesNestedJdbcConnectionExceptions() { + void transactNewReadOnly_retriesNestedJdbcConnectionExceptions() { JpaTransactionManager spyJpaTm = spy(jpaTm()); doThrow( new RuntimeException() @@ -240,7 +240,7 @@ class JpaTransactionManagerImplTest { } @Test - public void doTransactionless_retriesJdbcConnectionExceptions() { + void doTransactionless_retriesJdbcConnectionExceptions() { JpaTransactionManager spyJpaTm = spy(jpaTm()); doThrow(JDBCConnectionException.class).when(spyJpaTm).load(any(VKey.class)); spyJpaTm.transact(() -> spyJpaTm.saveNew(theEntity)); diff --git a/core/src/test/java/google/registry/persistence/transaction/TransactionTest.java b/core/src/test/java/google/registry/persistence/transaction/TransactionTest.java index bcf9aa7b6..70004d27f 100644 --- a/core/src/test/java/google/registry/persistence/transaction/TransactionTest.java +++ b/core/src/test/java/google/registry/persistence/transaction/TransactionTest.java @@ -34,28 +34,26 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -public class TransactionTest { +class TransactionTest { @RegisterExtension - public final AppEngineExtension appEngine = + final AppEngineExtension appEngine = AppEngineExtension.builder() .withDatastoreAndCloudSql() .withOfyTestEntities(TestEntity.class) .withJpaUnitTestEntities(TestEntity.class) .build(); - TestEntity fooEntity, barEntity; - - public TransactionTest() {} + private TestEntity fooEntity, barEntity; @BeforeEach - public void setUp() { + void beforeEach() { fooEntity = new TestEntity("foo"); barEntity = new TestEntity("bar"); } @Test - public void testTransactionReplay() { + void testTransactionReplay() { Transaction txn = new Transaction.Builder().addUpdate(fooEntity).addUpdate(barEntity).build(); txn.writeToDatastore(); @@ -72,7 +70,7 @@ public class TransactionTest { } @Test - public void testSerialization() throws Exception { + void testSerialization() throws Exception { Transaction txn = new Transaction.Builder().addUpdate(barEntity).build(); txn.writeToDatastore(); @@ -90,7 +88,7 @@ public class TransactionTest { } @Test - public void testDeserializationErrors() throws Exception { + void testDeserializationErrors() throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); ObjectOutputStream out = new ObjectOutputStream(baos); out.writeInt(12345); @@ -103,7 +101,7 @@ public class TransactionTest { } @Test - public void testTransactionSerialization() throws IOException { + void testTransactionSerialization() throws IOException { RegistryConfig.overrideCloudSqlReplicateTransactions(true); try { jpaTm() @@ -134,7 +132,7 @@ public class TransactionTest { } @Test - public void testTransactionSerializationDisabledByDefault() { + void testTransactionSerializationDisabledByDefault() { jpaTm() .transact( () -> { diff --git a/core/src/test/java/google/registry/rde/RdeStagingReducerTest.java b/core/src/test/java/google/registry/rde/RdeStagingReducerTest.java index 60740c6ed..650ed840d 100644 --- a/core/src/test/java/google/registry/rde/RdeStagingReducerTest.java +++ b/core/src/test/java/google/registry/rde/RdeStagingReducerTest.java @@ -61,7 +61,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; /** Unit tests for {@link RdeStagingReducer}. */ -public class RdeStagingReducerTest { +class RdeStagingReducerTest { @RegisterExtension AppEngineExtension appEngineRule = @@ -103,7 +103,7 @@ public class RdeStagingReducerTest { ValidationMode.STRICT); @BeforeEach - public void setUp() { + void beforeEach() { createTld("soy"); CursorDao.saveCursor(Cursor.create(CursorType.BRDA, 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 - public void testSuccess_BRDA() throws Exception { + void testSuccess_BRDA() throws Exception { key = PendingDeposit.create("soy", now, THIN, CursorType.BRDA, Duration.standardDays(1)); reducer.reduce(key, brdaFragments); String outputFile = decryptGhostrydeGcsFile("soy_2000-01-01_thin_S1_R1.xml.ghostryde"); @@ -143,7 +143,7 @@ public class RdeStagingReducerTest { } @Test - public void testSuccess_BRDA_manual() throws Exception { + void testSuccess_BRDA_manual() throws Exception { key = PendingDeposit.createInManualOperation("soy", now, THIN, "", 0); reducer.reduce(key, brdaFragments); String outputFile = decryptGhostrydeGcsFile("manual/soy_2000-01-01_thin_S1_R0.xml.ghostryde"); @@ -167,7 +167,7 @@ public class RdeStagingReducerTest { } @Test - public void testSuccess_RDE() throws Exception { + void testSuccess_RDE() throws Exception { key = PendingDeposit.create("soy", now, FULL, CursorType.RDE_STAGING, Duration.standardDays(1)); reducer.reduce(key, rdeFragments); String outputFile = decryptGhostrydeGcsFile("soy_2000-01-01_full_S1_R1.xml.ghostryde"); @@ -189,7 +189,7 @@ public class RdeStagingReducerTest { } @Test - public void testSuccess_RDE_manual() throws Exception { + void testSuccess_RDE_manual() throws Exception { key = PendingDeposit.createInManualOperation("soy", now, FULL, "", 0); reducer.reduce(key, rdeFragments); String outputFile = decryptGhostrydeGcsFile("manual/soy_2000-01-01_full_S1_R0.xml.ghostryde"); diff --git a/core/src/test/java/google/registry/schema/cursor/CursorDaoTest.java b/core/src/test/java/google/registry/schema/cursor/CursorDaoTest.java index 9d2d3e17e..2d8f6b890 100644 --- a/core/src/test/java/google/registry/schema/cursor/CursorDaoTest.java +++ b/core/src/test/java/google/registry/schema/cursor/CursorDaoTest.java @@ -42,7 +42,7 @@ public class CursorDaoTest { private final Logger loggerToIntercept = Logger.getLogger(CursorDao.class.getCanonicalName()); @RegisterExtension - public final AppEngineExtension appEngine = + final AppEngineExtension appEngine = AppEngineExtension.builder() .withDatastoreAndCloudSql() .enableJpaEntityCoverageCheck(true) @@ -50,7 +50,7 @@ public class CursorDaoTest { .build(); @Test - public void save_worksSuccessfullyOnNewCursor() { + void save_worksSuccessfullyOnNewCursor() { Cursor cursor = Cursor.create(CursorType.BRDA, "tld", fakeClock.nowUtc()); CursorDao.save(cursor); Cursor returnedCursor = CursorDao.load(CursorType.BRDA, "tld"); @@ -58,7 +58,7 @@ public class CursorDaoTest { } @Test - public void save_worksSuccessfullyOnExistingCursor() { + void save_worksSuccessfullyOnExistingCursor() { Cursor cursor = Cursor.create(CursorType.RDE_REPORT, "tld", fakeClock.nowUtc()); CursorDao.save(cursor); Cursor cursor2 = Cursor.create(CursorType.RDE_REPORT, "tld", fakeClock.nowUtc().plusDays(3)); @@ -68,7 +68,7 @@ public class CursorDaoTest { } @Test - public void save_worksSuccessfullyOnNewGlobalCursor() { + void save_worksSuccessfullyOnNewGlobalCursor() { Cursor cursor = Cursor.createGlobal(CursorType.RECURRING_BILLING, fakeClock.nowUtc()); CursorDao.save(cursor); Cursor returnedCursor = CursorDao.load(CursorType.RECURRING_BILLING); @@ -76,7 +76,7 @@ public class CursorDaoTest { } @Test - public void save_worksSuccessfullyOnExistingGlobalCursor() { + void save_worksSuccessfullyOnExistingGlobalCursor() { Cursor cursor = Cursor.createGlobal(CursorType.RECURRING_BILLING, fakeClock.nowUtc()); CursorDao.save(cursor); Cursor cursor2 = @@ -87,7 +87,7 @@ public class CursorDaoTest { } @Test - public void saveAll_worksSuccessfully() { + void saveAll_worksSuccessfully() { Cursor cursor = Cursor.createGlobal(CursorType.RECURRING_BILLING, fakeClock.nowUtc()); Cursor cursor2 = Cursor.create(CursorType.RDE_REPORT, "tld", fakeClock.nowUtc()); ImmutableSet cursors = ImmutableSet.builder().add(cursor, cursor2).build(); @@ -98,13 +98,13 @@ public class CursorDaoTest { } @Test - public void saveAll_worksSuccessfullyEmptySet() { + void saveAll_worksSuccessfullyEmptySet() { CursorDao.saveAll(ImmutableSet.of()); assertThat(CursorDao.loadAll()).isEmpty(); } @Test - public void load_worksSuccessfully() { + void load_worksSuccessfully() { Cursor cursor = Cursor.createGlobal(CursorType.RECURRING_BILLING, fakeClock.nowUtc()); Cursor cursor2 = Cursor.create(CursorType.RDE_REPORT, "tld", fakeClock.nowUtc()); Cursor cursor3 = Cursor.create(CursorType.RDE_REPORT, "foo", fakeClock.nowUtc()); @@ -119,7 +119,7 @@ public class CursorDaoTest { } @Test - public void loadAll_worksSuccessfully() { + void loadAll_worksSuccessfully() { Cursor cursor = Cursor.createGlobal(CursorType.RECURRING_BILLING, fakeClock.nowUtc()); Cursor cursor2 = Cursor.create(CursorType.RDE_REPORT, "tld", fakeClock.nowUtc()); Cursor cursor3 = Cursor.create(CursorType.RDE_REPORT, "foo", fakeClock.nowUtc()); @@ -130,13 +130,13 @@ public class CursorDaoTest { } @Test - public void loadAll_worksSuccessfullyEmptyTable() { + void loadAll_worksSuccessfullyEmptyTable() { List returnedCursors = CursorDao.loadAll(); assertThat(returnedCursors.size()).isEqualTo(0); } @Test - public void loadByType_worksSuccessfully() { + void loadByType_worksSuccessfully() { Cursor cursor = Cursor.createGlobal(CursorType.RECURRING_BILLING, fakeClock.nowUtc()); Cursor cursor2 = Cursor.create(CursorType.RDE_REPORT, "tld", fakeClock.nowUtc()); Cursor cursor3 = Cursor.create(CursorType.RDE_REPORT, "foo", fakeClock.nowUtc()); @@ -147,13 +147,13 @@ public class CursorDaoTest { } @Test - public void loadByType_worksSuccessfullyNoneOfType() { + void loadByType_worksSuccessfullyNoneOfType() { List returnedCursors = CursorDao.loadByType(CursorType.RDE_REPORT); assertThat(returnedCursors.size()).isEqualTo(0); } @Test - public void saveCursor_worksSuccessfully() { + void saveCursor_worksSuccessfully() { createTld("tld"); google.registry.model.common.Cursor cursor = google.registry.model.common.Cursor.create( @@ -172,7 +172,7 @@ public class CursorDaoTest { } @Test - public void saveCursor_worksSuccessfullyOnGlobalCursor() { + void saveCursor_worksSuccessfullyOnGlobalCursor() { google.registry.model.common.Cursor cursor = google.registry.model.common.Cursor.createGlobal( CursorType.RECURRING_BILLING, fakeClock.nowUtc()); @@ -188,7 +188,7 @@ public class CursorDaoTest { } @Test - public void saveCursors_worksSuccessfully() { + void saveCursors_worksSuccessfully() { createTlds("tld", "foo"); google.registry.model.common.Cursor cursor1 = google.registry.model.common.Cursor.create( @@ -237,7 +237,7 @@ public class CursorDaoTest { } @Test - public void loadAndCompare_worksSuccessfully() { + void loadAndCompare_worksSuccessfully() { loggerToIntercept.addHandler(logHandler); createTld("tld"); google.registry.model.common.Cursor cursor = @@ -249,7 +249,7 @@ public class CursorDaoTest { } @Test - public void loadAndCompare_worksSuccessfullyGlobalCursor() { + void loadAndCompare_worksSuccessfullyGlobalCursor() { loggerToIntercept.addHandler(logHandler); google.registry.model.common.Cursor cursor = google.registry.model.common.Cursor.createGlobal( @@ -260,7 +260,7 @@ public class CursorDaoTest { } @Test - public void loadAndCompare_worksSuccessfullyCursorNotInCloudSql() { + void loadAndCompare_worksSuccessfullyCursorNotInCloudSql() { loggerToIntercept.addHandler(logHandler); createTld("tld"); google.registry.model.common.Cursor cursor = @@ -275,7 +275,7 @@ public class CursorDaoTest { } @Test - public void loadAndCompare_worksSuccessfullyGlobalCursorNotInCloudSql() { + void loadAndCompare_worksSuccessfullyGlobalCursorNotInCloudSql() { loggerToIntercept.addHandler(logHandler); google.registry.model.common.Cursor cursor = google.registry.model.common.Cursor.createGlobal( @@ -289,7 +289,7 @@ public class CursorDaoTest { } @Test - public void loadAndCompare_worksSuccessfullyCursorsNotEqual() { + void loadAndCompare_worksSuccessfullyCursorsNotEqual() { loggerToIntercept.addHandler(logHandler); createTld("tld"); google.registry.model.common.Cursor cursor = @@ -310,7 +310,7 @@ public class CursorDaoTest { } @Test - public void loadAndCompareAll_worksSuccessfully() { + void loadAndCompareAll_worksSuccessfully() { loggerToIntercept.addHandler(logHandler); // Create Datastore cursors @@ -335,7 +335,7 @@ public class CursorDaoTest { } @Test - public void loadAndCompareAll_worksSuccessfullyMissingOne() { + void loadAndCompareAll_worksSuccessfullyMissingOne() { loggerToIntercept.addHandler(logHandler); // Create Datastore cursors @@ -371,7 +371,7 @@ public class CursorDaoTest { } @Test - public void loadAndCompareAll_worksSuccessfullyOneWithWrongTime() { + void loadAndCompareAll_worksSuccessfullyOneWithWrongTime() { loggerToIntercept.addHandler(logHandler); // Create Datastore cursors @@ -404,7 +404,7 @@ public class CursorDaoTest { } @Test - public void loadAndCompareAll_worksSuccessfullyEmptyMap() { + void loadAndCompareAll_worksSuccessfullyEmptyMap() { loggerToIntercept.addHandler(logHandler); CursorDao.loadAndCompareAll(ImmutableMap.of(), CursorType.ICANN_UPLOAD_ACTIVITY); assertAboutLogs().that(logHandler).hasNoLogsAtLevel(Level.WARNING); diff --git a/core/src/test/java/google/registry/schema/server/LockDaoTest.java b/core/src/test/java/google/registry/schema/server/LockDaoTest.java index 4cbfda402..d8ce61e7d 100644 --- a/core/src/test/java/google/registry/schema/server/LockDaoTest.java +++ b/core/src/test/java/google/registry/schema/server/LockDaoTest.java @@ -39,14 +39,14 @@ public class LockDaoTest { @RegisterExtension @Order(value = 1) - public DatastoreEntityExtension datastoreEntityExtension = new DatastoreEntityExtension(); + DatastoreEntityExtension datastoreEntityExtension = new DatastoreEntityExtension(); @RegisterExtension - public final JpaIntegrationWithCoverageExtension jpa = + final JpaIntegrationWithCoverageExtension jpa = new JpaTestRules.Builder().withClock(fakeClock).buildIntegrationWithCoverageExtension(); @Test - public void save_worksSuccessfully() { + void save_worksSuccessfully() { Lock lock = Lock.create("testResource", "tld", "testLogId", fakeClock.nowUtc(), Duration.millis(2)); LockDao.save(lock); @@ -56,7 +56,7 @@ public class LockDaoTest { } @Test - public void save_succeedsWhenLockAlreadyExists() { + void save_succeedsWhenLockAlreadyExists() { Lock lock = Lock.create("testResource", "tld", "testLogId", fakeClock.nowUtc(), Duration.millis(2)); LockDao.save(lock); @@ -67,7 +67,7 @@ public class LockDaoTest { } @Test - public void save_worksSuccesfullyGlobalLock() { + void save_worksSuccesfullyGlobalLock() { Lock lock = Lock.createGlobal("testResource", "testLogId", fakeClock.nowUtc(), Duration.millis(2)); LockDao.save(lock); @@ -77,7 +77,7 @@ public class LockDaoTest { } @Test - public void load_worksSuccessfully() { + void load_worksSuccessfully() { Lock lock = Lock.create("testResource", "tld", "testLogId", fakeClock.nowUtc(), Duration.millis(2)); LockDao.save(lock); @@ -87,7 +87,7 @@ public class LockDaoTest { } @Test - public void load_worksSuccessfullyGlobalLock() { + void load_worksSuccessfullyGlobalLock() { Lock lock = Lock.createGlobal("testResource", "testLogId", fakeClock.nowUtc(), Duration.millis(2)); LockDao.save(lock); @@ -97,13 +97,13 @@ public class LockDaoTest { } @Test - public void load_worksSuccesfullyLockDoesNotExist() { + void load_worksSuccesfullyLockDoesNotExist() { Optional returnedLock = LockDao.load("testResource", "tld"); assertThat(returnedLock.isPresent()).isFalse(); } @Test - public void delete_worksSuccesfully() { + void delete_worksSuccesfully() { Lock lock = Lock.create("testResource", "tld", "testLogId", fakeClock.nowUtc(), Duration.millis(2)); LockDao.save(lock); @@ -115,7 +115,7 @@ public class LockDaoTest { } @Test - public void delete_worksSuccessfullyGlobalLock() { + void delete_worksSuccessfullyGlobalLock() { Lock lock = Lock.createGlobal("testResource", "testLogId", fakeClock.nowUtc(), Duration.millis(2)); LockDao.save(lock); @@ -127,12 +127,12 @@ public class LockDaoTest { } @Test - public void delete_succeedsLockDoesntExist() { + void delete_succeedsLockDoesntExist() { LockDao.delete("testResource"); } @Test - public void compare_logsWarningWhenCloudSqlLockMissing() { + void compare_logsWarningWhenCloudSqlLockMissing() { loggerToIntercept.addHandler(logHandler); google.registry.model.server.Lock datastoreLock = google.registry.model.server.Lock.create( @@ -146,7 +146,7 @@ public class LockDaoTest { } @Test - public void compare_logsWarningWhenCloudSqlLockExistsWhenItShouldNot() { + void compare_logsWarningWhenCloudSqlLockExistsWhenItShouldNot() { loggerToIntercept.addHandler(logHandler); Lock lock = Lock.createGlobal("testResource", "testLogId", fakeClock.nowUtc(), Duration.millis(2)); @@ -159,7 +159,7 @@ public class LockDaoTest { } @Test - public void compare_logsWarningWhenLocksDontMatch() { + void compare_logsWarningWhenLocksDontMatch() { loggerToIntercept.addHandler(logHandler); Lock cloudSqlLock = Lock.create("testResource", "tld", "testLogId", fakeClock.nowUtc(), Duration.millis(2)); diff --git a/core/src/test/java/google/registry/schema/tld/PremiumListDaoTest.java b/core/src/test/java/google/registry/schema/tld/PremiumListDaoTest.java index 09ad9ee58..4b8fc3d47 100644 --- a/core/src/test/java/google/registry/schema/tld/PremiumListDaoTest.java +++ b/core/src/test/java/google/registry/schema/tld/PremiumListDaoTest.java @@ -46,7 +46,7 @@ public class PremiumListDaoTest { private final FakeClock fakeClock = new FakeClock(); @RegisterExtension - public final AppEngineExtension appEngine = + final AppEngineExtension appEngine = AppEngineExtension.builder() .withDatastoreAndCloudSql() .enableJpaEntityCoverageCheck(true) @@ -58,7 +58,7 @@ public class PremiumListDaoTest { private PremiumList testList; @BeforeEach - void setUp() { + void beforeEach() { testPrices = ImmutableMap.of( "silver", @@ -77,7 +77,7 @@ public class PremiumListDaoTest { } @Test - public void saveNew_worksSuccessfully() { + void saveNew_worksSuccessfully() { PremiumListDao.saveNew(testList); jpaTm() .transact( @@ -91,7 +91,7 @@ public class PremiumListDaoTest { } @Test - public void update_worksSuccessfully() { + void update_worksSuccessfully() { PremiumListDao.saveNew(testList); Optional persistedList = PremiumListDao.getLatestRevision("testname"); assertThat(persistedList).isPresent(); @@ -132,7 +132,7 @@ public class PremiumListDaoTest { } @Test - public void saveNew_throwsWhenPremiumListAlreadyExists() { + void saveNew_throwsWhenPremiumListAlreadyExists() { PremiumListDao.saveNew(testList); IllegalArgumentException thrown = assertThrows(IllegalArgumentException.class, () -> PremiumListDao.saveNew(testList)); @@ -142,7 +142,7 @@ public class PremiumListDaoTest { // TODO(b/147246613): Un-ignore this. @Test @Disabled - public void update_throwsWhenListDoesntExist() { + void update_throwsWhenListDoesntExist() { IllegalArgumentException thrown = assertThrows(IllegalArgumentException.class, () -> PremiumListDao.update(testList)); assertThat(thrown) @@ -151,19 +151,19 @@ public class PremiumListDaoTest { } @Test - public void checkExists_worksSuccessfully() { + void checkExists_worksSuccessfully() { assertThat(PremiumListDao.checkExists("testname")).isFalse(); PremiumListDao.saveNew(testList); assertThat(PremiumListDao.checkExists("testname")).isTrue(); } @Test - public void getLatestRevision_returnsEmptyForNonexistentList() { + void getLatestRevision_returnsEmptyForNonexistentList() { assertThat(PremiumListDao.getLatestRevision("nonexistentlist")).isEmpty(); } @Test - public void getLatestRevision_worksSuccessfully() { + void getLatestRevision_worksSuccessfully() { PremiumListDao.saveNew( new PremiumList.Builder() .setName("list1") @@ -191,13 +191,13 @@ public class PremiumListDaoTest { } @Test - public void getPremiumPrice_returnsNoneWhenNoPremiumListConfigured() { + void getPremiumPrice_returnsNoneWhenNoPremiumListConfigured() { persistResource(newRegistry("foobar", "FOOBAR").asBuilder().setPremiumList(null).build()); assertThat(PremiumListDao.getPremiumPrice("rich", Registry.get("foobar"))).isEmpty(); } @Test - public void getPremiumPrice_worksSuccessfully() { + void getPremiumPrice_worksSuccessfully() { persistResource( newRegistry("foobar", "FOOBAR") .asBuilder() @@ -222,7 +222,7 @@ public class PremiumListDaoTest { } @Test - public void testGetPremiumPrice_throwsWhenPremiumListCantBeLoaded() { + void testGetPremiumPrice_throwsWhenPremiumListCantBeLoaded() { createTld("tld"); IllegalStateException thrown = assertThrows( @@ -232,7 +232,7 @@ public class PremiumListDaoTest { } @Test - public void testGetPremiumPrice_worksForJPY() { + void testGetPremiumPrice_worksForJPY() { persistResource( newRegistry("foobar", "FOOBAR") .asBuilder() diff --git a/core/src/test/java/google/registry/schema/tld/PremiumListTest.java b/core/src/test/java/google/registry/schema/tld/PremiumListTest.java index ad9ec32c8..67059368b 100644 --- a/core/src/test/java/google/registry/schema/tld/PremiumListTest.java +++ b/core/src/test/java/google/registry/schema/tld/PremiumListTest.java @@ -27,10 +27,10 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; /** Unit tests for {@link PremiumList}. */ -public class PremiumListTest { +class PremiumListTest { @RegisterExtension - public DatastoreEntityExtension datastoreEntityExtension = new DatastoreEntityExtension(); + DatastoreEntityExtension datastoreEntityExtension = new DatastoreEntityExtension(); private static final ImmutableMap TEST_PRICES = ImmutableMap.of( @@ -42,7 +42,7 @@ public class PremiumListTest { BigDecimal.valueOf(1552.78)); @Test - public void bloomFilter_worksCorrectly() { + void bloomFilter_worksCorrectly() { BloomFilter bloomFilter = new PremiumList.Builder() .setName("testname") diff --git a/core/src/test/java/google/registry/schema/tmch/ClaimsListDaoTest.java b/core/src/test/java/google/registry/schema/tmch/ClaimsListDaoTest.java index c1f5ab839..372762a35 100644 --- a/core/src/test/java/google/registry/schema/tmch/ClaimsListDaoTest.java +++ b/core/src/test/java/google/registry/schema/tmch/ClaimsListDaoTest.java @@ -31,15 +31,15 @@ public class ClaimsListDaoTest { private final FakeClock fakeClock = new FakeClock(); @RegisterExtension - public final JpaIntegrationWithCoverageExtension jpa = + final JpaIntegrationWithCoverageExtension jpa = new JpaTestRules.Builder().withClock(fakeClock).buildIntegrationWithCoverageExtension(); @RegisterExtension @Order(value = 1) - public final DatastoreEntityExtension datastoreEntityExtension = new DatastoreEntityExtension(); + final DatastoreEntityExtension datastoreEntityExtension = new DatastoreEntityExtension(); @Test - public void trySave_insertsClaimsListSuccessfully() { + void trySave_insertsClaimsListSuccessfully() { ClaimsList claimsList = ClaimsList.create(fakeClock.nowUtc(), ImmutableMap.of("label1", "key1", "label2", "key2")); ClaimsListDao.trySave(claimsList); @@ -49,7 +49,7 @@ public class ClaimsListDaoTest { } @Test - public void trySave_noExceptionThrownWhenSaveFail() { + void trySave_noExceptionThrownWhenSaveFail() { ClaimsList claimsList = ClaimsList.create(fakeClock.nowUtc(), ImmutableMap.of("label1", "key1", "label2", "key2")); ClaimsListDao.trySave(claimsList); @@ -60,7 +60,7 @@ public class ClaimsListDaoTest { } @Test - public void trySave_claimsListWithNoEntries() { + void trySave_claimsListWithNoEntries() { ClaimsList claimsList = ClaimsList.create(fakeClock.nowUtc(), ImmutableMap.of()); ClaimsListDao.trySave(claimsList); ClaimsList insertedClaimsList = ClaimsListDao.getLatestRevision().get(); @@ -69,12 +69,12 @@ public class ClaimsListDaoTest { } @Test - public void getCurrent_returnsEmptyListIfTableIsEmpty() { + void getCurrent_returnsEmptyListIfTableIsEmpty() { assertThat(ClaimsListDao.getLatestRevision().isPresent()).isFalse(); } @Test - public void getCurrent_returnsLatestClaims() { + void getCurrent_returnsLatestClaims() { ClaimsList oldClaimsList = ClaimsList.create(fakeClock.nowUtc(), ImmutableMap.of("label1", "key1", "label2", "key2")); ClaimsList newClaimsList =