mirror of
https://github.com/google/nomulus
synced 2026-09-20 15:04:24 +00:00
Migrate plural DNS writers field to being the canonical one
After this point all data is migrated to use the new canonical plural version, and subsequent code changes can be made that use multiple writers. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=161673486
This commit is contained in:
@@ -63,7 +63,8 @@ public class PublishDnsUpdatesActionTest {
|
||||
public void setUp() throws Exception {
|
||||
inject.setStaticField(Ofy.class, "clock", clock);
|
||||
createTld("xn--q9jyb4c");
|
||||
persistResource(Registry.get("xn--q9jyb4c").asBuilder().setDnsWriter("mock").build());
|
||||
persistResource(
|
||||
Registry.get("xn--q9jyb4c").asBuilder().setDnsWriters(ImmutableSet.of("mock")).build());
|
||||
DomainResource domain1 = persistActiveDomain("example.xn--q9jyb4c");
|
||||
persistActiveSubordinateHost("ns1.example.xn--q9jyb4c", domain1);
|
||||
persistActiveSubordinateHost("ns2.example.xn--q9jyb4c", domain1);
|
||||
|
||||
@@ -37,6 +37,7 @@ import static org.joda.time.Duration.standardMinutes;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import com.googlecode.objectify.Key;
|
||||
import com.googlecode.objectify.VoidWork;
|
||||
import google.registry.dns.writer.VoidDnsWriter;
|
||||
@@ -98,7 +99,7 @@ public class PremiumListUtilsTest {
|
||||
new Registry.Builder()
|
||||
.setTldStr("ghost")
|
||||
.setPremiumPricingEngine(StaticPremiumListPricingEngine.NAME)
|
||||
.setDnsWriter(VoidDnsWriter.NAME)
|
||||
.setDnsWriters(ImmutableSet.of(VoidDnsWriter.NAME))
|
||||
.build());
|
||||
assertThat(Registry.get("ghost").getPremiumList()).isNull();
|
||||
assertThat(getPremiumPrice("blah", Registry.get("ghost"))).isAbsent();
|
||||
|
||||
@@ -268,7 +268,7 @@ public class DatastoreHelper {
|
||||
// Always set a default premium list. Tests that don't want it can delete it.
|
||||
.setPremiumList(persistPremiumList(tld, DEFAULT_PREMIUM_LIST_CONTENTS.get()))
|
||||
.setPremiumPricingEngine(StaticPremiumListPricingEngine.NAME)
|
||||
.setDnsWriter(VoidDnsWriter.NAME)
|
||||
.setDnsWriters(ImmutableSet.of(VoidDnsWriter.NAME))
|
||||
.build();
|
||||
}
|
||||
|
||||
|
||||
@@ -66,7 +66,7 @@ public class CreateTldCommandTest extends CommandTestCase<CreateTldCommand> {
|
||||
assertThat(registry.getAddGracePeriodLength()).isEqualTo(Registry.DEFAULT_ADD_GRACE_PERIOD);
|
||||
assertThat(registry.getCreationTime()).isIn(Range.closed(before, after));
|
||||
assertThat(registry.getDomainCreateRestricted()).isFalse();
|
||||
assertThat(registry.getDnsWriter()).isEqualTo("FooDnsWriter");
|
||||
assertThat(registry.getDnsWriters()).containsExactly("FooDnsWriter");
|
||||
assertThat(registry.getTldState(registry.getCreationTime())).isEqualTo(TldState.PREDELEGATION);
|
||||
assertThat(registry.getRedemptionGracePeriodLength())
|
||||
.isEqualTo(Registry.DEFAULT_REDEMPTION_GRACE_PERIOD);
|
||||
|
||||
Reference in New Issue
Block a user