mirror of
https://github.com/google/nomulus.git
synced 2025-04-30 20:17:51 +02:00
7e68ffa16a
This CL changes the domain and contact transfer flows to check the entire TransferData on the post-transfer resource, rather than just spot-checking certain fields. This approach provides much better code coverage - in particular, it checks that the non-request flows (approve, cancel, reject) don't modify the fields that they shouldn't be modifying, and that they do actually clear out the transfer server-approve entities fields written by the transfer request flow. It's slightly orthogonal, but I also added testing that the server-approve entities fields are actually set in the request flows, which was previously untested. This is pre-work for introducing an exDate-storing field into TransferData, by making it easier to test everywhere that exDate is set *and* unset only in the correct places. As part of this CL, I've introduced a TransferData.copyConstantFieldsToBuilder() method that is like asBuilder() but instead of copying all the fields to the new builder, it only copies the logically constant ones: losing/gaining client IDs, the request time and TRID, and transferPeriod. This is useful both in tests but is also used in the resolvingPendingTransfer() helper that centralizes the core transfer resolution logic (as of [] That method has its own tests, and in the process I removed a bunch of crufty defunct TransferData tests. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=171053454
93 lines
3.9 KiB
Java
93 lines
3.9 KiB
Java
// Copyright 2017 The Nomulus Authors. All Rights Reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package google.registry.model.transfer;
|
|
|
|
import static com.google.common.truth.Truth.assertThat;
|
|
import static org.joda.time.DateTimeZone.UTC;
|
|
|
|
import com.google.common.collect.ImmutableSet;
|
|
import com.googlecode.objectify.Key;
|
|
import google.registry.model.billing.BillingEvent;
|
|
import google.registry.model.domain.Period;
|
|
import google.registry.model.eppcommon.Trid;
|
|
import google.registry.model.poll.PollMessage;
|
|
import google.registry.model.transfer.TransferData.TransferServerApproveEntity;
|
|
import google.registry.testing.AppEngineRule;
|
|
import org.joda.time.DateTime;
|
|
import org.junit.Before;
|
|
import org.junit.Rule;
|
|
import org.junit.Test;
|
|
import org.junit.runner.RunWith;
|
|
import org.junit.runners.JUnit4;
|
|
|
|
/** Unit tests for {@link TransferData}. */
|
|
@RunWith(JUnit4.class)
|
|
public class TransferDataTest {
|
|
|
|
@Rule
|
|
public final AppEngineRule appEngine = AppEngineRule.builder()
|
|
.withDatastore()
|
|
.build();
|
|
|
|
private final DateTime now = DateTime.now(UTC);
|
|
|
|
private Key<BillingEvent.OneTime> transferBillingEventKey;
|
|
private Key<BillingEvent.Cancellation> otherServerApproveBillingEventKey;
|
|
private Key<BillingEvent.Recurring> recurringBillingEventKey;
|
|
private Key<PollMessage.Autorenew> autorenewPollMessageKey;
|
|
private Key<PollMessage.OneTime> otherServerApprovePollMessageKey;
|
|
|
|
@Before
|
|
public void setUp() {
|
|
transferBillingEventKey = Key.create(BillingEvent.OneTime.class, 12345);
|
|
otherServerApproveBillingEventKey = Key.create(BillingEvent.Cancellation.class, 2468);
|
|
recurringBillingEventKey = Key.create(BillingEvent.Recurring.class, 13579);
|
|
autorenewPollMessageKey = Key.create(PollMessage.Autorenew.class, 67890);
|
|
otherServerApprovePollMessageKey = Key.create(PollMessage.OneTime.class, 314159);
|
|
}
|
|
|
|
@Test
|
|
public void test_copyConstantFieldsToBuilder() throws Exception {
|
|
TransferData constantTransferData =
|
|
new TransferData.Builder()
|
|
.setTransferRequestTrid(Trid.create("server-trid", "client-trid"))
|
|
.setTransferRequestTime(now)
|
|
.setGainingClientId("NewRegistrar")
|
|
.setLosingClientId("TheRegistrar")
|
|
// Test must use a non-1-year period, since that's the default value.
|
|
.setTransferPeriod(Period.create(5, Period.Unit.YEARS))
|
|
.build();
|
|
TransferData fullTransferData =
|
|
constantTransferData.asBuilder()
|
|
.setPendingTransferExpirationTime(now)
|
|
.setTransferStatus(TransferStatus.PENDING)
|
|
.setServerApproveEntities(
|
|
ImmutableSet.<Key<? extends TransferServerApproveEntity>>of(
|
|
transferBillingEventKey,
|
|
otherServerApproveBillingEventKey,
|
|
recurringBillingEventKey,
|
|
autorenewPollMessageKey,
|
|
otherServerApprovePollMessageKey))
|
|
.setServerApproveBillingEvent(transferBillingEventKey)
|
|
.setServerApproveAutorenewEvent(recurringBillingEventKey)
|
|
.setServerApproveAutorenewPollMessage(autorenewPollMessageKey)
|
|
.build();
|
|
// asBuilder() copies over all fields
|
|
assertThat(fullTransferData.asBuilder().build()).isEqualTo(fullTransferData);
|
|
// copyConstantFieldsToBuilder() copies only constant fields
|
|
assertThat(fullTransferData.copyConstantFieldsToBuilder().build())
|
|
.isEqualTo(constantTransferData);
|
|
}
|
|
}
|