Convert ofy() to tm() for all contact transfer flows (#937)

* Convert ofy() to tm() for all contact transfer flows * Resolve comments
2025-07-08 20:23:24 +02:00 · 2021-01-22 09:38:51 -05:00 · 2021-01-22 09:38:51 -05:00 · 48de5d8375
commit 48de5d8375
parent 59abc1d154
19 changed files with 3022 additions and 2683 deletions
--- a/core/src/test/java/google/registry/flows/contact/ContactTransferApproveFlowTest.java
+++ b/core/src/test/java/google/registry/flows/contact/ContactTransferApproveFlowTest.java
@ -19,7 +19,6 @@ import static com.google.common.truth.Truth.assertThat;
 import static google.registry.testing.ContactResourceSubject.assertAboutContacts;
 import static google.registry.testing.DatabaseHelper.assertNoBillingEvents;
 import static google.registry.testing.DatabaseHelper.createTld;
-import static google.registry.testing.DatabaseHelper.deleteResource;
 import static google.registry.testing.DatabaseHelper.getOnlyPollMessage;
 import static google.registry.testing.DatabaseHelper.getPollMessages;
 import static google.registry.testing.DatabaseHelper.persistResource;
@ -41,10 +40,12 @@ import google.registry.model.reporting.HistoryEntry;
 import google.registry.model.transfer.TransferData;
 import google.registry.model.transfer.TransferResponse;
 import google.registry.model.transfer.TransferStatus;
+import google.registry.testing.DualDatabaseTest;
+import google.registry.testing.TestOfyAndSql;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;

 /** Unit tests for {@link ContactTransferApproveFlow}. */
+@DualDatabaseTest
 class ContactTransferApproveFlowTest
    extends ContactTransferFlowTestCase<ContactTransferApproveFlow, ContactResource> {

@ -121,24 +122,24 @@ class ContactTransferApproveFlowTest
    runFlow();
  }

-  @Test
+  @TestOfyAndSql
  void testDryRun() throws Exception {
    setEppInput("contact_transfer_approve.xml");
    dryRunFlowAssertResponse(loadFile("contact_transfer_approve_response.xml"));
  }

-  @Test
+  @TestOfyAndSql
  void testSuccess() throws Exception {
    doSuccessfulTest("contact_transfer_approve.xml", "contact_transfer_approve_response.xml");
  }

-  @Test
+  @TestOfyAndSql
  void testSuccess_withAuthinfo() throws Exception {
    doSuccessfulTest("contact_transfer_approve_with_authinfo.xml",
        "contact_transfer_approve_response.xml");
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_badContactPassword() {
    // Change the contact's password so it does not match the password in the file.
    contact = persistResource(
@ -152,7 +153,7 @@ class ContactTransferApproveFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_neverBeenTransferred() {
    changeTransferStatus(null);
    EppException thrown =
@ -161,7 +162,7 @@ class ContactTransferApproveFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_clientApproved() {
    changeTransferStatus(TransferStatus.CLIENT_APPROVED);
    EppException thrown =
@ -170,7 +171,7 @@ class ContactTransferApproveFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_clientRejected() {
    changeTransferStatus(TransferStatus.CLIENT_REJECTED);
    EppException thrown =
@ -179,7 +180,7 @@ class ContactTransferApproveFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_clientCancelled() {
    changeTransferStatus(TransferStatus.CLIENT_CANCELLED);
    EppException thrown =
@ -188,7 +189,7 @@ class ContactTransferApproveFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_serverApproved() {
    changeTransferStatus(TransferStatus.SERVER_APPROVED);
    EppException thrown =
@ -197,7 +198,7 @@ class ContactTransferApproveFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_serverCancelled() {
    changeTransferStatus(TransferStatus.SERVER_CANCELLED);
    EppException thrown =
@ -206,7 +207,7 @@ class ContactTransferApproveFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_gainingClient() {
    setClientIdForFlow("NewRegistrar");
    EppException thrown =
@ -215,7 +216,7 @@ class ContactTransferApproveFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_unrelatedClient() {
    setClientIdForFlow("ClientZ");
    EppException thrown =
@ -224,7 +225,7 @@ class ContactTransferApproveFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_deletedContact() throws Exception {
    contact = persistResource(
        contact.asBuilder().setDeletionTime(clock.nowUtc().minusDays(1)).build());
@ -236,9 +237,9 @@ class ContactTransferApproveFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_nonexistentContact() throws Exception {
-    deleteResource(contact);
+    persistResource(contact.asBuilder().setDeletionTime(clock.nowUtc().minusDays(1)).build());
    contact = persistResource(
        contact.asBuilder().setDeletionTime(clock.nowUtc().minusDays(1)).build());
    ResourceDoesNotExistException thrown =
@ -249,7 +250,7 @@ class ContactTransferApproveFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testIcannActivityReportField_getsLogged() throws Exception {
    runFlow();
    assertIcannReportingActivityFieldLogged("srs-cont-transfer-approve");
--- a/core/src/test/java/google/registry/flows/contact/ContactTransferCancelFlowTest.java
+++ b/core/src/test/java/google/registry/flows/contact/ContactTransferCancelFlowTest.java
@ -18,7 +18,6 @@ import static com.google.common.collect.MoreCollectors.onlyElement;
 import static com.google.common.truth.Truth.assertThat;
 import static google.registry.testing.ContactResourceSubject.assertAboutContacts;
 import static google.registry.testing.DatabaseHelper.assertNoBillingEvents;
-import static google.registry.testing.DatabaseHelper.deleteResource;
 import static google.registry.testing.DatabaseHelper.getOnlyPollMessage;
 import static google.registry.testing.DatabaseHelper.getPollMessages;
 import static google.registry.testing.DatabaseHelper.persistResource;
@ -38,10 +37,12 @@ import google.registry.model.reporting.HistoryEntry;
 import google.registry.model.transfer.TransferData;
 import google.registry.model.transfer.TransferResponse;
 import google.registry.model.transfer.TransferStatus;
+import google.registry.testing.DualDatabaseTest;
+import google.registry.testing.TestOfyAndSql;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;

 /** Unit tests for {@link ContactTransferCancelFlow}. */
+@DualDatabaseTest
 class ContactTransferCancelFlowTest
    extends ContactTransferFlowTestCase<ContactTransferCancelFlow, ContactResource> {

@ -105,24 +106,24 @@ class ContactTransferCancelFlowTest
    runFlow();
  }

-  @Test
+  @TestOfyAndSql
  void testDryRun() throws Exception {
    setEppInput("contact_transfer_cancel.xml");
    dryRunFlowAssertResponse(loadFile("contact_transfer_cancel_response.xml"));
  }

-  @Test
+  @TestOfyAndSql
  void testSuccess() throws Exception {
    doSuccessfulTest("contact_transfer_cancel.xml", "contact_transfer_cancel_response.xml");
  }

-  @Test
+  @TestOfyAndSql
  void testSuccess_withAuthinfo() throws Exception {
    doSuccessfulTest("contact_transfer_cancel_with_authinfo.xml",
        "contact_transfer_cancel_response.xml");
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_badContactPassword() {
    // Change the contact's password so it does not match the password in the file.
    contact =
@ -138,7 +139,7 @@ class ContactTransferCancelFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_neverBeenTransferred() {
    changeTransferStatus(null);
    EppException thrown =
@ -147,7 +148,7 @@ class ContactTransferCancelFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_clientApproved() {
    changeTransferStatus(TransferStatus.CLIENT_APPROVED);
    EppException thrown =
@ -156,7 +157,7 @@ class ContactTransferCancelFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_clientRejected() {
    changeTransferStatus(TransferStatus.CLIENT_REJECTED);
    EppException thrown =
@ -165,7 +166,7 @@ class ContactTransferCancelFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_clientCancelled() {
    changeTransferStatus(TransferStatus.CLIENT_CANCELLED);
    EppException thrown =
@ -174,7 +175,7 @@ class ContactTransferCancelFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_serverApproved() {
    changeTransferStatus(TransferStatus.SERVER_APPROVED);
    EppException thrown =
@ -183,7 +184,7 @@ class ContactTransferCancelFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_serverCancelled() {
    changeTransferStatus(TransferStatus.SERVER_CANCELLED);
    EppException thrown =
@ -192,7 +193,7 @@ class ContactTransferCancelFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_sponsoringClient() {
    setClientIdForFlow("TheRegistrar");
    EppException thrown =
@ -202,7 +203,7 @@ class ContactTransferCancelFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_unrelatedClient() {
    setClientIdForFlow("ClientZ");
    EppException thrown =
@ -212,7 +213,7 @@ class ContactTransferCancelFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_deletedContact() throws Exception {
    contact =
        persistResource(contact.asBuilder().setDeletionTime(clock.nowUtc().minusDays(1)).build());
@ -224,9 +225,9 @@ class ContactTransferCancelFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_nonexistentContact() throws Exception {
-    deleteResource(contact);
+    persistResource(contact.asBuilder().setDeletionTime(clock.nowUtc().minusDays(1)).build());
    ResourceDoesNotExistException thrown =
        assertThrows(
            ResourceDoesNotExistException.class,
@ -235,7 +236,7 @@ class ContactTransferCancelFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testIcannActivityReportField_getsLogged() throws Exception {
    runFlow();
    assertIcannReportingActivityFieldLogged("srs-cont-transfer-cancel");
--- a/core/src/test/java/google/registry/flows/contact/ContactTransferQueryFlowTest.java
+++ b/core/src/test/java/google/registry/flows/contact/ContactTransferQueryFlowTest.java
@ -17,7 +17,6 @@ package google.registry.flows.contact;
 import static com.google.common.truth.Truth.assertThat;
 import static google.registry.testing.ContactResourceSubject.assertAboutContacts;
 import static google.registry.testing.DatabaseHelper.assertNoBillingEvents;
-import static google.registry.testing.DatabaseHelper.deleteResource;
 import static google.registry.testing.DatabaseHelper.persistResource;
 import static google.registry.testing.EppExceptionSubject.assertAboutEppExceptions;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@ -32,11 +31,13 @@ import google.registry.model.contact.ContactResource;
 import google.registry.model.eppcommon.AuthInfo.PasswordAuth;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.model.transfer.TransferStatus;
+import google.registry.testing.DualDatabaseTest;
+import google.registry.testing.TestOfyAndSql;
 import org.joda.time.DateTime;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;

 /** Unit tests for {@link ContactTransferQueryFlow}. */
+@DualDatabaseTest
 class ContactTransferQueryFlowTest
    extends ContactTransferFlowTestCase<ContactTransferQueryFlow, ContactResource> {

@ -68,65 +69,65 @@ class ContactTransferQueryFlowTest
    runFlow();
  }

-  @Test
+  @TestOfyAndSql
  void testSuccess() throws Exception {
    doSuccessfulTest("contact_transfer_query.xml", "contact_transfer_query_response.xml");
  }

-  @Test
+  @TestOfyAndSql
  void testSuccess_withContactRoid() throws Exception {
    doSuccessfulTest("contact_transfer_query_with_roid.xml", "contact_transfer_query_response.xml");
  }

-  @Test
+  @TestOfyAndSql
  void testSuccess_sponsoringClient() throws Exception {
    setClientIdForFlow("TheRegistrar");
    doSuccessfulTest("contact_transfer_query.xml", "contact_transfer_query_response.xml");
  }

-  @Test
+  @TestOfyAndSql
  void testSuccess_withAuthinfo() throws Exception {
    setClientIdForFlow("ClientZ");
    doSuccessfulTest("contact_transfer_query_with_authinfo.xml",
        "contact_transfer_query_response.xml");
  }

-  @Test
+  @TestOfyAndSql
  void testSuccess_clientApproved() throws Exception {
    changeTransferStatus(TransferStatus.CLIENT_APPROVED);
    doSuccessfulTest("contact_transfer_query.xml",
        "contact_transfer_query_response_client_approved.xml");
  }

-  @Test
+  @TestOfyAndSql
  void testSuccess_clientRejected() throws Exception {
    changeTransferStatus(TransferStatus.CLIENT_REJECTED);
    doSuccessfulTest("contact_transfer_query.xml",
        "contact_transfer_query_response_client_rejected.xml");
  }

-  @Test
+  @TestOfyAndSql
  void testSuccess_clientCancelled() throws Exception {
    changeTransferStatus(TransferStatus.CLIENT_CANCELLED);
    doSuccessfulTest("contact_transfer_query.xml",
        "contact_transfer_query_response_client_cancelled.xml");
  }

-  @Test
+  @TestOfyAndSql
  void testSuccess_serverApproved() throws Exception {
    changeTransferStatus(TransferStatus.SERVER_APPROVED);
    doSuccessfulTest("contact_transfer_query.xml",
        "contact_transfer_query_response_server_approved.xml");
  }

-  @Test
+  @TestOfyAndSql
  void testSuccess_serverCancelled() throws Exception {
    changeTransferStatus(TransferStatus.SERVER_CANCELLED);
    doSuccessfulTest("contact_transfer_query.xml",
        "contact_transfer_query_response_server_cancelled.xml");
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_pendingDeleteContact() throws Exception {
    changeTransferStatus(TransferStatus.SERVER_CANCELLED);
    contact = persistResource(
@ -135,7 +136,7 @@ class ContactTransferQueryFlowTest
        "contact_transfer_query_response_server_cancelled.xml");
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_badContactPassword() {
    // Change the contact's password so it does not match the password in the file.
    contact =
@ -151,7 +152,7 @@ class ContactTransferQueryFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_badContactRoid() {
    // Set the contact to a different ROID, but don't persist it; this is just so the substitution
    // code above will write the wrong ROID into the file.
@ -163,7 +164,7 @@ class ContactTransferQueryFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_neverBeenTransferred() {
    changeTransferStatus(null);
    EppException thrown =
@ -173,7 +174,7 @@ class ContactTransferQueryFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_unrelatedClient() {
    setClientIdForFlow("ClientZ");
    EppException thrown =
@ -183,7 +184,7 @@ class ContactTransferQueryFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_deletedContact() throws Exception {
    contact =
        persistResource(contact.asBuilder().setDeletionTime(clock.nowUtc().minusDays(1)).build());
@ -194,9 +195,9 @@ class ContactTransferQueryFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_nonexistentContact() throws Exception {
-    deleteResource(contact);
+    persistResource(contact.asBuilder().setDeletionTime(clock.nowUtc().minusDays(1)).build());
    ResourceDoesNotExistException thrown =
        assertThrows(
            ResourceDoesNotExistException.class, () -> doFailingTest("contact_transfer_query.xml"));
@ -204,7 +205,7 @@ class ContactTransferQueryFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testIcannActivityReportField_getsLogged() throws Exception {
    runFlow();
    assertIcannReportingActivityFieldLogged("srs-cont-transfer-query");
--- a/core/src/test/java/google/registry/flows/contact/ContactTransferRejectFlowTest.java
+++ b/core/src/test/java/google/registry/flows/contact/ContactTransferRejectFlowTest.java
@ -18,7 +18,6 @@ import static com.google.common.collect.MoreCollectors.onlyElement;
 import static com.google.common.truth.Truth.assertThat;
 import static google.registry.testing.ContactResourceSubject.assertAboutContacts;
 import static google.registry.testing.DatabaseHelper.assertNoBillingEvents;
-import static google.registry.testing.DatabaseHelper.deleteResource;
 import static google.registry.testing.DatabaseHelper.getOnlyPollMessage;
 import static google.registry.testing.DatabaseHelper.getPollMessages;
 import static google.registry.testing.DatabaseHelper.persistResource;
@ -40,10 +39,12 @@ import google.registry.model.reporting.HistoryEntry;
 import google.registry.model.transfer.TransferData;
 import google.registry.model.transfer.TransferResponse;
 import google.registry.model.transfer.TransferStatus;
+import google.registry.testing.DualDatabaseTest;
+import google.registry.testing.TestOfyAndSql;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;

 /** Unit tests for {@link ContactTransferRejectFlow}. */
+@DualDatabaseTest
 class ContactTransferRejectFlowTest
    extends ContactTransferFlowTestCase<ContactTransferRejectFlow, ContactResource> {

@ -120,24 +121,24 @@ class ContactTransferRejectFlowTest
    runFlow();
  }

-  @Test
+  @TestOfyAndSql
  void testDryRun() throws Exception {
    setEppInput("contact_transfer_reject.xml");
    dryRunFlowAssertResponse(loadFile("contact_transfer_reject_response.xml"));
  }

-  @Test
+  @TestOfyAndSql
  void testSuccess() throws Exception {
    doSuccessfulTest("contact_transfer_reject.xml", "contact_transfer_reject_response.xml");
  }

-  @Test
+  @TestOfyAndSql
  void testSuccess_domainAuthInfo() throws Exception {
    doSuccessfulTest("contact_transfer_reject_with_authinfo.xml",
        "contact_transfer_reject_response.xml");
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_badPassword() {
    // Change the contact's password so it does not match the password in the file.
    contact =
@ -153,7 +154,7 @@ class ContactTransferRejectFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_neverBeenTransferred() {
    changeTransferStatus(null);
    EppException thrown =
@ -162,7 +163,7 @@ class ContactTransferRejectFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_clientApproved() {
    changeTransferStatus(TransferStatus.CLIENT_APPROVED);
    EppException thrown =
@ -171,7 +172,7 @@ class ContactTransferRejectFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_clientRejected() {
    changeTransferStatus(TransferStatus.CLIENT_REJECTED);
    EppException thrown =
@ -180,7 +181,7 @@ class ContactTransferRejectFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_clientCancelled() {
    changeTransferStatus(TransferStatus.CLIENT_CANCELLED);
    EppException thrown =
@ -189,7 +190,7 @@ class ContactTransferRejectFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_serverApproved() {
    changeTransferStatus(TransferStatus.SERVER_APPROVED);
    EppException thrown =
@ -198,7 +199,7 @@ class ContactTransferRejectFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_serverCancelled() {
    changeTransferStatus(TransferStatus.SERVER_CANCELLED);
    EppException thrown =
@ -207,7 +208,7 @@ class ContactTransferRejectFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_gainingClient() {
    setClientIdForFlow("NewRegistrar");
    EppException thrown =
@ -216,7 +217,7 @@ class ContactTransferRejectFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_unrelatedClient() {
    setClientIdForFlow("ClientZ");
    EppException thrown =
@ -225,7 +226,7 @@ class ContactTransferRejectFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_deletedContact() throws Exception {
    contact =
        persistResource(contact.asBuilder().setDeletionTime(clock.nowUtc().minusDays(1)).build());
@ -237,9 +238,9 @@ class ContactTransferRejectFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_nonexistentContact() throws Exception {
-    deleteResource(contact);
+    persistResource(contact.asBuilder().setDeletionTime(clock.nowUtc().minusDays(1)).build());
    ResourceDoesNotExistException thrown =
        assertThrows(
            ResourceDoesNotExistException.class,
@ -248,7 +249,7 @@ class ContactTransferRejectFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testIcannActivityReportField_getsLogged() throws Exception {
    runFlow();
    assertIcannReportingActivityFieldLogged("srs-cont-transfer-reject");
--- a/core/src/test/java/google/registry/flows/contact/ContactTransferRequestFlowTest.java
+++ b/core/src/test/java/google/registry/flows/contact/ContactTransferRequestFlowTest.java
@ -20,7 +20,8 @@ import static com.google.common.collect.Iterables.getOnlyElement;
 import static com.google.common.collect.MoreCollectors.onlyElement;
 import static com.google.common.truth.Truth.assertThat;
 import static google.registry.config.RegistryConfig.getContactAutomaticTransferLength;
-import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
+import static google.registry.persistence.transaction.TransactionManagerUtil.transactIfJpaTm;
 import static google.registry.testing.ContactResourceSubject.assertAboutContacts;
 import static google.registry.testing.DatabaseHelper.assertNoBillingEvents;
 import static google.registry.testing.DatabaseHelper.assertPollMessagesEqual;
@ -29,11 +30,11 @@ import static google.registry.testing.DatabaseHelper.getPollMessages;
 import static google.registry.testing.DatabaseHelper.persistActiveContact;
 import static google.registry.testing.DatabaseHelper.persistResource;
 import static google.registry.testing.EppExceptionSubject.assertAboutEppExceptions;
+import static google.registry.util.CollectionUtils.forceEmptyToNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;

 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
-import com.googlecode.objectify.Key;
 import google.registry.flows.EppException;
 import google.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException;
 import google.registry.flows.ResourceFlowUtils.ResourceDoesNotExistException;
@ -50,12 +51,13 @@ import google.registry.model.poll.PollMessage;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.model.transfer.ContactTransferData;
 import google.registry.model.transfer.TransferStatus;
-import google.registry.persistence.VKey;
+import google.registry.testing.DualDatabaseTest;
+import google.registry.testing.TestOfyAndSql;
 import org.joda.time.DateTime;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;

 /** Unit tests for {@link ContactTransferRequestFlow}. */
+@DualDatabaseTest
 class ContactTransferRequestFlowTest
    extends ContactTransferFlowTestCase<ContactTransferRequestFlow, ContactResource> {

@ -102,7 +104,8 @@ class ContactTransferRequestFlowTest
                .setPendingTransferExpirationTime(afterTransfer)
                // Make the server-approve entities field a no-op comparison; it's easier to
                // do this comparison separately below.
-                .setServerApproveEntities(contact.getTransferData().getServerApproveEntities())
+                .setServerApproveEntities(
+                    forceEmptyToNull(contact.getTransferData().getServerApproveEntities()))
                .build());
    assertNoBillingEvents();
    assertThat(getPollMessages("TheRegistrar", clock.nowUtc())).hasSize(1);
@ -126,13 +129,8 @@ class ContactTransferRequestFlowTest
    // poll messages, the approval notice ones for gaining and losing registrars.
    assertPollMessagesEqual(
        Iterables.filter(
-            ofy()
-                .load()
-                // Use toArray() to coerce the type to something keys() will accept.
-                .keys(
-                    contact.getTransferData().getServerApproveEntities().stream()
-                        .map(VKey::getOfyKey)
-                        .toArray(Key[]::new))
+            transactIfJpaTm(
+                    () -> tm().loadByKeys(contact.getTransferData().getServerApproveEntities()))
                .values(),
            PollMessage.class),
        ImmutableList.of(gainingApproveMessage, losingApproveMessage));
@ -145,18 +143,18 @@ class ContactTransferRequestFlowTest
    runFlow();
  }

-  @Test
+  @TestOfyAndSql
  void testDryRun() throws Exception {
    setEppInput("contact_transfer_request.xml");
    dryRunFlowAssertResponse(loadFile("contact_transfer_request_response.xml"));
  }

-  @Test
+  @TestOfyAndSql
  void testSuccess() throws Exception {
    doSuccessfulTest("contact_transfer_request.xml", "contact_transfer_request_response.xml");
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_noAuthInfo() {
    EppException thrown =
        assertThrows(
@ -165,7 +163,7 @@ class ContactTransferRequestFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_badPassword() {
    // Change the contact's password so it does not match the password in the file.
    contact =
@ -181,37 +179,37 @@ class ContactTransferRequestFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testSuccess_clientApproved() throws Exception {
    changeTransferStatus(TransferStatus.CLIENT_APPROVED);
    doSuccessfulTest("contact_transfer_request.xml", "contact_transfer_request_response.xml");
  }

-  @Test
+  @TestOfyAndSql
  void testSuccess_clientRejected() throws Exception {
    changeTransferStatus(TransferStatus.CLIENT_REJECTED);
    doSuccessfulTest("contact_transfer_request.xml", "contact_transfer_request_response.xml");
  }

-  @Test
+  @TestOfyAndSql
  void testSuccess_clientCancelled() throws Exception {
    changeTransferStatus(TransferStatus.CLIENT_CANCELLED);
    doSuccessfulTest("contact_transfer_request.xml", "contact_transfer_request_response.xml");
  }

-  @Test
+  @TestOfyAndSql
  void testSuccess_serverApproved() throws Exception {
    changeTransferStatus(TransferStatus.SERVER_APPROVED);
    doSuccessfulTest("contact_transfer_request.xml", "contact_transfer_request_response.xml");
  }

-  @Test
+  @TestOfyAndSql
  void testSuccess_serverCancelled() throws Exception {
    changeTransferStatus(TransferStatus.SERVER_CANCELLED);
    doSuccessfulTest("contact_transfer_request.xml", "contact_transfer_request_response.xml");
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_pending() {
    contact =
        persistResource(
@ -232,7 +230,7 @@ class ContactTransferRequestFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_sponsoringClient() {
    setClientIdForFlow("TheRegistrar");
    EppException thrown =
@ -242,7 +240,7 @@ class ContactTransferRequestFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_deletedContact() throws Exception {
    contact =
        persistResource(contact.asBuilder().setDeletionTime(clock.nowUtc().minusDays(1)).build());
@ -254,7 +252,7 @@ class ContactTransferRequestFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_nonexistentContact() throws Exception {
    deleteResource(contact);
    ResourceDoesNotExistException thrown =
@ -265,7 +263,7 @@ class ContactTransferRequestFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_clientTransferProhibited() {
    contact =
        persistResource(
@ -278,7 +276,7 @@ class ContactTransferRequestFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_serverTransferProhibited() {
    contact =
        persistResource(
@ -291,7 +289,7 @@ class ContactTransferRequestFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testFailure_pendingDelete() {
    contact =
        persistResource(contact.asBuilder().addStatusValue(StatusValue.PENDING_DELETE).build());
@ -303,7 +301,7 @@ class ContactTransferRequestFlowTest
    assertAboutEppExceptions().that(thrown).marshalsToXml();
  }

-  @Test
+  @TestOfyAndSql
  void testIcannActivityReportField_getsLogged() throws Exception {
    runFlow();
    assertIcannReportingActivityFieldLogged("srs-cont-transfer-request");
--- a/core/src/test/java/google/registry/model/transfer/TransferDataTest.java
+++ b/core/src/test/java/google/registry/model/transfer/TransferDataTest.java
@ -54,28 +54,28 @@ public class TransferDataTest {
    transferBillingEventKey =
        VKey.create(
            BillingEvent.OneTime.class,
-            12345,
-            Key.create(historyEntryKey, BillingEvent.OneTime.class, 12345));
+            12345L,
+            Key.create(historyEntryKey, BillingEvent.OneTime.class, 12345L));
    otherServerApproveBillingEventKey =
        VKey.create(
            BillingEvent.Cancellation.class,
-            2468,
-            Key.create(historyEntryKey, BillingEvent.Cancellation.class, 2468));
+            2468L,
+            Key.create(historyEntryKey, BillingEvent.Cancellation.class, 2468L));
    recurringBillingEventKey =
        VKey.create(
            BillingEvent.Recurring.class,
-            13579,
-            Key.create(historyEntryKey, BillingEvent.Recurring.class, 13579));
+            13579L,
+            Key.create(historyEntryKey, BillingEvent.Recurring.class, 13579L));
    autorenewPollMessageKey =
        VKey.create(
            PollMessage.Autorenew.class,
-            67890,
-            Key.create(historyEntryKey, PollMessage.Autorenew.class, 67890));
+            67890L,
+            Key.create(historyEntryKey, PollMessage.Autorenew.class, 67890L));
    otherServerApprovePollMessageKey =
        VKey.create(
            PollMessage.OneTime.class,
-            314159,
-            Key.create(historyEntryKey, PollMessage.OneTime.class, 314159));
+            314159L,
+            Key.create(historyEntryKey, PollMessage.OneTime.class, 314159L));
  }

  @Test
--- a/core/src/test/java/google/registry/testing/DatabaseHelper.java
+++ b/core/src/test/java/google/registry/testing/DatabaseHelper.java
@ -109,6 +109,7 @@ import google.registry.model.transfer.TransferStatus;
 import google.registry.persistence.VKey;
 import google.registry.tmch.LordnTaskUtils;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@ -116,7 +117,6 @@ import javax.annotation.Nullable;
 import org.joda.money.CurrencyUnit;
 import org.joda.money.Money;
 import org.joda.time.DateTime;
-import org.joda.time.DateTimeComparator;
 import org.joda.time.DateTimeZone;

 /** Static utils for setting up test resources. */
@ -532,11 +532,14 @@ public class DatabaseHelper {
      DateTime requestTime,
      DateTime expirationTime,
      DateTime now) {
-    HistoryEntry historyEntryContactTransfer = persistResource(
-        new HistoryEntry.Builder()
-            .setType(HistoryEntry.Type.CONTACT_TRANSFER_REQUEST)
-            .setParent(contact)
-            .build());
+    HistoryEntry historyEntryContactTransfer =
+        persistResource(
+            new HistoryEntry.Builder()
+                .setType(HistoryEntry.Type.CONTACT_TRANSFER_REQUEST)
+                .setParent(persistResource(contact))
+                .setModificationTime(now)
+                .build()
+                .toChildHistoryEntity());
    return persistResource(
        contact
            .asBuilder()
@ -1115,7 +1118,8 @@ public class DatabaseHelper {
                              historyEntry ->
                                  historyEntry.getParent().getName().equals(resource.getRepoId()))
                          .collect(toImmutableList());
-                  return ImmutableList.sortedCopyOf(DateTimeComparator.getInstance(), filtered);
+                  return ImmutableList.sortedCopyOf(
+                      Comparator.comparing(HistoryEntry::getModificationTime), filtered);
                });
  }