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

Add db-compare tests to three more flows (#963)

Browse source 
* Add db-compare tests to three more flows

Add database comparison to the replay tests for DomainDeleteFlowTest,
DomainRenewFlowTest and DomainUpdateFlowTest.
This commit is contained in:
Michael Muller 2021-02-11 11:35:13 -05:00 • committed by GitHub
parent f983d564f8
commit 17cd9ba4f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/src/main/java/google/registry/model/domain/DomainContent.java
View file

@ -337,6 +337,10 @@ public class DomainContent extends EppResource
nullToEmptyImmutableCopy(dsData).stream()
.map(dsData -> dsData.cloneWithDomainRepoId(getRepoId()))
.collect(toImmutableSet());
if (transferData != null) {
transferData.convertVKeys();
}
}
@PostLoad

2
core/src/main/java/google/registry/model/poll/PollMessage.java
View file

@ -295,7 +295,7 @@ public abstract class PollMessage extends ImmutableObject
@Transient @ImmutableObject.DoNotCompare
List<DomainPendingActionNotificationResponse> domainPendingActionNotificationResponses;
@Transient List<DomainTransferResponse> domainTransferResponses;
@Transient @ImmutableObject.DoNotCompare List<DomainTransferResponse> domainTransferResponses;
@Transient List<HostPendingActionNotificationResponse> hostPendingActionNotificationResponses;

10
core/src/main/java/google/registry/model/transfer/DomainTransferData.java
View file

@ -144,6 +144,16 @@ public class DomainTransferData extends TransferData<DomainTransferData.Builder>
rootKey, serverApproveAutorenewPollMessage, serverApproveAutorenewPollMessageHistoryId);
}
/**
* Fix the VKey "kind" for the PollMessage keys.
*
* <p>For use by DomainBase/DomainHistory OnLoad methods ONLY.
*/
public void convertVKeys() {
serverApproveAutorenewPollMessage =
PollMessage.Autorenew.convertVKey(serverApproveAutorenewPollMessage);
}
@SuppressWarnings("unused") // For Hibernate.
private void loadServerApproveBillingEventHistoryId(
@AlsoLoad("serverApproveBillingEvent") VKey<BillingEvent.OneTime> val) {

2
core/src/main/java/google/registry/model/transfer/TransferData.java
View file

@ -15,6 +15,7 @@
package google.registry.model.transfer;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static google.registry.model.ImmutableObject.DoNotCompare;
import static google.registry.util.CollectionUtils.isNullOrEmpty;
import static google.registry.util.CollectionUtils.nullToEmpty;
import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
@ -76,6 +77,7 @@ public abstract class TransferData<
* be deleted.
*/
@Transient
@DoNotCompare
@IgnoreSave(IfNull.class)
Set<VKey<? extends TransferServerApproveEntity>> serverApproveEntities;

2
core/src/test/java/google/registry/flows/domain/DomainDeleteFlowTest.java
View file

@ -112,7 +112,7 @@ class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow, Domain
@Order(value = Order.DEFAULT - 2)
@RegisterExtension
final ReplayExtension replayExtension = ReplayExtension.createWithoutCompare(clock);
final ReplayExtension replayExtension = ReplayExtension.createWithCompare(clock);
private DomainBase domain;
private HistoryEntry earlierHistoryEntry;

2
core/src/test/java/google/registry/flows/domain/DomainRenewFlowTest.java
View file

@ -108,7 +108,7 @@ class DomainRenewFlowTest extends ResourceFlowTestCase<DomainRenewFlow, DomainBa
@Order(value = Order.DEFAULT - 2)
@RegisterExtension
final ReplayExtension replayExtension = ReplayExtension.createWithoutCompare(clock);
final ReplayExtension replayExtension = ReplayExtension.createWithCompare(clock);
@BeforeEach
void initDomainTest() {

2
core/src/test/java/google/registry/flows/domain/DomainUpdateFlowTest.java
View file

@ -117,7 +117,7 @@ class DomainUpdateFlowTest extends ResourceFlowTestCase<DomainUpdateFlow, Domain
@Order(value = Order.DEFAULT - 2)
@RegisterExtension
final ReplayExtension replayExtension = ReplayExtension.createWithoutCompare(clock);
final ReplayExtension replayExtension = ReplayExtension.createWithCompare(clock);
@BeforeEach
void initDomainTest() {