Allow two-letter domain names

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=130139005
This commit is contained in:
mcilwain 2016-08-12 14:15:43 -07:00 committed by Ben McIlwain
parent 5f26196993
commit 3efe09616c
2 changed files with 5 additions and 8 deletions

View file

@ -163,8 +163,8 @@ public final class ReservedList
*/
public static ReservationType getReservation(String label, String tld) {
checkNotNull(label, "label");
if (label.length() == 0 || label.length() == 2) {
return FULLY_BLOCKED; // All 2-letter labels are FULLY_BLOCKED.
if (label.length() == 0) {
return FULLY_BLOCKED;
}
ReservedListEntry entry = getReservedListEntry(label, tld);
return (entry != null) ? entry.reservationType : UNRESERVED;

View file

@ -81,12 +81,9 @@ public class ReservedListTest {
}
@Test
public void testGetReservation_twoLetterCodesAreAllReserved() {
// This isn't quite exhaustive but it's close.
for (char c1 = 'a'; c1 <= 'z'; c1++) {
for (char c2 = 'a'; c2 <= 'z'; c2++) {
assertThat(getReservation("" + c1 + c2, "tld")).isEqualTo(FULLY_BLOCKED);
}
public void testGetReservation_twoLetterCodesAreAvailable() {
for (String sld : ImmutableList.of("aa", "az", "zz", "91", "1n", "j5")) {
assertThat(getReservation(sld, "tld")).isEqualTo(UNRESERVED);
}
}