From 39c2a79898b55bc2549643eee04479f872dd114e Mon Sep 17 00:00:00 2001 From: gbrodman Date: Fri, 25 Jul 2025 13:00:24 -0400 Subject: [PATCH] Remove superfluous DatabaseHelper db methods (#2784) Some of these have been around since the Datastore days and are no longer relevant (dealing with things like Datastore foreign keys). Let's simplify things. --- .../batch/DeleteProberDataActionTest.java | 9 +- ...ertificateNotificationEmailActionTest.java | 11 ++- .../beam/common/RegistryJpaReadTest.java | 9 +- .../registry/beam/rde/RdePipelineTest.java | 13 ++- .../export/sheet/SyncRegistrarsSheetTest.java | 4 +- .../flows/domain/DomainRenewFlowTest.java | 91 +++++++++--------- .../registry/model/OteAccountBuilderTest.java | 6 +- .../model/common/DnsRefreshRequestTest.java | 4 +- .../registry/model/contact/ContactTest.java | 3 +- .../registry/model/domain/DomainSqlTest.java | 64 ++++++------- .../registry/model/domain/DomainTest.java | 4 +- .../registry/model/eppcommon/AddressTest.java | 30 +++--- .../model/history/ContactHistoryTest.java | 10 +- .../model/history/DomainHistoryTest.java | 8 +- .../model/history/HostHistoryTest.java | 10 +- .../registry/model/poll/PollMessageTest.java | 5 +- .../model/registrar/RegistrarTest.java | 11 +-- .../reporting/Spec11ThreatMatchTest.java | 9 +- .../EntityCallbacksListenerTest.java | 6 +- ...tionTokenStatusTransitionUserTypeTest.java | 4 +- .../AllocationTokenVkeyListUserTypeTest.java | 4 +- .../BillingCostTransitionUserTypeTest.java | 4 +- .../converter/BloomFilterConverterTest.java | 4 +- .../converter/CidrBlockListUserTypeTest.java | 4 +- .../CurrencyToStringMapUserTypeTest.java | 4 +- .../converter/CurrencyUnitConverterTest.java | 4 +- .../converter/DateTimeConverterTest.java | 6 +- .../converter/DurationUserTypeTest.java | 6 +- .../converter/InetAddressSetUserTypeTest.java | 4 +- .../converter/JodaMoneyTypeTest.java | 8 +- .../converter/LocalDateConverterTest.java | 4 +- .../RegistrarToRoleMapUserTypeTest.java | 2 +- .../StringCollectionUserTypeTest.java | 10 +- .../converter/StringListConversionTest.java | 10 +- .../converter/StringMapUserTypeTest.java | 10 +- .../converter/StringSetConversionTest.java | 8 +- .../converter/StringValueEnumeratedTest.java | 6 +- .../TimedTransitionBaseUserTypeTest.java | 8 +- .../TldStateTransitionUserTypeTest.java | 4 +- .../converter/VKeyConverterTest.java | 4 +- .../transaction/CriteriaQueryBuilderTest.java | 4 +- .../JpaTransactionManagerExtension.java | 4 +- .../JpaTransactionManagerExtensionTest.java | 4 +- .../JpaTransactionManagerImplTest.java | 53 ++++++----- .../registry/rdap/RdapDomainActionTest.java | 8 +- .../rdap/RdapDomainSearchActionTest.java | 9 +- .../registry/rdap/RdapEntityActionTest.java | 10 +- .../rdap/RdapEntitySearchActionTest.java | 7 +- .../registry/rdap/RdapJsonFormatterTest.java | 4 +- .../rdap/RdapNameserverSearchActionTest.java | 7 +- ...UpdateRegistrarRdapBaseUrlsActionTest.java | 4 +- .../java/google/registry/rde/RdeFixtures.java | 3 +- .../registry/rde/RdeUploadActionTest.java | 3 +- .../OidcTokenAuthenticationMechanismTest.java | 14 +-- .../schema/registrar/RegistrarDaoTest.java | 18 +--- .../schema/registrar/RegistrarPocTest.java | 6 +- .../registry/testing/DatabaseHelper.java | 92 +++++-------------- .../tools/GetAllocationTokenCommandTest.java | 6 +- .../registry/tools/GetUserCommandTest.java | 2 +- .../tools/RegistrarPocCommandTest.java | 24 +++-- .../registry/tools/SetupOteCommandTest.java | 5 +- .../registry/tools/UpdateUserCommandTest.java | 5 +- .../console/settings/ContactActionTest.java | 6 +- .../whois/RegistrarWhoisResponseTest.java | 4 +- .../registry/whois/WhoisActionTest.java | 30 +++--- .../registry/whois/WhoisHttpActionTest.java | 16 ++-- 66 files changed, 351 insertions(+), 422 deletions(-) diff --git a/core/src/test/java/google/registry/batch/DeleteProberDataActionTest.java b/core/src/test/java/google/registry/batch/DeleteProberDataActionTest.java index 8b594509b..f85acfcc0 100644 --- a/core/src/test/java/google/registry/batch/DeleteProberDataActionTest.java +++ b/core/src/test/java/google/registry/batch/DeleteProberDataActionTest.java @@ -27,7 +27,6 @@ import static google.registry.testing.DatabaseHelper.persistActiveHost; import static google.registry.testing.DatabaseHelper.persistDeletedDomain; import static google.registry.testing.DatabaseHelper.persistDomainAsDeleted; import static google.registry.testing.DatabaseHelper.persistResource; -import static google.registry.testing.DatabaseHelper.persistSimpleResource; import static google.registry.util.DateTimeUtils.END_OF_TIME; import static org.joda.time.DateTimeZone.UTC; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -287,7 +286,7 @@ class DeleteProberDataActionTest { private static Set persistDomainAndDescendants(String fqdn) { Domain domain = persistDeletedDomain(fqdn, DELETION_TIME); DomainHistory historyEntry = - persistSimpleResource( + persistResource( new DomainHistory.Builder() .setDomain(domain) .setType(HistoryEntry.Type.DOMAIN_CREATE) @@ -295,7 +294,7 @@ class DeleteProberDataActionTest { .setModificationTime(DELETION_TIME.minusYears(3)) .build()); BillingEvent billingEvent = - persistSimpleResource( + persistResource( new BillingEvent.Builder() .setDomainHistory(historyEntry) .setBillingTime(DELETION_TIME.plusYears(1)) @@ -307,7 +306,7 @@ class DeleteProberDataActionTest { .setTargetId(fqdn) .build()); PollMessage.OneTime pollMessage = - persistSimpleResource( + persistResource( new PollMessage.OneTime.Builder() .setHistoryEntry(historyEntry) .setEventTime(DELETION_TIME) @@ -315,7 +314,7 @@ class DeleteProberDataActionTest { .setMsg("Domain registered") .build()); GracePeriod gracePeriod = - persistSimpleResource( + persistResource( GracePeriod.create( ADD, domain.getRepoId(), diff --git a/core/src/test/java/google/registry/batch/SendExpiringCertificateNotificationEmailActionTest.java b/core/src/test/java/google/registry/batch/SendExpiringCertificateNotificationEmailActionTest.java index ef513a2f6..de5ff3f2d 100644 --- a/core/src/test/java/google/registry/batch/SendExpiringCertificateNotificationEmailActionTest.java +++ b/core/src/test/java/google/registry/batch/SendExpiringCertificateNotificationEmailActionTest.java @@ -18,7 +18,7 @@ import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.JpaTransactionManagerExtension.makeRegistrar1; import static google.registry.testing.DatabaseHelper.loadByEntity; import static google.registry.testing.DatabaseHelper.persistResource; -import static google.registry.testing.DatabaseHelper.persistSimpleResources; +import static google.registry.testing.DatabaseHelper.persistResources; import static google.registry.util.DateTimeUtils.START_OF_TIME; import static org.apache.http.HttpStatus.SC_OK; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -62,7 +62,8 @@ class SendExpiringCertificateNotificationEmailActionTest { Kind update your account using the following steps: 1. Navigate to support and login using your %4$s@registry.example credentials. 2. Click Settings -> Privacy on the top left corner. - 3. Click Edit and enter certificate string. 3. Click SaveRegards,Example Registry"""; + 3. Click Edit and enter certificate string. 3. Click SaveRegards,Example Registry\ + """; private static final String EXPIRATION_WARNING_EMAIL_SUBJECT_TEXT = "Expiration Warning Email"; @@ -223,7 +224,7 @@ class SendExpiringCertificateNotificationEmailActionTest { .setVisibleInWhoisAsAdmin(true) .setVisibleInWhoisAsTech(false) .build()); - persistSimpleResources(contacts); + persistResources(contacts); RuntimeException thrown = assertThrows( RuntimeException.class, @@ -548,7 +549,7 @@ class SendExpiringCertificateNotificationEmailActionTest { .setTypes(ImmutableSet.of(RegistrarPoc.Type.ADMIN)) .setVisibleInWhoisAsTech(true) .build()); - persistSimpleResources(contacts); + persistResources(contacts); assertThat(action.getEmailAddresses(registrar, Type.TECH)) .containsExactly( new InternetAddress("will@example-registrar.tld"), @@ -700,7 +701,7 @@ class SendExpiringCertificateNotificationEmailActionTest { /** Returns persisted sample contacts with a customized contact email type. */ private static ImmutableList persistSampleContacts( Registrar registrar, RegistrarPoc.Type emailType) { - return persistSimpleResources( + return persistResources( ImmutableList.of( new RegistrarPoc.Builder() .setRegistrar(registrar) diff --git a/core/src/test/java/google/registry/beam/common/RegistryJpaReadTest.java b/core/src/test/java/google/registry/beam/common/RegistryJpaReadTest.java index 164ec6638..d2742f1ed 100644 --- a/core/src/test/java/google/registry/beam/common/RegistryJpaReadTest.java +++ b/core/src/test/java/google/registry/beam/common/RegistryJpaReadTest.java @@ -15,9 +15,10 @@ package google.registry.beam.common; import static google.registry.persistence.transaction.JpaTransactionManagerExtension.makeRegistrar1; -import static google.registry.testing.DatabaseHelper.insertInDb; import static google.registry.testing.DatabaseHelper.newContact; import static google.registry.testing.DatabaseHelper.newTld; +import static google.registry.testing.DatabaseHelper.persistResource; +import static google.registry.testing.DatabaseHelper.persistResources; import static google.registry.util.DateTimeUtils.END_OF_TIME; import static google.registry.util.DateTimeUtils.START_OF_TIME; @@ -75,7 +76,7 @@ public class RegistryJpaReadTest { @BeforeEach void beforeEach() { Registrar ofyRegistrar = JpaIntegrationTestExtension.makeRegistrar2(); - insertInDb(ofyRegistrar); + persistResource(ofyRegistrar); ImmutableList.Builder builder = new ImmutableList.Builder<>(); @@ -84,7 +85,7 @@ public class RegistryJpaReadTest { builder.add(contact); } contacts = builder.build(); - insertInDb(contacts); + persistResources(contacts); } @Test @@ -211,6 +212,6 @@ public class RegistryJpaReadTest { null, 100L)) .build(); - insertInDb(registry, registrar, contact, domain); + persistResources(registry, registrar, contact, domain); } } diff --git a/core/src/test/java/google/registry/beam/rde/RdePipelineTest.java b/core/src/test/java/google/registry/beam/rde/RdePipelineTest.java index 44035a322..349a1cb9c 100644 --- a/core/src/test/java/google/registry/beam/rde/RdePipelineTest.java +++ b/core/src/test/java/google/registry/beam/rde/RdePipelineTest.java @@ -30,7 +30,6 @@ import static google.registry.rde.RdeResourceType.DOMAIN; import static google.registry.rde.RdeResourceType.HOST; import static google.registry.rde.RdeResourceType.REGISTRAR; import static google.registry.testing.DatabaseHelper.createTld; -import static google.registry.testing.DatabaseHelper.insertSimpleResources; import static google.registry.testing.DatabaseHelper.newDomain; import static google.registry.testing.DatabaseHelper.persistActiveContact; import static google.registry.testing.DatabaseHelper.persistActiveDomain; @@ -38,6 +37,7 @@ import static google.registry.testing.DatabaseHelper.persistActiveHost; import static google.registry.testing.DatabaseHelper.persistEppResource; import static google.registry.testing.DatabaseHelper.persistNewRegistrar; import static google.registry.testing.DatabaseHelper.persistResource; +import static google.registry.testing.DatabaseHelper.persistResources; import static google.registry.util.ResourceUtils.readResourceUtf8; import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertThrows; @@ -223,7 +223,7 @@ public class RdePipelineTest { @BeforeEach void beforeEach() throws Exception { - insertSimpleResources(ImmutableList.of(makeRegistrar1(), makeRegistrar2())); + persistResources(ImmutableList.of(makeRegistrar1(), makeRegistrar2())); // Two real registrars have been created by loadInitialData(), named "New Registrar" and "The // Registrar". Create one included registrar (external_monitoring) and two excluded ones. @@ -403,7 +403,8 @@ public class RdePipelineTest { TheRegistrar 1970-01-01T00:00:00Z 294247-01-10T04:00:54Z - """); + \ + """); } if (kv.getKey().mode().equals(FULL)) { // Contact fragments for hello.soy. @@ -441,7 +442,8 @@ public class RdePipelineTest { TheRegistrar 1970-01-01T00:00:00Z 294247-01-10T04:00:54Z - """); + \ + """); } else { // Contact fragments for cat.fun. assertThat( @@ -484,7 +486,8 @@ public class RdePipelineTest { TheRegistrar 1970-01-01T00:00:00Z 294247-01-10T04:00:54Z - """); + \ + """); } }); return null; diff --git a/core/src/test/java/google/registry/export/sheet/SyncRegistrarsSheetTest.java b/core/src/test/java/google/registry/export/sheet/SyncRegistrarsSheetTest.java index 703d9054f..0fa6d6c72 100644 --- a/core/src/test/java/google/registry/export/sheet/SyncRegistrarsSheetTest.java +++ b/core/src/test/java/google/registry/export/sheet/SyncRegistrarsSheetTest.java @@ -23,7 +23,7 @@ import static google.registry.testing.DatabaseHelper.createTld; import static google.registry.testing.DatabaseHelper.loadByKey; import static google.registry.testing.DatabaseHelper.persistNewRegistrar; import static google.registry.testing.DatabaseHelper.persistResource; -import static google.registry.testing.DatabaseHelper.persistSimpleResources; +import static google.registry.testing.DatabaseHelper.persistResources; import static org.joda.money.CurrencyUnit.JPY; import static org.joda.money.CurrencyUnit.USD; import static org.joda.time.DateTimeZone.UTC; @@ -179,7 +179,7 @@ public class SyncRegistrarsSheetTest { .build()); // Use registrar key for contacts' parent. DateTime registrarCreationTime = persistResource(registrar).getCreationTime(); - persistSimpleResources(contacts); + persistResources(contacts); clock.advanceBy(standardMinutes(1)); newSyncRegistrarsSheet().run("foobar"); diff --git a/core/src/test/java/google/registry/flows/domain/DomainRenewFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainRenewFlowTest.java index f2fdedd44..ea28afc05 100644 --- a/core/src/test/java/google/registry/flows/domain/DomainRenewFlowTest.java +++ b/core/src/test/java/google/registry/flows/domain/DomainRenewFlowTest.java @@ -150,53 +150,50 @@ class DomainRenewFlowTest extends ResourceFlowTestCase StatusValue... statusValues) throws Exception { Domain domain = DatabaseHelper.newDomain(getUniqueIdFromCommand()); - tm().transact( - () -> { - try { - DomainHistory historyEntryDomainCreate = - new DomainHistory.Builder() - .setDomain(domain) - .setType(HistoryEntry.Type.DOMAIN_CREATE) - .setModificationTime(clock.nowUtc()) - .setRegistrarId(domain.getCreationRegistrarId()) - .build(); - BillingRecurrence autorenewEvent = - new BillingRecurrence.Builder() - .setReason(Reason.RENEW) - .setFlags(ImmutableSet.of(Flag.AUTO_RENEW)) - .setTargetId(getUniqueIdFromCommand()) - .setRegistrarId("TheRegistrar") - .setEventTime(expirationTime) - .setRecurrenceEndTime(END_OF_TIME) - .setDomainHistory(historyEntryDomainCreate) - .setRenewalPriceBehavior(renewalPriceBehavior) - .setRenewalPrice(renewalPrice) - .build(); - PollMessage.Autorenew autorenewPollMessage = - new PollMessage.Autorenew.Builder() - .setTargetId(getUniqueIdFromCommand()) - .setRegistrarId("TheRegistrar") - .setEventTime(expirationTime) - .setAutorenewEndTime(END_OF_TIME) - .setMsg("Domain was auto-renewed.") - .setHistoryEntry(historyEntryDomainCreate) - .build(); - Domain newDomain = - domain - .asBuilder() - .setRegistrationExpirationTime(expirationTime) - .setStatusValues(ImmutableSet.copyOf(statusValues)) - .setAutorenewBillingEvent(autorenewEvent.createVKey()) - .setAutorenewPollMessage(autorenewPollMessage.createVKey()) - .build(); - persistResources( - ImmutableSet.of( - historyEntryDomainCreate, autorenewEvent, - autorenewPollMessage, newDomain)); - } catch (Exception e) { - throw new RuntimeException("Error persisting domain", e); - } - }); + try { + DomainHistory historyEntryDomainCreate = + new DomainHistory.Builder() + .setDomain(domain) + .setType(HistoryEntry.Type.DOMAIN_CREATE) + .setModificationTime(clock.nowUtc()) + .setRegistrarId(domain.getCreationRegistrarId()) + .build(); + BillingRecurrence autorenewEvent = + new BillingRecurrence.Builder() + .setReason(Reason.RENEW) + .setFlags(ImmutableSet.of(Flag.AUTO_RENEW)) + .setTargetId(getUniqueIdFromCommand()) + .setRegistrarId("TheRegistrar") + .setEventTime(expirationTime) + .setRecurrenceEndTime(END_OF_TIME) + .setDomainHistory(historyEntryDomainCreate) + .setRenewalPriceBehavior(renewalPriceBehavior) + .setRenewalPrice(renewalPrice) + .build(); + PollMessage.Autorenew autorenewPollMessage = + new PollMessage.Autorenew.Builder() + .setTargetId(getUniqueIdFromCommand()) + .setRegistrarId("TheRegistrar") + .setEventTime(expirationTime) + .setAutorenewEndTime(END_OF_TIME) + .setMsg("Domain was auto-renewed.") + .setHistoryEntry(historyEntryDomainCreate) + .build(); + Domain newDomain = + domain + .asBuilder() + .setRegistrationExpirationTime(expirationTime) + .setStatusValues(ImmutableSet.copyOf(statusValues)) + .setAutorenewBillingEvent(autorenewEvent.createVKey()) + .setAutorenewPollMessage(autorenewPollMessage.createVKey()) + .build(); + persistResources( + ImmutableSet.of( + historyEntryDomainCreate, autorenewEvent, + autorenewPollMessage, newDomain)); + } catch (Exception e) { + throw new RuntimeException("Error persisting domain", e); + } clock.advanceOneMilli(); } diff --git a/core/src/test/java/google/registry/model/OteAccountBuilderTest.java b/core/src/test/java/google/registry/model/OteAccountBuilderTest.java index ce6744a35..c0d1924dd 100644 --- a/core/src/test/java/google/registry/model/OteAccountBuilderTest.java +++ b/core/src/test/java/google/registry/model/OteAccountBuilderTest.java @@ -24,7 +24,7 @@ import static google.registry.testing.CertificateSamples.SAMPLE_CERT_HASH; import static google.registry.testing.DatabaseHelper.createTld; import static google.registry.testing.DatabaseHelper.loadByKeyIfPresent; import static google.registry.testing.DatabaseHelper.persistPremiumList; -import static google.registry.testing.DatabaseHelper.persistSimpleResource; +import static google.registry.testing.DatabaseHelper.persistResource; import static google.registry.util.DateTimeUtils.START_OF_TIME; import static org.joda.money.CurrencyUnit.USD; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -275,7 +275,7 @@ public final class OteAccountBuilderTest { @Test void testCreateOteEntities_registrarExists_failsWhenNotReplaceExisting() { - persistSimpleResource(makeRegistrar1().asBuilder().setRegistrarId("myclientid-1").build()); + persistResource(makeRegistrar1().asBuilder().setRegistrarId("myclientid-1").build()); OteAccountBuilder oteSetupHelper = OteAccountBuilder.forRegistrarId("myclientid"); @@ -301,7 +301,7 @@ public final class OteAccountBuilderTest { @Test void testCreateOteEntities_entitiesExist_succeedsWhenReplaceExisting() { - persistSimpleResource(makeRegistrar1().asBuilder().setRegistrarId("myclientid-1").build()); + persistResource(makeRegistrar1().asBuilder().setRegistrarId("myclientid-1").build()); // we intentionally create the -ga TLD with the wrong state, to make sure it's overwritten. createTld("myclientid-ga", START_DATE_SUNRISE); diff --git a/core/src/test/java/google/registry/model/common/DnsRefreshRequestTest.java b/core/src/test/java/google/registry/model/common/DnsRefreshRequestTest.java index 5898a7ff8..b6b1eafb1 100644 --- a/core/src/test/java/google/registry/model/common/DnsRefreshRequestTest.java +++ b/core/src/test/java/google/registry/model/common/DnsRefreshRequestTest.java @@ -16,7 +16,7 @@ package google.registry.model.common; import static com.google.common.truth.Truth.assertThat; import static google.registry.model.ImmutableObjectSubject.assertAboutImmutableObjects; -import static google.registry.testing.DatabaseHelper.insertInDb; +import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.testing.DatabaseHelper.loadAllOf; import static google.registry.util.DateTimeUtils.START_OF_TIME; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -41,7 +41,7 @@ public class DnsRefreshRequestTest extends EntityTestCase { void testPersistence() { assertThat(request.getLastProcessTime()).isEqualTo(START_OF_TIME); fakeClock.advanceOneMilli(); - insertInDb(request); + tm().transact(() -> tm().insert(request)); fakeClock.advanceOneMilli(); ImmutableList requests = loadAllOf(DnsRefreshRequest.class); assertThat(requests.size()).isEqualTo(1); diff --git a/core/src/test/java/google/registry/model/contact/ContactTest.java b/core/src/test/java/google/registry/model/contact/ContactTest.java index 246068a39..ca2512762 100644 --- a/core/src/test/java/google/registry/model/contact/ContactTest.java +++ b/core/src/test/java/google/registry/model/contact/ContactTest.java @@ -20,7 +20,6 @@ import static google.registry.model.ImmutableObjectSubject.assertAboutImmutableO import static google.registry.testing.ContactSubject.assertAboutContacts; import static google.registry.testing.DatabaseHelper.cloneAndSetAutoTimestamps; import static google.registry.testing.DatabaseHelper.createTld; -import static google.registry.testing.DatabaseHelper.insertInDb; import static google.registry.testing.DatabaseHelper.loadByEntity; import static google.registry.testing.DatabaseHelper.persistResource; import static google.registry.testing.SqlHelper.assertThrowForeignKeyViolation; @@ -132,7 +131,7 @@ public class ContactTest extends EntityTestCase { void testCloudSqlPersistence_failWhenViolateForeignKeyConstraint() { assertThrowForeignKeyViolation( () -> - insertInDb( + persistResource( originalContact .asBuilder() .setRepoId("2-FOOBAR") diff --git a/core/src/test/java/google/registry/model/domain/DomainSqlTest.java b/core/src/test/java/google/registry/model/domain/DomainSqlTest.java index 29d78920a..4662a38bf 100644 --- a/core/src/test/java/google/registry/model/domain/DomainSqlTest.java +++ b/core/src/test/java/google/registry/model/domain/DomainSqlTest.java @@ -20,11 +20,10 @@ import static google.registry.model.domain.token.AllocationToken.TokenStatus.NOT import static google.registry.model.domain.token.AllocationToken.TokenType.BULK_PRICING; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.testing.DatabaseHelper.createTld; -import static google.registry.testing.DatabaseHelper.insertInDb; import static google.registry.testing.DatabaseHelper.loadByEntity; import static google.registry.testing.DatabaseHelper.loadByKey; import static google.registry.testing.DatabaseHelper.persistResource; -import static google.registry.testing.DatabaseHelper.updateInDb; +import static google.registry.testing.DatabaseHelper.persistResources; import static google.registry.testing.SqlHelper.assertThrowForeignKeyViolation; import static google.registry.testing.SqlHelper.saveRegistrar; import static google.registry.util.DateTimeUtils.END_OF_TIME; @@ -169,13 +168,13 @@ public class DomainSqlTest { @Test void testHostForeignKeyConstraints() { // Persist the domain without the associated host object. - assertThrowForeignKeyViolation(() -> insertInDb(contact, contact2, domain)); + assertThrowForeignKeyViolation(() -> persistResources(contact, contact2, domain)); } @Test void testContactForeignKeyConstraints() { // Persist the domain without the associated contact objects. - assertThrowForeignKeyViolation(() -> insertInDb(domain, host)); + assertThrowForeignKeyViolation(() -> persistResources(domain, host)); } @Test @@ -358,7 +357,7 @@ public class DomainSqlTest { @Test void testSerializable() { createTld("com"); - insertInDb(contact, contact2, domain, host); + persistResources(contact, contact2, domain, host); Domain persisted = tm().transact(() -> tm().loadByEntity(domain)); assertThat(SerializeUtils.serializeDeserialize(persisted)).isEqualTo(persisted); } @@ -366,9 +365,9 @@ public class DomainSqlTest { @Test void testUpdates() { createTld("com"); - insertInDb(contact, contact2, domain, host); + persistResources(contact, contact2, domain, host); domain = domain.asBuilder().setNameservers(ImmutableSet.of()).build(); - updateInDb(domain); + persistResource(domain); assertAboutImmutableObjects() .that(loadByEntity(domain)) .isEqualExceptFields(domain, "updateTimestamp", "creationTime"); @@ -385,7 +384,7 @@ public class DomainSqlTest { private void persistDomain() { createTld("com"); - insertInDb(contact, contact2, domain, host); + persistResources(contact, contact2, domain, host); } private VKey createKey(Class clazz, String key) { @@ -414,24 +413,19 @@ public class DomainSqlTest { Domain persisted = loadByKey(domain.createVKey()); DateTime originalUpdateTime = persisted.getUpdateTimestamp().getTimestamp(); fakeClock.advanceOneMilli(); - DateTime transactionTime = - tm().transact( - () -> { - Host host2 = - new Host.Builder() - .setRepoId("host2") - .setHostName("ns2.example.com") - .setCreationRegistrarId("registrar1") - .setPersistedCurrentSponsorRegistrarId("registrar2") - .build(); - insertInDb(host2); + Host host2 = + new Host.Builder() + .setRepoId("host2") + .setHostName("ns2.example.com") + .setCreationRegistrarId("registrar1") + .setPersistedCurrentSponsorRegistrarId("registrar2") + .build(); + persistResource(host2); domain = persisted.asBuilder().addNameserver(host2.createVKey()).build(); - updateInDb(domain); - return tm().getTransactionTime(); - }); + persistResource(domain); domain = loadByKey(domain.createVKey()); - assertThat(domain.getUpdateTimestamp().getTimestamp()).isEqualTo(transactionTime); - assertThat(domain.getUpdateTimestamp().getTimestamp()).isNotEqualTo(originalUpdateTime); + assertThat(domain.getUpdateTimestamp().getTimestamp()) + .isEqualTo(originalUpdateTime.plusMillis(1)); } @Test @@ -440,20 +434,14 @@ public class DomainSqlTest { Domain persisted = loadByKey(domain.createVKey()); DateTime originalUpdateTime = persisted.getUpdateTimestamp().getTimestamp(); fakeClock.advanceOneMilli(); - DateTime transactionTime = - tm().transact( - () -> { - domain = - persisted - .asBuilder() - .setDsData( - ImmutableSet.of(DomainDsData.create(1, 2, 3, new byte[] {0, 1, 2}))) - .build(); - updateInDb(domain); - return tm().getTransactionTime(); - }); + domain = + persisted + .asBuilder() + .setDsData(ImmutableSet.of(DomainDsData.create(1, 2, 3, new byte[] {0, 1, 2}))) + .build(); + persistResource(domain); domain = loadByKey(domain.createVKey()); - assertThat(domain.getUpdateTimestamp().getTimestamp()).isEqualTo(transactionTime); - assertThat(domain.getUpdateTimestamp().getTimestamp()).isNotEqualTo(originalUpdateTime); + assertThat(domain.getUpdateTimestamp().getTimestamp()) + .isEqualTo(originalUpdateTime.plusMillis(1)); } } diff --git a/core/src/test/java/google/registry/model/domain/DomainTest.java b/core/src/test/java/google/registry/model/domain/DomainTest.java index 74bcf2ffe..78bb9d0bc 100644 --- a/core/src/test/java/google/registry/model/domain/DomainTest.java +++ b/core/src/test/java/google/registry/model/domain/DomainTest.java @@ -23,12 +23,12 @@ import static google.registry.model.domain.token.AllocationToken.TokenType.BULK_ import static google.registry.model.domain.token.AllocationToken.TokenType.SINGLE_USE; import static google.registry.testing.DatabaseHelper.cloneAndSetAutoTimestamps; import static google.registry.testing.DatabaseHelper.createTld; -import static google.registry.testing.DatabaseHelper.insertInDb; import static google.registry.testing.DatabaseHelper.newHost; import static google.registry.testing.DatabaseHelper.persistActiveContact; import static google.registry.testing.DatabaseHelper.persistActiveDomain; import static google.registry.testing.DatabaseHelper.persistActiveHost; import static google.registry.testing.DatabaseHelper.persistResource; +import static google.registry.testing.DatabaseHelper.persistResources; import static google.registry.testing.DomainSubject.assertAboutDomains; import static google.registry.testing.SqlHelper.saveRegistrar; import static google.registry.util.DateTimeUtils.END_OF_TIME; @@ -162,7 +162,7 @@ public class DomainTest { .setRecurrenceEndTime(END_OF_TIME) .setDomainHistory(historyEntry) .build(); - insertInDb(historyEntry, billingEventBill, billingRecurrence); + persistResources(historyEntry, billingEventBill, billingRecurrence); recurrenceBillKey = billingRecurrence.createVKey(); VKey autorenewPollKey = VKey.create(PollMessage.Autorenew.class, 3L); VKey onetimePollKey = VKey.create(PollMessage.OneTime.class, 1L); diff --git a/core/src/test/java/google/registry/model/eppcommon/AddressTest.java b/core/src/test/java/google/registry/model/eppcommon/AddressTest.java index 48b670c7a..96ca1466d 100644 --- a/core/src/test/java/google/registry/model/eppcommon/AddressTest.java +++ b/core/src/test/java/google/registry/model/eppcommon/AddressTest.java @@ -16,8 +16,8 @@ package google.registry.model.eppcommon; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import static google.registry.testing.DatabaseHelper.insertInDb; import static google.registry.testing.DatabaseHelper.loadByEntity; +import static google.registry.testing.DatabaseHelper.persistResource; import static org.junit.jupiter.api.Assertions.assertThrows; import com.google.common.collect.ImmutableList; @@ -50,25 +50,25 @@ class AddressTest { private static final String ENTITY_XML = """ - - -
- 123 W 14th St - 8th Fl - Rm 8 - New York - NY - 10011 - US -
- - """; + + +
+ 123 W 14th St + 8th Fl + Rm 8 + New York + NY + 10011 + US +
+ + """; private TestAddress address = createAddress("123 W 14th St", "8th Fl", "Rm 8"); private TestEntity entity = new TestEntity(1L, address); private static TestEntity saveAndLoad(TestEntity entity) { - insertInDb(entity); + persistResource(entity); return loadByEntity(entity); } diff --git a/core/src/test/java/google/registry/model/history/ContactHistoryTest.java b/core/src/test/java/google/registry/model/history/ContactHistoryTest.java index ae5812b54..5b4641cc9 100644 --- a/core/src/test/java/google/registry/model/history/ContactHistoryTest.java +++ b/core/src/test/java/google/registry/model/history/ContactHistoryTest.java @@ -17,9 +17,9 @@ package google.registry.model.history; import static com.google.common.truth.Truth.assertThat; import static google.registry.model.ImmutableObjectSubject.assertAboutImmutableObjects; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import static google.registry.testing.DatabaseHelper.insertInDb; import static google.registry.testing.DatabaseHelper.loadByEntity; import static google.registry.testing.DatabaseHelper.newContactWithRoid; +import static google.registry.testing.DatabaseHelper.persistResource; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.collect.ImmutableList; @@ -45,10 +45,10 @@ public class ContactHistoryTest extends EntityTestCase { @Test void testPersistence() { Contact contact = newContactWithRoid("contactId", "contact1"); - insertInDb(contact); + persistResource(contact); Contact contactFromDb = loadByEntity(contact); ContactHistory contactHistory = createContactHistory(contactFromDb); - insertInDb(contactHistory); + persistResource(contactHistory); tm().transact( () -> { ContactHistory fromDatabase = tm().loadByKey(contactHistory.createVKey()); @@ -60,10 +60,10 @@ public class ContactHistoryTest extends EntityTestCase { @Test void testSerializable() { Contact contact = newContactWithRoid("contactId", "contact1"); - insertInDb(contact); + persistResource(contact); Contact contactFromDb = loadByEntity(contact); ContactHistory contactHistory = createContactHistory(contactFromDb); - insertInDb(contactHistory); + persistResource(contactHistory); ContactHistory fromDatabase = tm().transact(() -> tm().loadByKey(contactHistory.createVKey())); assertThat(SerializeUtils.serializeDeserialize(fromDatabase)).isEqualTo(fromDatabase); } 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 92b54019f..4b7ac2bc4 100644 --- a/core/src/test/java/google/registry/model/history/DomainHistoryTest.java +++ b/core/src/test/java/google/registry/model/history/DomainHistoryTest.java @@ -18,10 +18,10 @@ import static com.google.common.truth.Truth.assertThat; import static google.registry.model.ImmutableObjectSubject.assertAboutImmutableObjects; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.testing.DatabaseHelper.createTld; -import static google.registry.testing.DatabaseHelper.insertInDb; import static google.registry.testing.DatabaseHelper.newContactWithRoid; import static google.registry.testing.DatabaseHelper.newDomain; import static google.registry.testing.DatabaseHelper.newHostWithRoid; +import static google.registry.testing.DatabaseHelper.persistResource; import static google.registry.util.DateTimeUtils.END_OF_TIME; import static java.nio.charset.StandardCharsets.UTF_8; @@ -60,7 +60,7 @@ public class DomainHistoryTest extends EntityTestCase { void testPersistence() { Domain domain = addGracePeriodForSql(createDomainWithContactsAndHosts()); DomainHistory domainHistory = createDomainHistory(domain); - insertInDb(domainHistory); + persistResource(domainHistory); tm().transact( () -> { @@ -74,7 +74,7 @@ public class DomainHistoryTest extends EntityTestCase { void testSerializable() { Domain domain = addGracePeriodForSql(createDomainWithContactsAndHosts()); DomainHistory domainHistory = createDomainHistory(domain); - insertInDb(domainHistory); + persistResource(domainHistory); DomainHistory fromDatabase = tm().transact(() -> tm().loadByKey(domainHistory.createVKey())); assertThat(SerializeUtils.serializeDeserialize(fromDatabase)).isEqualTo(fromDatabase); } @@ -96,7 +96,7 @@ public class DomainHistoryTest extends EntityTestCase { .setNameservers(host.createVKey()) .setDsData(ImmutableSet.of(DomainDsData.create(1, 2, 3, new byte[] {0, 1, 2}))) .build(); - insertInDb(domain); + persistResource(domain); return domain; } diff --git a/core/src/test/java/google/registry/model/history/HostHistoryTest.java b/core/src/test/java/google/registry/model/history/HostHistoryTest.java index d07c03edd..a511f3c4a 100644 --- a/core/src/test/java/google/registry/model/history/HostHistoryTest.java +++ b/core/src/test/java/google/registry/model/history/HostHistoryTest.java @@ -17,9 +17,9 @@ package google.registry.model.history; import static com.google.common.truth.Truth.assertThat; import static google.registry.model.ImmutableObjectSubject.assertAboutImmutableObjects; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import static google.registry.testing.DatabaseHelper.insertInDb; import static google.registry.testing.DatabaseHelper.loadByEntity; import static google.registry.testing.DatabaseHelper.newHostWithRoid; +import static google.registry.testing.DatabaseHelper.persistResource; import static java.nio.charset.StandardCharsets.UTF_8; import google.registry.model.EntityTestCase; @@ -41,10 +41,10 @@ public class HostHistoryTest extends EntityTestCase { @Test void testPersistence() { Host host = newHostWithRoid("ns1.example.com", "host1"); - insertInDb(host); + persistResource(host); Host hostFromDb = loadByEntity(host); HostHistory hostHistory = createHostHistory(hostFromDb); - insertInDb(hostHistory); + persistResource(hostHistory); tm().transact( () -> { HostHistory fromDatabase = tm().loadByKey(hostHistory.createVKey()); @@ -56,10 +56,10 @@ public class HostHistoryTest extends EntityTestCase { @Test void testSerializable() { Host host = newHostWithRoid("ns1.example.com", "host1"); - insertInDb(host); + persistResource(host); Host hostFromDb = loadByEntity(host); HostHistory hostHistory = createHostHistory(hostFromDb); - insertInDb(hostHistory); + persistResource(hostHistory); HostHistory fromDatabase = tm().transact(() -> tm().loadByKey(hostHistory.createVKey())); assertThat(SerializeUtils.serializeDeserialize(fromDatabase)).isEqualTo(fromDatabase); } diff --git a/core/src/test/java/google/registry/model/poll/PollMessageTest.java b/core/src/test/java/google/registry/model/poll/PollMessageTest.java index f08a41b9f..91a16d03a 100644 --- a/core/src/test/java/google/registry/model/poll/PollMessageTest.java +++ b/core/src/test/java/google/registry/model/poll/PollMessageTest.java @@ -17,7 +17,6 @@ package google.registry.model.poll; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.testing.DatabaseHelper.createTld; -import static google.registry.testing.DatabaseHelper.insertInDb; import static google.registry.testing.DatabaseHelper.loadByKey; import static google.registry.testing.DatabaseHelper.persistActiveContact; import static google.registry.testing.DatabaseHelper.persistResource; @@ -90,12 +89,12 @@ public class PollMessageTest extends EntityTestCase { @Test void testCloudSqlSupportForPolymorphicVKey() { - insertInDb(oneTime); + persistResource(oneTime); PollMessage persistedOneTime = loadByKey(VKey.create(PollMessage.class, oneTime.getId())); assertThat(persistedOneTime).isInstanceOf(PollMessage.OneTime.class); assertThat(persistedOneTime).isEqualTo(oneTime); - insertInDb(autoRenew); + persistResource(autoRenew); PollMessage persistedAutoRenew = loadByKey(VKey.create(PollMessage.class, autoRenew.getId())); assertThat(persistedAutoRenew).isInstanceOf(PollMessage.Autorenew.class); assertThat(persistedAutoRenew).isEqualTo(autoRenew); diff --git a/core/src/test/java/google/registry/model/registrar/RegistrarTest.java b/core/src/test/java/google/registry/model/registrar/RegistrarTest.java index 34654b05a..da4bca8db 100644 --- a/core/src/test/java/google/registry/model/registrar/RegistrarTest.java +++ b/core/src/test/java/google/registry/model/registrar/RegistrarTest.java @@ -25,8 +25,7 @@ import static google.registry.testing.DatabaseHelper.cloneAndSetAutoTimestamps; import static google.registry.testing.DatabaseHelper.createTld; import static google.registry.testing.DatabaseHelper.newTld; import static google.registry.testing.DatabaseHelper.persistResource; -import static google.registry.testing.DatabaseHelper.persistSimpleResource; -import static google.registry.testing.DatabaseHelper.persistSimpleResources; +import static google.registry.testing.DatabaseHelper.persistResources; import static google.registry.util.DateTimeUtils.START_OF_TIME; import static org.joda.money.CurrencyUnit.JPY; import static org.joda.money.CurrencyUnit.USD; @@ -132,7 +131,7 @@ class RegistrarTest extends EntityTestCase { .setFaxNumber("+1.2125551213") .setTypes(ImmutableSet.of(RegistrarPoc.Type.ABUSE, RegistrarPoc.Type.ADMIN)) .build(); - persistSimpleResources( + persistResources( ImmutableList.of( abuseAdminContact, new RegistrarPoc.Builder() @@ -301,7 +300,7 @@ class RegistrarTest extends EntityTestCase { @Test void testSuccess_emptyContactTypesAllowed() { - persistSimpleResource( + persistResource( new RegistrarPoc.Builder() .setRegistrar(registrar) .setName("John Abussy") @@ -318,7 +317,7 @@ class RegistrarTest extends EntityTestCase { @Test void testSuccess_getContactsByType() { RegistrarPoc newTechContact = - persistSimpleResource( + persistResource( new RegistrarPoc.Builder() .setRegistrar(registrar) .setName("Jake Tech") @@ -330,7 +329,7 @@ class RegistrarTest extends EntityTestCase { .setTypes(ImmutableSet.of(RegistrarPoc.Type.TECH)) .build()); RegistrarPoc newTechAbuseContact = - persistSimpleResource( + persistResource( new RegistrarPoc.Builder() .setRegistrar(registrar) .setName("Jim Tech-Abuse") diff --git a/core/src/test/java/google/registry/model/reporting/Spec11ThreatMatchTest.java b/core/src/test/java/google/registry/model/reporting/Spec11ThreatMatchTest.java index fdc16488b..8f81ae99f 100644 --- a/core/src/test/java/google/registry/model/reporting/Spec11ThreatMatchTest.java +++ b/core/src/test/java/google/registry/model/reporting/Spec11ThreatMatchTest.java @@ -17,9 +17,10 @@ package google.registry.model.reporting; import static google.registry.model.ImmutableObjectSubject.assertAboutImmutableObjects; import static google.registry.model.reporting.Spec11ThreatMatch.ThreatType.MALWARE; import static google.registry.model.reporting.Spec11ThreatMatch.ThreatType.UNWANTED_SOFTWARE; +import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.testing.DatabaseHelper.createTld; -import static google.registry.testing.DatabaseHelper.insertInDb; import static google.registry.testing.DatabaseHelper.loadByEntity; +import static google.registry.testing.DatabaseHelper.persistResources; import static google.registry.testing.SqlHelper.assertThrowForeignKeyViolation; import static google.registry.testing.SqlHelper.saveRegistrar; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -105,7 +106,7 @@ public final class Spec11ThreatMatchTest extends EntityTestCase { void testPersistence() { createTld("tld"); saveRegistrar(REGISTRAR_ID); - insertInDb(registrantContact, domain, host, threat); + tm().transact(() -> tm().insertAll(registrantContact, domain, host, threat)); assertAboutImmutableObjects().that(loadByEntity(threat)).isEqualExceptFields(threat, "id"); } @@ -113,12 +114,12 @@ public final class Spec11ThreatMatchTest extends EntityTestCase { @Disabled("We can't rely on foreign keys until we've migrated to SQL") void testThreatForeignKeyConstraints() { // Persist the threat without the associated registrar. - assertThrowForeignKeyViolation(() -> insertInDb(host, registrantContact, domain, threat)); + assertThrowForeignKeyViolation(() -> persistResources(host, registrantContact, domain, threat)); saveRegistrar(REGISTRAR_ID); // Persist the threat without the associated domain. - assertThrowForeignKeyViolation(() -> insertInDb(registrantContact, host, threat)); + assertThrowForeignKeyViolation(() -> persistResources(registrantContact, host, threat)); } @Test diff --git a/core/src/test/java/google/registry/persistence/EntityCallbacksListenerTest.java b/core/src/test/java/google/registry/persistence/EntityCallbacksListenerTest.java index fde30de8a..f9f67676b 100644 --- a/core/src/test/java/google/registry/persistence/EntityCallbacksListenerTest.java +++ b/core/src/test/java/google/registry/persistence/EntityCallbacksListenerTest.java @@ -18,7 +18,7 @@ import static com.google.common.collect.ImmutableSet.toImmutableSet; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import static google.registry.testing.DatabaseHelper.insertInDb; +import static google.registry.testing.DatabaseHelper.persistResource; import com.google.common.collect.ImmutableSet; import google.registry.model.ImmutableObject; @@ -51,7 +51,7 @@ class EntityCallbacksListenerTest { @Test void verifyAllCallbacks_executedExpectedTimes() { TestEntity testPersist = new TestEntity(); - insertInDb(testPersist); + tm().transact(() -> tm().insert(testPersist)); checkAll(testPersist, 1, 0, 0, 0); TestEntity testUpdate = new TestEntity(); @@ -99,7 +99,7 @@ class EntityCallbacksListenerTest { @Test void verifyCallbacksNotCalledOnCommit() { - insertInDb(new TestEntity()); + persistResource(new TestEntity()); TestEntity testLoad = tm().transact(() -> tm().loadByKey(VKey.create(TestEntity.class, "id"))); assertThat(testLoad.entityPreUpdate).isEqualTo(0); diff --git a/core/src/test/java/google/registry/persistence/converter/AllocationTokenStatusTransitionUserTypeTest.java b/core/src/test/java/google/registry/persistence/converter/AllocationTokenStatusTransitionUserTypeTest.java index ebcad79f5..e709dec58 100644 --- a/core/src/test/java/google/registry/persistence/converter/AllocationTokenStatusTransitionUserTypeTest.java +++ b/core/src/test/java/google/registry/persistence/converter/AllocationTokenStatusTransitionUserTypeTest.java @@ -19,7 +19,7 @@ import static google.registry.model.domain.token.AllocationToken.TokenStatus.END import static google.registry.model.domain.token.AllocationToken.TokenStatus.NOT_STARTED; import static google.registry.model.domain.token.AllocationToken.TokenStatus.VALID; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import static google.registry.testing.DatabaseHelper.insertInDb; +import static google.registry.testing.DatabaseHelper.persistResource; import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.google.common.collect.ImmutableSortedMap; @@ -59,7 +59,7 @@ public class AllocationTokenStatusTransitionUserTypeTest { TimedTransitionProperty.fromValueMap(values); AllocationTokenStatusTransitionConverterTestEntity testEntity = new AllocationTokenStatusTransitionConverterTestEntity(timedTransitionProperty); - insertInDb(testEntity); + persistResource(testEntity); AllocationTokenStatusTransitionConverterTestEntity persisted = tm().transact( () -> diff --git a/core/src/test/java/google/registry/persistence/converter/AllocationTokenVkeyListUserTypeTest.java b/core/src/test/java/google/registry/persistence/converter/AllocationTokenVkeyListUserTypeTest.java index 903ba0e23..30de7e564 100644 --- a/core/src/test/java/google/registry/persistence/converter/AllocationTokenVkeyListUserTypeTest.java +++ b/core/src/test/java/google/registry/persistence/converter/AllocationTokenVkeyListUserTypeTest.java @@ -18,7 +18,7 @@ import static com.google.common.truth.Truth.assertThat; import static google.registry.model.domain.token.AllocationToken.TokenType.SINGLE_USE; import static google.registry.model.domain.token.AllocationToken.TokenType.UNLIMITED_USE; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import static google.registry.testing.DatabaseHelper.insertInDb; +import static google.registry.testing.DatabaseHelper.persistResource; import com.google.common.collect.ImmutableList; import google.registry.model.ImmutableObject; @@ -51,7 +51,7 @@ public class AllocationTokenVkeyListUserTypeTest { List> tokens = ImmutableList.of(token1.createVKey(), token2.createVKey()); TestAllocationTokenVKeyList testAllocationTokenVKeyList = new TestAllocationTokenVKeyList(tokens); - insertInDb(testAllocationTokenVKeyList); + persistResource(testAllocationTokenVKeyList); TestAllocationTokenVKeyList persisted = tm().transact(() -> tm().getEntityManager().find(TestAllocationTokenVKeyList.class, "id")); assertThat(persisted.tokenList).isEqualTo(tokens); diff --git a/core/src/test/java/google/registry/persistence/converter/BillingCostTransitionUserTypeTest.java b/core/src/test/java/google/registry/persistence/converter/BillingCostTransitionUserTypeTest.java index 05391e69b..92c6cf625 100644 --- a/core/src/test/java/google/registry/persistence/converter/BillingCostTransitionUserTypeTest.java +++ b/core/src/test/java/google/registry/persistence/converter/BillingCostTransitionUserTypeTest.java @@ -16,7 +16,7 @@ package google.registry.persistence.converter; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import static google.registry.testing.DatabaseHelper.insertInDb; +import static google.registry.testing.DatabaseHelper.persistResource; import static google.registry.util.DateTimeUtils.START_OF_TIME; import static org.joda.money.CurrencyUnit.USD; @@ -52,7 +52,7 @@ public class BillingCostTransitionUserTypeTest { TimedTransitionProperty timedTransitionProperty = TimedTransitionProperty.fromValueMap(values); TestEntity testEntity = new TestEntity(timedTransitionProperty); - insertInDb(testEntity); + persistResource(testEntity); TestEntity persisted = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); assertThat(persisted.timedTransitionProperty.toValueMap()) diff --git a/core/src/test/java/google/registry/persistence/converter/BloomFilterConverterTest.java b/core/src/test/java/google/registry/persistence/converter/BloomFilterConverterTest.java index 4ac4aad85..7488faabe 100644 --- a/core/src/test/java/google/registry/persistence/converter/BloomFilterConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/BloomFilterConverterTest.java @@ -16,7 +16,7 @@ package google.registry.persistence.converter; import static com.google.common.hash.Funnels.stringFunnel; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import static google.registry.testing.DatabaseHelper.insertInDb; +import static google.registry.testing.DatabaseHelper.persistResource; import static java.nio.charset.StandardCharsets.US_ASCII; import com.google.common.collect.ImmutableSet; @@ -41,7 +41,7 @@ class BloomFilterConverterTest { BloomFilter bloomFilter = BloomFilter.create(stringFunnel(US_ASCII), 3); ImmutableSet.of("foo", "bar", "baz").forEach(bloomFilter::put); TestEntity entity = new TestEntity(bloomFilter); - insertInDb(entity); + persistResource(entity); TestEntity persisted = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); assertThat(persisted.bloomFilter).isEqualTo(bloomFilter); diff --git a/core/src/test/java/google/registry/persistence/converter/CidrBlockListUserTypeTest.java b/core/src/test/java/google/registry/persistence/converter/CidrBlockListUserTypeTest.java index 6fe1c70a6..34c30785b 100644 --- a/core/src/test/java/google/registry/persistence/converter/CidrBlockListUserTypeTest.java +++ b/core/src/test/java/google/registry/persistence/converter/CidrBlockListUserTypeTest.java @@ -16,7 +16,7 @@ package google.registry.persistence.converter; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import static google.registry.testing.DatabaseHelper.insertInDb; +import static google.registry.testing.DatabaseHelper.persistResource; import com.google.common.collect.ImmutableList; import google.registry.model.ImmutableObject; @@ -47,7 +47,7 @@ public class CidrBlockListUserTypeTest { CidrAddressBlock.create("8000::/1"), CidrAddressBlock.create("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/128")); TestEntity testEntity = new TestEntity(addresses); - insertInDb(testEntity); + persistResource(testEntity); TestEntity persisted = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); assertThat(persisted.addresses).isEqualTo(addresses); diff --git a/core/src/test/java/google/registry/persistence/converter/CurrencyToStringMapUserTypeTest.java b/core/src/test/java/google/registry/persistence/converter/CurrencyToStringMapUserTypeTest.java index 74aea4f39..58866b11c 100644 --- a/core/src/test/java/google/registry/persistence/converter/CurrencyToStringMapUserTypeTest.java +++ b/core/src/test/java/google/registry/persistence/converter/CurrencyToStringMapUserTypeTest.java @@ -16,7 +16,7 @@ package google.registry.persistence.converter; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import static google.registry.testing.DatabaseHelper.insertInDb; +import static google.registry.testing.DatabaseHelper.persistResource; import com.google.common.collect.ImmutableMap; import google.registry.model.ImmutableObject; @@ -44,7 +44,7 @@ public class CurrencyToStringMapUserTypeTest { CurrencyUnit.of("USD"), "accountId1", CurrencyUnit.of("CNY"), "accountId2"); TestEntity testEntity = new TestEntity(currencyToBilling); - insertInDb(testEntity); + persistResource(testEntity); TestEntity persisted = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); assertThat(persisted.currencyToBilling).containsExactlyEntriesIn(currencyToBilling); diff --git a/core/src/test/java/google/registry/persistence/converter/CurrencyUnitConverterTest.java b/core/src/test/java/google/registry/persistence/converter/CurrencyUnitConverterTest.java index 7809dbb3f..64530ca59 100644 --- a/core/src/test/java/google/registry/persistence/converter/CurrencyUnitConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/CurrencyUnitConverterTest.java @@ -16,7 +16,7 @@ package google.registry.persistence.converter; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import static google.registry.testing.DatabaseHelper.insertInDb; +import static google.registry.testing.DatabaseHelper.persistResource; import static org.junit.jupiter.api.Assertions.assertThrows; import google.registry.model.ImmutableObject; @@ -39,7 +39,7 @@ public class CurrencyUnitConverterTest { @Test void roundTripConversion() { TestEntity entity = new TestEntity(CurrencyUnit.EUR); - insertInDb(entity); + persistResource(entity); assertThat( tm().transact( () -> diff --git a/core/src/test/java/google/registry/persistence/converter/DateTimeConverterTest.java b/core/src/test/java/google/registry/persistence/converter/DateTimeConverterTest.java index 826235286..59cea45a0 100644 --- a/core/src/test/java/google/registry/persistence/converter/DateTimeConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/DateTimeConverterTest.java @@ -16,7 +16,7 @@ package google.registry.persistence.converter; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import static google.registry.testing.DatabaseHelper.insertInDb; +import static google.registry.testing.DatabaseHelper.persistResource; import static java.time.ZoneOffset.UTC; import google.registry.model.ImmutableObject; @@ -75,7 +75,7 @@ public class DateTimeConverterTest { void converter_generatesTimestampWithNormalizedZone() { DateTime dt = parseDateTime("2019-09-01T01:01:01Z"); TestEntity entity = new TestEntity("normalized_utc_time", dt); - insertInDb(entity); + persistResource(entity); TestEntity retrievedEntity = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "normalized_utc_time")); assertThat(retrievedEntity.dt.toString()).isEqualTo("2019-09-01T01:01:01.000Z"); @@ -86,7 +86,7 @@ public class DateTimeConverterTest { DateTime dt = parseDateTime("2019-09-01T01:01:01-05:00"); TestEntity entity = new TestEntity("new_york_time", dt); - insertInDb(entity); + persistResource(entity); TestEntity retrievedEntity = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "new_york_time")); assertThat(retrievedEntity.dt.toString()).isEqualTo("2019-09-01T06:01:01.000Z"); diff --git a/core/src/test/java/google/registry/persistence/converter/DurationUserTypeTest.java b/core/src/test/java/google/registry/persistence/converter/DurationUserTypeTest.java index f49cd6f56..238a5c4bc 100644 --- a/core/src/test/java/google/registry/persistence/converter/DurationUserTypeTest.java +++ b/core/src/test/java/google/registry/persistence/converter/DurationUserTypeTest.java @@ -16,7 +16,7 @@ package google.registry.persistence.converter; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import static google.registry.testing.DatabaseHelper.insertInDb; +import static google.registry.testing.DatabaseHelper.persistResource; import google.registry.model.ImmutableObject; import google.registry.persistence.transaction.JpaTestExtensions; @@ -39,7 +39,7 @@ public class DurationUserTypeTest { @Test void testNulls() { DurationTestEntity entity = new DurationTestEntity(null); - insertInDb(entity); + persistResource(entity); DurationTestEntity persisted = tm().transact(() -> tm().getEntityManager().find(DurationTestEntity.class, "id")); assertThat(persisted.duration).isNull(); @@ -90,7 +90,7 @@ public class DurationUserTypeTest { private void assertPersistedEntityHasSameDuration(Duration duration) { DurationTestEntity entity = new DurationTestEntity(duration); - insertInDb(entity); + persistResource(entity); DurationTestEntity persisted = tm().transact(() -> tm().getEntityManager().find(DurationTestEntity.class, "id")); assertThat(persisted.duration.getMillis()).isEqualTo(duration.getMillis()); diff --git a/core/src/test/java/google/registry/persistence/converter/InetAddressSetUserTypeTest.java b/core/src/test/java/google/registry/persistence/converter/InetAddressSetUserTypeTest.java index 7179f6fb6..e27126eba 100644 --- a/core/src/test/java/google/registry/persistence/converter/InetAddressSetUserTypeTest.java +++ b/core/src/test/java/google/registry/persistence/converter/InetAddressSetUserTypeTest.java @@ -16,7 +16,7 @@ package google.registry.persistence.converter; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import static google.registry.testing.DatabaseHelper.insertInDb; +import static google.registry.testing.DatabaseHelper.persistResource; import com.google.common.collect.ImmutableSet; import com.google.common.net.InetAddresses; @@ -64,7 +64,7 @@ public class InetAddressSetUserTypeTest { private void verifySaveAndLoad(@Nullable Set inetAddresses) { InetAddressSetTestEntity testEntity = new InetAddressSetTestEntity(inetAddresses); - insertInDb(testEntity); + persistResource(testEntity); InetAddressSetTestEntity persisted = tm().transact(() -> tm().loadByKey(VKey.create(InetAddressSetTestEntity.class, "id"))); assertThat(persisted.addresses).isEqualTo(inetAddresses); diff --git a/core/src/test/java/google/registry/persistence/converter/JodaMoneyTypeTest.java b/core/src/test/java/google/registry/persistence/converter/JodaMoneyTypeTest.java index 394b94790..d293c7178 100644 --- a/core/src/test/java/google/registry/persistence/converter/JodaMoneyTypeTest.java +++ b/core/src/test/java/google/registry/persistence/converter/JodaMoneyTypeTest.java @@ -15,7 +15,7 @@ package google.registry.persistence.converter; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import static google.registry.testing.DatabaseHelper.insertInDb; +import static google.registry.testing.DatabaseHelper.persistResource; import static org.junit.jupiter.api.Assertions.assertThrows; import com.google.common.collect.ImmutableMap; @@ -57,7 +57,7 @@ public class JodaMoneyTypeTest { Money money = Money.of(CurrencyUnit.USD, 100.12); assertThat(money.getAmount().scale()).isEqualTo(2); TestEntity entity = new TestEntity(money); - insertInDb(entity); + persistResource(entity); List result = tm().transact( () -> @@ -81,7 +81,7 @@ public class JodaMoneyTypeTest { Money money = Money.ofMajor(CurrencyUnit.JPY, 100); assertThat(money.getAmount().scale()).isEqualTo(0); // JPY's amount has scale at 0. TestEntity entity = new TestEntity(money); - insertInDb(entity); + persistResource(entity); List result = tm().transact( () -> @@ -121,7 +121,7 @@ public class JodaMoneyTypeTest { "dos", Money.ofMajor(CurrencyUnit.JPY, 2000), "tres", Money.of(CurrencyUnit.GBP, 20)); ComplexTestEntity entity = new ComplexTestEntity(moneyMap, myMoney, yourMoney); - insertInDb(entity); + persistResource(entity); List result = tm().transact( () -> diff --git a/core/src/test/java/google/registry/persistence/converter/LocalDateConverterTest.java b/core/src/test/java/google/registry/persistence/converter/LocalDateConverterTest.java index aa32151fe..32d36bdd9 100644 --- a/core/src/test/java/google/registry/persistence/converter/LocalDateConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/LocalDateConverterTest.java @@ -16,7 +16,7 @@ package google.registry.persistence.converter; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import static google.registry.testing.DatabaseHelper.insertInDb; +import static google.registry.testing.DatabaseHelper.persistResource; import google.registry.model.ImmutableObject; import google.registry.persistence.VKey; @@ -54,7 +54,7 @@ public class LocalDateConverterTest { private LocalDateConverterTestEntity persistAndLoadTestEntity(LocalDate date) { LocalDateConverterTestEntity entity = new LocalDateConverterTestEntity(date); - insertInDb(entity); + persistResource(entity); return tm().transact( () -> tm().loadByKey(VKey.create(LocalDateConverterTestEntity.class, "id"))); } diff --git a/core/src/test/java/google/registry/persistence/converter/RegistrarToRoleMapUserTypeTest.java b/core/src/test/java/google/registry/persistence/converter/RegistrarToRoleMapUserTypeTest.java index 927fff923..65aa9fde5 100644 --- a/core/src/test/java/google/registry/persistence/converter/RegistrarToRoleMapUserTypeTest.java +++ b/core/src/test/java/google/registry/persistence/converter/RegistrarToRoleMapUserTypeTest.java @@ -48,7 +48,7 @@ public class RegistrarToRoleMapUserTypeTest { "FooRegistrar", RegistrarRole.TECH_CONTACT); TestEntity entity = new TestEntity(map); - DatabaseHelper.insertInDb(entity); + DatabaseHelper.persistResource(entity); TestEntity persisted = Iterables.getOnlyElement(DatabaseHelper.loadAllOf(TestEntity.class)); assertThat(persisted.map).isEqualTo(map); } diff --git a/core/src/test/java/google/registry/persistence/converter/StringCollectionUserTypeTest.java b/core/src/test/java/google/registry/persistence/converter/StringCollectionUserTypeTest.java index 3e977918e..510badc03 100644 --- a/core/src/test/java/google/registry/persistence/converter/StringCollectionUserTypeTest.java +++ b/core/src/test/java/google/registry/persistence/converter/StringCollectionUserTypeTest.java @@ -17,7 +17,7 @@ package google.registry.persistence.converter; import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import static google.registry.testing.DatabaseHelper.insertInDb; +import static google.registry.testing.DatabaseHelper.persistResource; import static org.junit.jupiter.api.Assertions.assertThrows; import com.google.common.collect.ImmutableList; @@ -45,7 +45,7 @@ public class StringCollectionUserTypeTest { List value = ImmutableList.of(new ListElement("app"), new ListElement("dev"), new ListElement("com")); TestEntity testEntity = new TestEntity(value); - insertInDb(testEntity); + persistResource(testEntity); TestEntity persisted = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); assertThat(persisted.value).containsExactlyElementsIn(value); @@ -56,7 +56,7 @@ public class StringCollectionUserTypeTest { List value = ImmutableList.of(new ListElement("app"), new ListElement("dev"), new ListElement("com")); TestEntity testEntity = new TestEntity(value); - insertInDb(testEntity); + persistResource(testEntity); TestEntity persisted = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); persisted.value = ImmutableList.of(new ListElement("app"), new ListElement("org")); @@ -68,7 +68,7 @@ public class StringCollectionUserTypeTest { @Test void testNullValue_writesAndReadsNullSuccessfully() { TestEntity testEntity = new TestEntity(null); - insertInDb(testEntity); + persistResource(testEntity); TestEntity persisted = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); assertThat(persisted.value).isNull(); @@ -77,7 +77,7 @@ public class StringCollectionUserTypeTest { @Test void testEmptyCollection_writesAndReadsEmptyCollectionSuccessfully() { TestEntity testEntity = new TestEntity(ImmutableList.of()); - insertInDb(testEntity); + persistResource(testEntity); TestEntity persisted = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); assertThat(persisted.value).isEmpty(); diff --git a/core/src/test/java/google/registry/persistence/converter/StringListConversionTest.java b/core/src/test/java/google/registry/persistence/converter/StringListConversionTest.java index 334f0c31d..43cd873f1 100644 --- a/core/src/test/java/google/registry/persistence/converter/StringListConversionTest.java +++ b/core/src/test/java/google/registry/persistence/converter/StringListConversionTest.java @@ -16,7 +16,7 @@ package google.registry.persistence.converter; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import static google.registry.testing.DatabaseHelper.insertInDb; +import static google.registry.testing.DatabaseHelper.persistResource; import static org.junit.jupiter.api.Assertions.assertThrows; import com.google.common.collect.ImmutableList; @@ -41,7 +41,7 @@ public class StringListConversionTest { void roundTripConversion_returnsSameStringList() { List tlds = ImmutableList.of("app", "dev", "how"); TestEntity testEntity = new TestEntity(tlds); - insertInDb(testEntity); + persistResource(testEntity); TestEntity persisted = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); assertThat(persisted.tlds).containsExactly("app", "dev", "how"); @@ -51,7 +51,7 @@ public class StringListConversionTest { void testMerge_succeeds() { List tlds = ImmutableList.of("app", "dev", "how"); TestEntity testEntity = new TestEntity(tlds); - insertInDb(testEntity); + persistResource(testEntity); TestEntity persisted = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); persisted.tlds = ImmutableList.of("com", "gov"); @@ -63,7 +63,7 @@ public class StringListConversionTest { @Test void testNullValue_writesAndReadsNullSuccessfully() { TestEntity testEntity = new TestEntity(null); - insertInDb(testEntity); + persistResource(testEntity); TestEntity persisted = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); assertThat(persisted.tlds).isNull(); @@ -72,7 +72,7 @@ public class StringListConversionTest { @Test void testEmptyCollection_writesAndReadsEmptyCollectionSuccessfully() { TestEntity testEntity = new TestEntity(ImmutableList.of()); - insertInDb(testEntity); + persistResource(testEntity); TestEntity persisted = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); assertThat(persisted.tlds).isEmpty(); diff --git a/core/src/test/java/google/registry/persistence/converter/StringMapUserTypeTest.java b/core/src/test/java/google/registry/persistence/converter/StringMapUserTypeTest.java index 94844b2b0..ca265287e 100644 --- a/core/src/test/java/google/registry/persistence/converter/StringMapUserTypeTest.java +++ b/core/src/test/java/google/registry/persistence/converter/StringMapUserTypeTest.java @@ -16,7 +16,7 @@ package google.registry.persistence.converter; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import static google.registry.testing.DatabaseHelper.insertInDb; +import static google.registry.testing.DatabaseHelper.persistResource; import static org.junit.jupiter.api.Assertions.assertThrows; import com.google.common.collect.ImmutableMap; @@ -47,7 +47,7 @@ public class StringMapUserTypeTest { @Test void roundTripConversion_returnsSameMap() { TestEntity testEntity = new TestEntity(MAP); - insertInDb(testEntity); + persistResource(testEntity); TestEntity persisted = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); assertThat(persisted.map).containsExactlyEntriesIn(MAP); @@ -56,7 +56,7 @@ public class StringMapUserTypeTest { @Test void testUpdateColumn_succeeds() { TestEntity testEntity = new TestEntity(MAP); - insertInDb(testEntity); + persistResource(testEntity); TestEntity persisted = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); assertThat(persisted.map).containsExactlyEntriesIn(MAP); @@ -69,7 +69,7 @@ public class StringMapUserTypeTest { @Test void testNullValue_writesAndReadsNullSuccessfully() { TestEntity testEntity = new TestEntity(null); - insertInDb(testEntity); + persistResource(testEntity); TestEntity persisted = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); assertThat(persisted.map).isNull(); @@ -78,7 +78,7 @@ public class StringMapUserTypeTest { @Test void testEmptyMap_writesAndReadsEmptyCollectionSuccessfully() { TestEntity testEntity = new TestEntity(ImmutableMap.of()); - insertInDb(testEntity); + persistResource(testEntity); TestEntity persisted = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); assertThat(persisted.map).isEmpty(); diff --git a/core/src/test/java/google/registry/persistence/converter/StringSetConversionTest.java b/core/src/test/java/google/registry/persistence/converter/StringSetConversionTest.java index c720723f8..da57fd023 100644 --- a/core/src/test/java/google/registry/persistence/converter/StringSetConversionTest.java +++ b/core/src/test/java/google/registry/persistence/converter/StringSetConversionTest.java @@ -16,7 +16,7 @@ package google.registry.persistence.converter; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import static google.registry.testing.DatabaseHelper.insertInDb; +import static google.registry.testing.DatabaseHelper.persistResource; import com.google.common.collect.ImmutableSet; import google.registry.model.ImmutableObject; @@ -39,7 +39,7 @@ public class StringSetConversionTest { void roundTripConversion_returnsSameStringList() { Set tlds = ImmutableSet.of("app", "dev", "how"); TestEntity testEntity = new TestEntity(tlds); - insertInDb(testEntity); + persistResource(testEntity); TestEntity persisted = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); assertThat(persisted.tlds).containsExactly("app", "dev", "how"); @@ -48,7 +48,7 @@ public class StringSetConversionTest { @Test void testNullValue_writesAndReadsNullSuccessfully() { TestEntity testEntity = new TestEntity(null); - insertInDb(testEntity); + persistResource(testEntity); TestEntity persisted = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); assertThat(persisted.tlds).isNull(); @@ -57,7 +57,7 @@ public class StringSetConversionTest { @Test void testEmptyCollection_writesAndReadsEmptyCollectionSuccessfully() { TestEntity testEntity = new TestEntity(ImmutableSet.of()); - insertInDb(testEntity); + persistResource(testEntity); TestEntity persisted = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); assertThat(persisted.tlds).isEmpty(); diff --git a/core/src/test/java/google/registry/persistence/converter/StringValueEnumeratedTest.java b/core/src/test/java/google/registry/persistence/converter/StringValueEnumeratedTest.java index 9f1593bb5..2f9d82c4d 100644 --- a/core/src/test/java/google/registry/persistence/converter/StringValueEnumeratedTest.java +++ b/core/src/test/java/google/registry/persistence/converter/StringValueEnumeratedTest.java @@ -16,7 +16,7 @@ package google.registry.persistence.converter; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import static google.registry.testing.DatabaseHelper.insertInDb; +import static google.registry.testing.DatabaseHelper.persistResource; import google.registry.model.ImmutableObject; import google.registry.model.registrar.Registrar.State; @@ -39,7 +39,7 @@ public class StringValueEnumeratedTest { @Test void roundTripConversion_returnsSameEnum() { TestEntity testEntity = new TestEntity(State.ACTIVE); - insertInDb(testEntity); + persistResource(testEntity); TestEntity persisted = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); assertThat(persisted.state).isEqualTo(State.ACTIVE); @@ -48,7 +48,7 @@ public class StringValueEnumeratedTest { @Test void testNativeQuery_succeeds() { TestEntity testEntity = new TestEntity(State.DISABLED); - insertInDb(testEntity); + persistResource(testEntity); assertThat( tm().transact( diff --git a/core/src/test/java/google/registry/persistence/converter/TimedTransitionBaseUserTypeTest.java b/core/src/test/java/google/registry/persistence/converter/TimedTransitionBaseUserTypeTest.java index ee2dca1c2..b5cc2416d 100644 --- a/core/src/test/java/google/registry/persistence/converter/TimedTransitionBaseUserTypeTest.java +++ b/core/src/test/java/google/registry/persistence/converter/TimedTransitionBaseUserTypeTest.java @@ -16,7 +16,7 @@ package google.registry.persistence.converter; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import static google.registry.testing.DatabaseHelper.insertInDb; +import static google.registry.testing.DatabaseHelper.persistResource; import static google.registry.util.DateTimeUtils.START_OF_TIME; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -55,7 +55,7 @@ class TimedTransitionBaseUserTypeTest { @Test void roundTripConversion_returnsSameTimedTransitionProperty() { TestEntity testEntity = new TestEntity(TIMED_TRANSITION_PROPERTY); - insertInDb(testEntity); + persistResource(testEntity); TestEntity persisted = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); assertThat(persisted.property.toValueMap()) @@ -65,7 +65,7 @@ class TimedTransitionBaseUserTypeTest { @Test void testUpdateColumn_succeeds() { TestEntity testEntity = new TestEntity(TIMED_TRANSITION_PROPERTY); - insertInDb(testEntity); + persistResource(testEntity); TestEntity persisted = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); assertThat(persisted.property.toValueMap()) @@ -80,7 +80,7 @@ class TimedTransitionBaseUserTypeTest { @Test void testNullValue_writesAndReadsNullSuccessfully() { TestEntity testEntity = new TestEntity(null); - insertInDb(testEntity); + persistResource(testEntity); TestEntity persisted = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); assertThat(persisted.property).isNull(); diff --git a/core/src/test/java/google/registry/persistence/converter/TldStateTransitionUserTypeTest.java b/core/src/test/java/google/registry/persistence/converter/TldStateTransitionUserTypeTest.java index eba557ce2..160a55541 100644 --- a/core/src/test/java/google/registry/persistence/converter/TldStateTransitionUserTypeTest.java +++ b/core/src/test/java/google/registry/persistence/converter/TldStateTransitionUserTypeTest.java @@ -16,7 +16,7 @@ package google.registry.persistence.converter; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import static google.registry.testing.DatabaseHelper.insertInDb; +import static google.registry.testing.DatabaseHelper.persistResource; import static google.registry.util.DateTimeUtils.START_OF_TIME; import com.google.common.collect.ImmutableSortedMap; @@ -55,7 +55,7 @@ class TldStateTransitionUserTypeTest { TimedTransitionProperty timedTransitionProperty = TimedTransitionProperty.fromValueMap(values); TestEntity testEntity = new TestEntity(timedTransitionProperty); - insertInDb(testEntity); + persistResource(testEntity); TestEntity persisted = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "id")); assertThat(persisted.timedTransitionProperty.toValueMap()) diff --git a/core/src/test/java/google/registry/persistence/converter/VKeyConverterTest.java b/core/src/test/java/google/registry/persistence/converter/VKeyConverterTest.java index bdd34ad6c..b9cf6f788 100644 --- a/core/src/test/java/google/registry/persistence/converter/VKeyConverterTest.java +++ b/core/src/test/java/google/registry/persistence/converter/VKeyConverterTest.java @@ -16,7 +16,7 @@ package google.registry.persistence.converter; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import static google.registry.testing.DatabaseHelper.insertInDb; +import static google.registry.testing.DatabaseHelper.persistResources; import google.registry.model.ImmutableObject; import google.registry.persistence.VKey; @@ -50,7 +50,7 @@ public class VKeyConverterTest { TestLongEntity longEntity = new TestLongEntity(300L); VKey longKey = VKey.create(TestLongEntity.class, 300L); TestEntity original = new TestEntity(1984L, stringKey, longKey); - insertInDb(stringEntity, longEntity, original); + persistResources(stringEntity, longEntity, original); TestEntity retrieved = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, 1984L)); diff --git a/core/src/test/java/google/registry/persistence/transaction/CriteriaQueryBuilderTest.java b/core/src/test/java/google/registry/persistence/transaction/CriteriaQueryBuilderTest.java index 0a318a66b..c7dcd2aa3 100644 --- a/core/src/test/java/google/registry/persistence/transaction/CriteriaQueryBuilderTest.java +++ b/core/src/test/java/google/registry/persistence/transaction/CriteriaQueryBuilderTest.java @@ -16,7 +16,7 @@ package google.registry.persistence.transaction; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import static google.registry.testing.DatabaseHelper.insertInDb; +import static google.registry.testing.DatabaseHelper.persistResources; import com.google.common.collect.ImmutableList; import google.registry.model.ImmutableObject; @@ -50,7 +50,7 @@ class CriteriaQueryBuilderTest { @BeforeEach void beforeEach() { - insertInDb(entity1, entity2, entity3); + persistResources(entity1, entity2, entity3); } @Test diff --git a/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerExtension.java b/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerExtension.java index 47c7f3e01..27c2538c7 100644 --- a/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerExtension.java +++ b/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerExtension.java @@ -17,7 +17,7 @@ package google.registry.persistence.transaction; import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.truth.Truth.assertWithMessage; -import static google.registry.testing.DatabaseHelper.insertSimpleResources; +import static google.registry.testing.DatabaseHelper.persistResources; import static java.nio.charset.StandardCharsets.UTF_8; import static org.testcontainers.containers.PostgreSQLContainer.POSTGRESQL_PORT; @@ -444,7 +444,7 @@ public abstract class JpaTransactionManagerExtension /** Create some fake registrars. */ public static void loadInitialData() { - insertSimpleResources( + persistResources( ImmutableList.of( makeRegistrar1(), makeRegistrarContact1(), diff --git a/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerExtensionTest.java b/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerExtensionTest.java index 4db3fb6cc..a6923fa8a 100644 --- a/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerExtensionTest.java +++ b/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerExtensionTest.java @@ -17,7 +17,7 @@ package google.registry.persistence.transaction; import static com.google.common.truth.Truth.assertThat; import static google.registry.persistence.transaction.TransactionManagerFactory.replicaTm; import static google.registry.persistence.transaction.TransactionManagerFactory.tm; -import static google.registry.testing.DatabaseHelper.insertInDb; +import static google.registry.testing.DatabaseHelper.persistResource; import static org.junit.jupiter.api.Assertions.assertThrows; import google.registry.model.ImmutableObject; @@ -76,7 +76,7 @@ public class JpaTransactionManagerExtensionTest { // This test verifies that 1) withEntityClass() has registered TestEntity and 2) The table // has been created, implying withProperty(HBM2DDL_AUTO, "update") worked. TestEntity original = new TestEntity("key", "value"); - insertInDb(original); + persistResource(original); TestEntity retrieved = tm().transact(() -> tm().getEntityManager().find(TestEntity.class, "key")); assertThat(retrieved).isEqualTo(original); 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 c1aa6de49..bbdd60cbd 100644 --- a/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerImplTest.java +++ b/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerImplTest.java @@ -24,8 +24,9 @@ import static google.registry.persistence.transaction.TransactionManagerFactory. import static google.registry.persistence.transaction.TransactionManagerFactory.tm; import static google.registry.testing.DatabaseHelper.assertDetachedFromEntityManager; import static google.registry.testing.DatabaseHelper.existsInDb; -import static google.registry.testing.DatabaseHelper.insertInDb; import static google.registry.testing.DatabaseHelper.loadByKey; +import static google.registry.testing.DatabaseHelper.persistResource; +import static google.registry.testing.DatabaseHelper.persistResources; import static google.registry.testing.TestDataHelper.fileClassPath; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; @@ -397,7 +398,7 @@ class JpaTransactionManagerImplTest { @Test void saveAllNew_succeeds() { moreEntities.forEach(entity -> assertThat(tm().transact(() -> tm().exists(entity))).isFalse()); - insertInDb(moreEntities); + persistResources(moreEntities); moreEntities.forEach(entity -> assertThat(tm().transact(() -> tm().exists(entity))).isTrue()); assertThat(tm().transact(() -> tm().loadAllOf(TestEntity.class))) .containsExactlyElementsIn(moreEntities); @@ -406,8 +407,12 @@ class JpaTransactionManagerImplTest { @Test void saveAllNew_rollsBackWhenFailure() { moreEntities.forEach(entity -> assertThat(tm().transact(() -> tm().exists(entity))).isFalse()); - insertInDb(moreEntities.get(0)); - assertThat(assertThrows(PersistenceException.class, () -> insertInDb(moreEntities)).getCause()) + persistResource(moreEntities.get(0)); + assertThat( + assertThrows( + PersistenceException.class, + () -> tm().transact(() -> tm().insertAll(moreEntities))) + .getCause()) .isInstanceOf(RollbackException.class); assertThat(tm().transact(() -> tm().exists(moreEntities.get(0)))).isTrue(); assertThat(tm().transact(() -> tm().exists(moreEntities.get(1)))).isFalse(); @@ -424,7 +429,7 @@ class JpaTransactionManagerImplTest { @Test void put_updatesExistingEntity() { - insertInDb(theEntity); + persistResource(theEntity); TestEntity persisted = tm().transact(() -> tm().loadByKey(theEntityKey)); assertThat(persisted.data).isEqualTo("foo"); theEntity.data = "bar"; @@ -444,7 +449,7 @@ class JpaTransactionManagerImplTest { @Test void update_succeeds() { - insertInDb(theEntity); + persistResource(theEntity); TestEntity persisted = tm().transact(() -> tm().loadByKey(VKey.create(TestEntity.class, "theEntity"))); assertThat(persisted.data).isEqualTo("foo"); @@ -456,7 +461,7 @@ class JpaTransactionManagerImplTest { @Test void updateCompoundIdEntity_succeeds() { - insertInDb(compoundIdEntity); + persistResource(compoundIdEntity); TestCompoundIdEntity persisted = tm().transact(() -> tm().loadByKey(compoundIdEntityKey)); assertThat(persisted.data).isEqualTo("foo"); compoundIdEntity.data = "bar"; @@ -474,7 +479,7 @@ class JpaTransactionManagerImplTest { @Test void updateAll_succeeds() { - insertInDb(moreEntities); + persistResources(moreEntities); ImmutableList updated = ImmutableList.of( new TestEntity("entity1", "foo_updated"), @@ -487,7 +492,7 @@ class JpaTransactionManagerImplTest { @Test void updateAll_rollsBackWhenFailure() { - insertInDb(moreEntities); + persistResources(moreEntities); ImmutableList updated = ImmutableList.of( new TestEntity("entity1", "foo_updated"), @@ -503,7 +508,7 @@ class JpaTransactionManagerImplTest { @Test void load_succeeds() { assertThat(tm().transact(() -> tm().exists(theEntity))).isFalse(); - insertInDb(theEntity); + persistResource(theEntity); TestEntity persisted = tm().transact(() -> assertDetachedFromEntityManager(tm().loadByKey(theEntityKey))); assertThat(persisted.name).isEqualTo("theEntity"); @@ -519,7 +524,7 @@ class JpaTransactionManagerImplTest { @Test void loadByEntity_succeeds() { - insertInDb(theEntity); + persistResource(theEntity); TestEntity persisted = tm().transact(() -> assertDetachedFromEntityManager(tm().loadByEntity(theEntity))); assertThat(persisted.name).isEqualTo("theEntity"); @@ -529,7 +534,7 @@ class JpaTransactionManagerImplTest { @Test void maybeLoad_succeeds() { assertThat(tm().transact(() -> tm().exists(theEntity))).isFalse(); - insertInDb(theEntity); + persistResource(theEntity); TestEntity persisted = tm().transact( () -> assertDetachedFromEntityManager(tm().loadByKeyIfPresent(theEntityKey).get())); @@ -546,7 +551,7 @@ class JpaTransactionManagerImplTest { @Test void loadCompoundIdEntity_succeeds() { assertThat(tm().transact(() -> tm().exists(compoundIdEntity))).isFalse(); - insertInDb(compoundIdEntity); + persistResource(compoundIdEntity); TestCompoundIdEntity persisted = tm().transact(() -> assertDetachedFromEntityManager(tm().loadByKey(compoundIdEntityKey))); assertThat(persisted.name).isEqualTo("compoundIdEntity"); @@ -556,7 +561,7 @@ class JpaTransactionManagerImplTest { @Test void loadByKeysIfPresent() { - insertInDb(theEntity); + persistResource(theEntity); tm().transact( () -> { ImmutableMap, TestEntity> results = @@ -571,7 +576,7 @@ class JpaTransactionManagerImplTest { @Test void loadByKeys_succeeds() { - insertInDb(theEntity); + persistResource(theEntity); tm().transact( () -> { ImmutableMap, TestEntity> results = @@ -583,7 +588,7 @@ class JpaTransactionManagerImplTest { @Test void loadByEntitiesIfPresent_succeeds() { - insertInDb(theEntity); + persistResource(theEntity); tm().transact( () -> { ImmutableList results = @@ -596,7 +601,7 @@ class JpaTransactionManagerImplTest { @Test void loadByEntities_succeeds() { - insertInDb(theEntity); + persistResource(theEntity); tm().transact( () -> { ImmutableList results = tm().loadByEntities(ImmutableList.of(theEntity)); @@ -607,7 +612,7 @@ class JpaTransactionManagerImplTest { @Test void loadAll_succeeds() { - insertInDb(moreEntities); + persistResources(moreEntities); ImmutableList persisted = tm().transact( () -> @@ -619,7 +624,7 @@ class JpaTransactionManagerImplTest { @Test void loadSingleton_detaches() { - insertInDb(theEntity); + persistResource(theEntity); tm().transact( () -> assertThat( @@ -629,7 +634,7 @@ class JpaTransactionManagerImplTest { @Test void delete_succeeds() { - insertInDb(theEntity); + persistResource(theEntity); assertThat(tm().transact(() -> tm().exists(theEntity))).isTrue(); tm().transact(() -> tm().delete(theEntityKey)); assertThat(tm().transact(() -> tm().exists(theEntity))).isFalse(); @@ -644,7 +649,7 @@ class JpaTransactionManagerImplTest { @Test void deleteCompoundIdEntity_succeeds() { - insertInDb(compoundIdEntity); + persistResource(compoundIdEntity); assertThat(tm().transact(() -> tm().exists(compoundIdEntity))).isTrue(); tm().transact(() -> tm().delete(compoundIdEntityKey)); assertThat(tm().transact(() -> tm().exists(compoundIdEntity))).isFalse(); @@ -674,7 +679,7 @@ class JpaTransactionManagerImplTest { @Test void loadAfterUpdate_fails() { - insertInDb(theEntity); + persistResource(theEntity); assertThat( assertThrows( IllegalStateException.class, @@ -690,7 +695,7 @@ class JpaTransactionManagerImplTest { @Test void cqQuery_detaches() { - insertInDb(moreEntities); + persistResources(moreEntities); tm().transact( () -> assertThat( @@ -724,7 +729,7 @@ class JpaTransactionManagerImplTest { @Test void query_detachesResults() { - insertInDb(moreEntities); + persistResources(moreEntities); tm().transact( () -> tm().query("FROM TestEntity", TestEntity.class) diff --git a/core/src/test/java/google/registry/rdap/RdapDomainActionTest.java b/core/src/test/java/google/registry/rdap/RdapDomainActionTest.java index 81f86946b..2d84042cf 100644 --- a/core/src/test/java/google/registry/rdap/RdapDomainActionTest.java +++ b/core/src/test/java/google/registry/rdap/RdapDomainActionTest.java @@ -21,7 +21,7 @@ import static google.registry.testing.DatabaseHelper.createTld; import static google.registry.testing.DatabaseHelper.persistActiveDomain; import static google.registry.testing.DatabaseHelper.persistDomainWithDependentResources; import static google.registry.testing.DatabaseHelper.persistResource; -import static google.registry.testing.DatabaseHelper.persistSimpleResources; +import static google.registry.testing.DatabaseHelper.persistResources; import static google.registry.testing.FullFieldsTestEntityHelper.makeAndPersistHost; import static google.registry.testing.FullFieldsTestEntityHelper.makeDomain; import static google.registry.testing.FullFieldsTestEntityHelper.makeHistoryEntry; @@ -78,7 +78,7 @@ class RdapDomainActionTest extends RdapActionBaseTestCase { createTld("lol"); Registrar registrarLol = persistResource(makeRegistrar( "evilregistrar", "Yes Virginia