zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-08-05 17:28:25 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove RoidSuffixes entirely

Browse source 
We no longer care about ROID suffix uniqueness in a post-Registry-2.0-migration
world, and the Registry cache is sufficient for efficiently grabbing the ROID
suffix for TLDs.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=144483726
This commit is contained in:
mcilwain 2017-01-13 14:15:10 -08:00 • committed by Ben McIlwain
parent 07010150b0
commit 8b61dcc6d0
6 changed files with 2 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

50
javatests/google/registry/model/RoidSuffixesTest.java
View file

@ -1,50 +0,0 @@
// 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.model;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.model.RoidSuffixes.getRoidSuffixForTld;
import static google.registry.testing.DatastoreHelper.newRegistry;
import static google.registry.testing.DatastoreHelper.persistResource;
import google.registry.testing.AppEngineRule;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
/** Unit tests for {@link RoidSuffixes}. */
@RunWith(JUnit4.class)
public class RoidSuffixesTest {
@Rule
public final AppEngineRule appEngine = AppEngineRule.builder()
.withDatastore()
.build();
@Test
public void test_newlyCreatedRegistry_isAddedToRoidSuffixesList() {
persistResource(newRegistry("tld", "MEOW"));
assertThat(getRoidSuffixForTld("tld")).isEqualTo("MEOW");
}
@Test
public void test_allowDupeRoidSuffixes() {
persistResource(newRegistry("tld", "MEOW"));
persistResource(newRegistry("example", "MEOW"));
assertThat(getRoidSuffixForTld("tld")).isEqualTo("MEOW");
assertThat(getRoidSuffixForTld("example")).isEqualTo("MEOW");
}
}

7
javatests/google/registry/tools/CreateTldCommandTest.java
View file

@ -416,13 +416,6 @@ public class CreateTldCommandTest extends CommandTestCase<CreateTldCommand> {
runCommandForced("--premium_list=phonies", "--roid_suffix=Q9JYB4C", "xn--q9jyb4c");
}
@Test
public void testFailure_roidSuffixAlreadyInUse() throws Exception {
createTld("foo", "BLAH");
thrown.expect(IllegalArgumentException.class, "The roid suffix BLAH is already in use");
runCommandForced("--roid_suffix=BLAH", "randomtld");
}
@Test
public void testFailure_addLrpPeriod_backwardsInterval() throws Exception {
thrown.expect(

8
javatests/google/registry/tools/UpdateTldCommandTest.java
View file

@ -698,14 +698,6 @@ public class UpdateTldCommandTest extends CommandTestCase<UpdateTldCommand> {
"xn--q9jyb4c");
}
@Test
public void testFailure_roidSuffixAlreadyInUse() throws Exception {
createTld("foo", "BLAH");
createTld("bar", "BAR");
thrown.expect(IllegalArgumentException.class, "The roid suffix BLAH is already in use");
runCommandForced("--roid_suffix=BLAH", "bar");
}
@Test
public void testSuccess_canSetRoidSuffixToWhatItAlreadyIs() throws Exception {
createTld("foo", "BLAH");