mirror of
https://github.com/google/nomulus.git
synced 2025-08-05 01:11:50 +02:00
Change lrpTldStates to Interval
------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=135957698
This commit is contained in:
ctingue
Ben McIlwain
parent
edbb8985e6
commit
4e0b6d36c4
13 changed files with 232 additions and 131 deletions
|
|
@ -125,6 +125,7 @@ import java.util.List;
|
|||
import org.joda.money.CurrencyUnit;
|
||||
import org.joda.money.Money;
|
||||
import org.joda.time.DateTime;
|
||||
import org.joda.time.Interval;
|
||||
import org.junit.Before;
|
||||
import org.junit.Ignore;
|
||||
import org.junit.Rule;
|
||||
|
|
@ -876,7 +877,7 @@ public class DomainApplicationCreateFlowTest
|
|||
public void testSuccess_landrushLrpApplication() throws Exception {
|
||||
createTld("tld", TldState.LANDRUSH);
|
||||
persistResource(Registry.get("tld").asBuilder()
|
||||
.setLrpTldStates(ImmutableSet.of(TldState.LANDRUSH))
|
||||
.setLrpPeriod(new Interval(clock.nowUtc().minusDays(1), clock.nowUtc().plusDays(1)))
|
||||
.build());
|
||||
LrpTokenEntity token = persistResource(
|
||||
new LrpTokenEntity.Builder()
|
||||
|
|
@ -895,7 +896,7 @@ public class DomainApplicationCreateFlowTest
|
|||
public void testSuccess_landrush_duringLrpWithMissingToken() throws Exception {
|
||||
createTld("tld", TldState.LANDRUSH);
|
||||
persistResource(Registry.get("tld").asBuilder()
|
||||
.setLrpTldStates(ImmutableSet.of(TldState.LANDRUSH))
|
||||
.setLrpPeriod(new Interval(clock.nowUtc().minusDays(1), clock.nowUtc().plusDays(1)))
|
||||
.build());
|
||||
setEppInput("domain_create_landrush.xml");
|
||||
persistContactsAndHosts();
|
||||
|
|
@ -909,7 +910,7 @@ public class DomainApplicationCreateFlowTest
|
|||
// as non-superuser).
|
||||
createTld("tld", TldState.LANDRUSH);
|
||||
persistResource(Registry.get("tld").asBuilder()
|
||||
.setLrpTldStates(ImmutableSet.of(TldState.LANDRUSH))
|
||||
.setLrpPeriod(new Interval(clock.nowUtc().minusDays(1), clock.nowUtc().plusDays(1)))
|
||||
.build());
|
||||
LrpTokenEntity token = persistResource(
|
||||
new LrpTokenEntity.Builder()
|
||||
|
|
@ -928,7 +929,7 @@ public class DomainApplicationCreateFlowTest
|
|||
public void testFailure_landrushLrpApplication_badToken() throws Exception {
|
||||
createTld("tld", TldState.LANDRUSH);
|
||||
persistResource(Registry.get("tld").asBuilder()
|
||||
.setLrpTldStates(ImmutableSet.of(TldState.LANDRUSH))
|
||||
.setLrpPeriod(new Interval(clock.nowUtc().minusDays(1), clock.nowUtc().plusDays(1)))
|
||||
.build());
|
||||
persistResource(new LrpTokenEntity.Builder()
|
||||
.setToken("lrptokentest2")
|
||||
|
|
@ -946,7 +947,7 @@ public class DomainApplicationCreateFlowTest
|
|||
public void testFailure_landrushLrpApplication_tokenForWrongTld() throws Exception {
|
||||
createTld("tld", TldState.LANDRUSH);
|
||||
persistResource(Registry.get("tld").asBuilder()
|
||||
.setLrpTldStates(ImmutableSet.of(TldState.LANDRUSH))
|
||||
.setLrpPeriod(new Interval(clock.nowUtc().minusDays(1), clock.nowUtc().plusDays(1)))
|
||||
.build());
|
||||
persistResource(new LrpTokenEntity.Builder()
|
||||
.setToken("lrptokentest")
|
||||
|
|
@ -967,7 +968,7 @@ public class DomainApplicationCreateFlowTest
|
|||
public void testFailure_landrushLrpApplication_usedToken() throws Exception {
|
||||
createTld("tld", TldState.LANDRUSH);
|
||||
persistResource(Registry.get("tld").asBuilder()
|
||||
.setLrpTldStates(ImmutableSet.of(TldState.LANDRUSH))
|
||||
.setLrpPeriod(new Interval(clock.nowUtc().minusDays(1), clock.nowUtc().plusDays(1)))
|
||||
.build());
|
||||
persistResource(new LrpTokenEntity.Builder()
|
||||
.setToken("lrptokentest")
|
||||
|
|
@ -1003,10 +1004,10 @@ public class DomainApplicationCreateFlowTest
|
|||
}
|
||||
|
||||
@Test
|
||||
public void testSuccess_landrushApplicationWithLrpToken_differentLrpState() throws Exception {
|
||||
public void testSuccess_landrushApplicationWithLrpToken_noLongerLrp() throws Exception {
|
||||
createTld("tld");
|
||||
persistResource(Registry.get("tld").asBuilder()
|
||||
.setLrpTldStates(ImmutableSet.of(TldState.SUNRISE))
|
||||
.setLrpPeriod(new Interval(clock.nowUtc().minusDays(2), clock.nowUtc().minusDays(1)))
|
||||
.setTldStateTransitions(ImmutableSortedMap.of(
|
||||
START_OF_TIME, TldState.SUNRISE,
|
||||
clock.nowUtc(), TldState.LANDRUSH))
|
||||
|
|
|
|||
|
|
@ -445,21 +445,4 @@ public class RegistryTest extends EntityTestCase {
|
|||
.setEapFeeSchedule(ImmutableSortedMap.of(START_OF_TIME, Money.zero(EUR)))
|
||||
.build();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFailure_lrpTldState_notInTransitions() {
|
||||
Registry registry = Registry.get("tld").asBuilder()
|
||||
.setTldStateTransitions(ImmutableSortedMap.<DateTime, TldState>naturalOrder()
|
||||
.put(START_OF_TIME, TldState.PREDELEGATION)
|
||||
.put(clock.nowUtc().plusMonths(1), TldState.SUNRISE)
|
||||
.put(clock.nowUtc().plusMonths(3), TldState.LANDRUSH)
|
||||
.put(clock.nowUtc().plusMonths(4), TldState.QUIET_PERIOD)
|
||||
.put(clock.nowUtc().plusMonths(5), TldState.GENERAL_AVAILABILITY)
|
||||
.build())
|
||||
.build();
|
||||
thrown.expect(
|
||||
IllegalArgumentException.class,
|
||||
"Cannot specify an LRP TLD state that is not part of the TLD state transitions.");
|
||||
registry.asBuilder().setLrpTldStates(ImmutableSet.of(TldState.SUNRUSH)).build();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -693,7 +693,6 @@ class google.registry.model.registry.Registry {
|
|||
java.lang.String tldStr;
|
||||
java.lang.String tldUnicode;
|
||||
java.util.Set<com.googlecode.objectify.Key<google.registry.model.registry.label.ReservedList>> reservedLists;
|
||||
java.util.Set<google.registry.model.registry.Registry$TldState> lrpTldStates;
|
||||
java.util.Set<java.lang.String> allowedFullyQualifiedHostNames;
|
||||
java.util.Set<java.lang.String> allowedRegistrantContactIds;
|
||||
org.joda.money.CurrencyUnit currency;
|
||||
|
|
@ -701,6 +700,8 @@ class google.registry.model.registry.Registry {
|
|||
org.joda.money.Money restoreBillingCost;
|
||||
org.joda.money.Money serverStatusChangeBillingCost;
|
||||
org.joda.time.DateTime claimsPeriodEnd;
|
||||
org.joda.time.DateTime lrpPeriodEnd;
|
||||
org.joda.time.DateTime lrpPeriodStart;
|
||||
org.joda.time.Duration addGracePeriodLength;
|
||||
org.joda.time.Duration anchorTenantAddGracePeriodLength;
|
||||
org.joda.time.Duration autoRenewGracePeriodLength;
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ import java.io.PrintStream;
|
|||
import java.math.BigDecimal;
|
||||
import org.joda.money.Money;
|
||||
import org.joda.time.DateTime;
|
||||
import org.joda.time.Interval;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
|
|
@ -214,25 +215,14 @@ public class CreateTldCommandTest extends CommandTestCase<CreateTldCommand> {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void testSuccess_addLrpTldState() throws Exception {
|
||||
public void testSuccess_addLrpPeriod() throws Exception {
|
||||
runCommandForced(
|
||||
"--lrp_tld_states=SUNRISE",
|
||||
"--initial_tld_state=SUNRISE",
|
||||
"--lrp_period=2004-06-09T12:30:00Z/2004-07-10T13:30:00Z",
|
||||
"--roid_suffix=Q9JYB4C",
|
||||
"xn--q9jyb4c");
|
||||
assertThat(Registry.get("xn--q9jyb4c").getLrpTldStates()).containsExactly(TldState.SUNRISE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSuccess_addMultipleLrpTldStates() throws Exception {
|
||||
DateTime now = DateTime.now(UTC);
|
||||
runCommandForced(
|
||||
"--lrp_tld_states=SUNRISE,LANDRUSH",
|
||||
String.format("--tld_state_transitions=%s=SUNRISE,%s=LANDRUSH", START_OF_TIME, now.plus(1)),
|
||||
"--roid_suffix=Q9JYB4C",
|
||||
"xn--q9jyb4c");
|
||||
assertThat(Registry.get("xn--q9jyb4c").getLrpTldStates())
|
||||
.containsExactly(TldState.SUNRISE, TldState.LANDRUSH);
|
||||
assertThat(Registry.get("xn--q9jyb4c").getLrpPeriod()).isEqualTo(
|
||||
new Interval(
|
||||
DateTime.parse("2004-06-09T12:30:00Z"), DateTime.parse("2004-07-10T13:30:00Z")));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -434,27 +424,20 @@ public class CreateTldCommandTest extends CommandTestCase<CreateTldCommand> {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void testFailure_lrpTldState_notInTldStateTransitions() throws Exception {
|
||||
public void testFailure_addLrpPeriod_backwardsInterval() throws Exception {
|
||||
thrown.expect(
|
||||
IllegalArgumentException.class,
|
||||
"Cannot specify an LRP TLD state that is not part of the TLD state transitions.");
|
||||
ParameterException.class,
|
||||
"--lrp_period=2005-06-09T12:30:00Z/2004-07-10T13:30:00Z not an ISO-8601 interval");
|
||||
runCommandForced(
|
||||
"--lrp_tld_states=SUNRISE",
|
||||
"--initial_tld_state=PREDELEGATION",
|
||||
"--lrp_period=2005-06-09T12:30:00Z/2004-07-10T13:30:00Z",
|
||||
"--roid_suffix=Q9JYB4C",
|
||||
"xn--q9jyb4c");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFailure_lrpTldState_badTldState() throws Exception {
|
||||
thrown.expect(
|
||||
IllegalArgumentException.class,
|
||||
"No enum constant google.registry.model.registry.Registry.TldState.LANDRISE");
|
||||
runCommandForced(
|
||||
"--lrp_tld_states=LANDRISE",
|
||||
"--initial_tld_state=PREDELEGATION",
|
||||
"--roid_suffix=Q9JYB4C",
|
||||
"xn--q9jyb4c");
|
||||
public void testFailure_addLrpPeriod_badInterval() throws Exception {
|
||||
thrown.expect(ParameterException.class, "--lrp_period=foobar not an ISO-8601 interval");
|
||||
runCommandForced("--lrp_period=foobar", "--roid_suffix=Q9JYB4C", "xn--q9jyb4c");
|
||||
}
|
||||
|
||||
private void runSuccessfulReservedListsTest(String reservedLists) throws Exception {
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ import java.io.ByteArrayOutputStream;
|
|||
import java.io.PrintStream;
|
||||
import org.joda.money.Money;
|
||||
import org.joda.time.DateTime;
|
||||
import org.joda.time.Interval;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
|
|
@ -405,6 +406,17 @@ public class UpdateTldCommandTest extends CommandTestCase<UpdateTldCommand> {
|
|||
.containsExactly("ns2.example.com");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSuccess_removeLrpPeriod() throws Exception {
|
||||
persistResource(
|
||||
Registry.get("xn--q9jyb4c").asBuilder()
|
||||
.setLrpPeriod(new Interval(
|
||||
DateTime.parse("2004-06-09T12:30:00Z"), DateTime.parse("2004-07-10T13:30:00Z")))
|
||||
.build());
|
||||
runCommandForced("--lrp_period=null", "xn--q9jyb4c");
|
||||
assertThat(Registry.get("xn--q9jyb4c").getLrpPeriod()).isNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFailure_invalidAddGracePeriod() throws Exception {
|
||||
thrown.expect(IllegalArgumentException.class);
|
||||
|
|
@ -815,65 +827,25 @@ public class UpdateTldCommandTest extends CommandTestCase<UpdateTldCommand> {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void testSuccess_updateLrpTldState() throws Exception {
|
||||
persistResource(
|
||||
Registry.get("xn--q9jyb4c").asBuilder()
|
||||
.setTldStateTransitions(
|
||||
ImmutableSortedMap.of(
|
||||
START_OF_TIME, TldState.PREDELEGATION,
|
||||
now.minusMonths(2), TldState.SUNRISE,
|
||||
now.minusMonths(1), TldState.LANDRUSH,
|
||||
now, TldState.GENERAL_AVAILABILITY))
|
||||
.setLrpTldStates(ImmutableSet.of(TldState.SUNRISE))
|
||||
.build());
|
||||
runCommandForced("--lrp_tld_states=LANDRUSH", "xn--q9jyb4c");
|
||||
assertThat(Registry.get("xn--q9jyb4c").getLrpTldStates()).containsExactly(TldState.LANDRUSH);
|
||||
public void testSuccess_updateLrpPeriod() throws Exception {
|
||||
runCommandForced("--lrp_period=2004-06-09T12:30:00Z/2004-07-10T13:30:00Z", "xn--q9jyb4c");
|
||||
assertThat(Registry.get("xn--q9jyb4c").getLrpPeriod()).isEqualTo(
|
||||
new Interval(
|
||||
DateTime.parse("2004-06-09T12:30:00Z"), DateTime.parse("2004-07-10T13:30:00Z")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSuccess_updateMultipleLrpTldStates() throws Exception {
|
||||
persistResource(
|
||||
Registry.get("xn--q9jyb4c").asBuilder()
|
||||
.setTldStateTransitions(
|
||||
ImmutableSortedMap.of(
|
||||
START_OF_TIME, TldState.PREDELEGATION,
|
||||
now.minusMonths(2), TldState.SUNRISE,
|
||||
now.minusMonths(1), TldState.LANDRUSH,
|
||||
now, TldState.GENERAL_AVAILABILITY))
|
||||
.setLrpTldStates(ImmutableSet.<TldState>of())
|
||||
.build());
|
||||
runCommandForced("--lrp_tld_states=SUNRISE,LANDRUSH", "xn--q9jyb4c");
|
||||
assertThat(Registry.get("xn--q9jyb4c").getLrpTldStates())
|
||||
.containsExactly(TldState.LANDRUSH, TldState.SUNRISE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFailure_updateLrpTldStates_notInTransitions() throws Exception {
|
||||
persistResource(
|
||||
Registry.get("xn--q9jyb4c").asBuilder()
|
||||
.setTldStateTransitions(
|
||||
ImmutableSortedMap.of(
|
||||
START_OF_TIME, TldState.PREDELEGATION,
|
||||
now.minusMonths(2), TldState.SUNRISE,
|
||||
now, TldState.GENERAL_AVAILABILITY))
|
||||
.setLrpTldStates(ImmutableSet.of(TldState.SUNRISE))
|
||||
.build());
|
||||
public void testFailure_updateLrpPeriod_backwardsInterval() throws Exception {
|
||||
thrown.expect(
|
||||
IllegalArgumentException.class,
|
||||
"Cannot specify an LRP TLD state that is not part of the TLD state transitions.");
|
||||
runCommandForced("--lrp_tld_states=LANDRUSH", "xn--q9jyb4c");
|
||||
ParameterException.class,
|
||||
"--lrp_period=2005-06-09T12:30:00Z/2004-07-10T13:30:00Z not an ISO-8601 interval");
|
||||
runCommandForced("--lrp_period=2005-06-09T12:30:00Z/2004-07-10T13:30:00Z", "xn--q9jyb4c");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFailure_updateLrpTldStates_badTldState() throws Exception {
|
||||
thrown.expect(
|
||||
IllegalArgumentException.class,
|
||||
"No enum constant google.registry.model.registry.Registry.TldState.LOUD_PERIOD");
|
||||
runCommandForced(
|
||||
"--lrp_tld_states=LOUD_PERIOD",
|
||||
"--initial_tld_state=PREDELEGATION",
|
||||
"--roid_suffix=Q9JYB4C",
|
||||
"xn--q9jyb4c");
|
||||
public void testFailure_updateLrpPeriod_badInterval() throws Exception {
|
||||
thrown.expect(ParameterException.class, "--lrp_period=foobar not an ISO-8601 interval");
|
||||
runCommandForced("--lrp_period=foobar", "xn--q9jyb4c");
|
||||
}
|
||||
|
||||
private void runSuccessfulReservedListsTest(String reservedLists) throws Exception {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,80 @@
|
|||
// Copyright 2016 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.tools.params;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import com.beust.jcommander.ParameterException;
|
||||
import google.registry.testing.ExceptionRule;
|
||||
import org.joda.time.DateTime;
|
||||
import org.joda.time.Interval;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.junit.runners.JUnit4;
|
||||
|
||||
/** Unit tests for {@link IntervalParameter}. */
|
||||
@RunWith(JUnit4.class)
|
||||
public class IntervalParameterTest {
|
||||
|
||||
@Rule
|
||||
public final ExceptionRule thrown = new ExceptionRule();
|
||||
|
||||
private final IntervalParameter instance = new IntervalParameter();
|
||||
|
||||
@Test
|
||||
public void testConvert() throws Exception {
|
||||
assertThat(instance.convert("2004-06-09T12:30:00Z/2004-07-10T13:30:00Z"))
|
||||
.isEqualTo(new Interval(
|
||||
DateTime.parse("2004-06-09T12:30:00Z"),
|
||||
DateTime.parse("2004-07-10T13:30:00Z")));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testConvert_singleDate() throws Exception {
|
||||
thrown.expect(IllegalArgumentException.class);
|
||||
instance.convert("2004-06-09T12:30:00Z");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testConvert_backwardsInterval() throws Exception {
|
||||
thrown.expect(IllegalArgumentException.class);
|
||||
instance.convert("2004-07-10T13:30:00Z/2004-06-09T12:30:00Z");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testConvert_empty_throws() throws Exception {
|
||||
thrown.expect(IllegalArgumentException.class);
|
||||
instance.convert("");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testConvert_null_throws() throws Exception {
|
||||
thrown.expect(NullPointerException.class);
|
||||
instance.convert(null);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testConvert_sillyString_throws() throws Exception {
|
||||
thrown.expect(IllegalArgumentException.class);
|
||||
instance.convert("foo");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testValidate_sillyString_throws() throws Exception {
|
||||
thrown.expect(ParameterException.class, "--time=foo not an");
|
||||
instance.validate("--time", "foo");
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue