From 3efe09616ca9205258b24ca1fc5953b58fddee80 Mon Sep 17 00:00:00 2001 From: mcilwain Date: Fri, 12 Aug 2016 14:15:43 -0700 Subject: [PATCH] Allow two-letter domain names ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=130139005 --- .../registry/model/registry/label/ReservedList.java | 4 ++-- .../registry/model/registry/label/ReservedListTest.java | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/java/google/registry/model/registry/label/ReservedList.java b/java/google/registry/model/registry/label/ReservedList.java index d22084111..66785267f 100644 --- a/java/google/registry/model/registry/label/ReservedList.java +++ b/java/google/registry/model/registry/label/ReservedList.java @@ -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; diff --git a/javatests/google/registry/model/registry/label/ReservedListTest.java b/javatests/google/registry/model/registry/label/ReservedListTest.java index dfd2d341a..6b4beadf8 100644 --- a/javatests/google/registry/model/registry/label/ReservedListTest.java +++ b/javatests/google/registry/model/registry/label/ReservedListTest.java @@ -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); } }