From 83ca9d82dfb1b1e286f9033c1ba6a7510460a59f Mon Sep 17 00:00:00 2001
From: Michael Muller <mmuller@google.com>
Date: Tue, 2 Mar 2021 11:50:03 -0500
Subject: [PATCH] Add replay & compare to ContactCreateFlowTest test (#976)

* Add replay & compare to ContactCreateFlowTest test

This test exposed a write priority issue between ContactResource and
ContactHistory entries.
---
 .../google/registry/model/ofy/EntityWritePriorities.java   | 2 +-
 .../registry/flows/contact/ContactCreateFlowTest.java      | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/google/registry/model/ofy/EntityWritePriorities.java b/core/src/main/java/google/registry/model/ofy/EntityWritePriorities.java
index 6a86ba151..cc030d9ab 100644
--- a/core/src/main/java/google/registry/model/ofy/EntityWritePriorities.java
+++ b/core/src/main/java/google/registry/model/ofy/EntityWritePriorities.java
@@ -41,9 +41,9 @@ public class EntityWritePriorities {
    */
   static final ImmutableMap<String, Integer> CLASS_PRIORITIES =
       ImmutableMap.of(
+          "ContactResource", -15,
           "HistoryEntry", -10,
           "AllocationToken", -9,
-          "ContactResource", 5,
           "DomainBase", 10);
 
   // The beginning of the range of priority numbers reserved for delete.  This must be greater than
diff --git a/core/src/test/java/google/registry/flows/contact/ContactCreateFlowTest.java b/core/src/test/java/google/registry/flows/contact/ContactCreateFlowTest.java
index e697d75d9..18fe817aa 100644
--- a/core/src/test/java/google/registry/flows/contact/ContactCreateFlowTest.java
+++ b/core/src/test/java/google/registry/flows/contact/ContactCreateFlowTest.java
@@ -33,13 +33,20 @@ import google.registry.flows.exceptions.ResourceAlreadyExistsForThisClientExcept
 import google.registry.flows.exceptions.ResourceCreateContentionException;
 import google.registry.model.contact.ContactResource;
 import google.registry.testing.DualDatabaseTest;
+import google.registry.testing.ReplayExtension;
 import google.registry.testing.TestOfyAndSql;
 import org.joda.time.DateTime;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 /** Unit tests for {@link ContactCreateFlow}. */
 @DualDatabaseTest
 class ContactCreateFlowTest extends ResourceFlowTestCase<ContactCreateFlow, ContactResource> {
 
+  @Order(value = Order.DEFAULT - 2)
+  @RegisterExtension
+  final ReplayExtension replayExtension = ReplayExtension.createWithCompare(clock);
+
   ContactCreateFlowTest() {
     setEppInput("contact_create.xml");
     clock.setTo(DateTime.parse("1999-04-03T22:00:00.0Z"));