mirror of
https://github.com/google/nomulus.git
synced 2025-05-15 17:07:15 +02:00
Remove the use of InjectRule in IdnLabelValidatorTest
------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=217707263
This commit is contained in:
jianglai
parent
9e4222a5cb
commit
3daf62a486
3 changed files with 67 additions and 60 deletions
|
|
@ -32,7 +32,6 @@ import static google.registry.model.registry.label.ReservationType.RESERVED_FOR_
|
|||
import static google.registry.model.registry.label.ReservationType.RESERVED_FOR_SPECIFIC_USE;
|
||||
import static google.registry.model.registry.label.ReservedList.getAllowedNameservers;
|
||||
import static google.registry.pricing.PricingEngineProxy.isDomainPremium;
|
||||
import static google.registry.tldconfig.idn.IdnLabelValidator.findValidIdnTableForTld;
|
||||
import static google.registry.util.CollectionUtils.nullToEmpty;
|
||||
import static google.registry.util.DateTimeUtils.END_OF_TIME;
|
||||
import static google.registry.util.DateTimeUtils.isAtOrAfter;
|
||||
|
|
@ -113,6 +112,7 @@ import google.registry.model.reporting.DomainTransactionRecord;
|
|||
import google.registry.model.reporting.DomainTransactionRecord.TransactionReportField;
|
||||
import google.registry.model.reporting.HistoryEntry;
|
||||
import google.registry.model.tmch.ClaimsListShard;
|
||||
import google.registry.tldconfig.idn.IdnLabelValidator;
|
||||
import google.registry.util.Idn;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Comparator;
|
||||
|
|
@ -166,6 +166,10 @@ public class DomainFlowUtils {
|
|||
private static final CharMatcher ALLOWED_CHARS =
|
||||
CharMatcher.inRange('a', 'z').or(CharMatcher.inRange('0', '9').or(CharMatcher.anyOf("-.")));
|
||||
|
||||
/** Default validator used to determine if an IDN name can be provisioned on a TLD. */
|
||||
private static final IdnLabelValidator IDN_LABEL_VALIDATOR =
|
||||
IdnLabelValidator.createDefaultIdnLabelValidator();
|
||||
|
||||
/** The maximum number of DS records allowed on a domain. */
|
||||
private static final int MAX_DS_RECORDS_PER_DOMAIN = 8;
|
||||
|
||||
|
|
@ -239,7 +243,8 @@ public class DomainFlowUtils {
|
|||
public static String validateDomainNameWithIdnTables(InternetDomainName domainName)
|
||||
throws InvalidIdnDomainLabelException {
|
||||
Optional<String> idnTableName =
|
||||
findValidIdnTableForTld(domainName.parts().get(0), domainName.parent().toString());
|
||||
IDN_LABEL_VALIDATOR.findValidIdnTableForTld(
|
||||
domainName.parts().get(0), domainName.parent().toString());
|
||||
if (!idnTableName.isPresent()) {
|
||||
throw new InvalidIdnDomainLabelException();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ import static google.registry.tldconfig.idn.IdnTableEnum.JA;
|
|||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import google.registry.util.Idn;
|
||||
import google.registry.util.NonFinalForTesting;
|
||||
import java.util.Optional;
|
||||
|
||||
/** Validates whether a given IDN label can be provisioned for a particular TLD. */
|
||||
|
|
@ -30,10 +29,20 @@ public final class IdnLabelValidator {
|
|||
private static final ImmutableList<IdnTableEnum> DEFAULT_IDN_TABLES =
|
||||
ImmutableList.of(EXTENDED_LATIN, JA);
|
||||
|
||||
private static final ImmutableMap<String, ImmutableList<IdnTableEnum>>
|
||||
DEFAULT_IDN_TABLE_LISTS_PER_TLD =
|
||||
ImmutableMap.of("xn--q9jyb4c", ImmutableList.of(EXTENDED_LATIN, JA));
|
||||
|
||||
/** Some TLDs have their own IDN tables, configured here. */
|
||||
@NonFinalForTesting
|
||||
private static ImmutableMap<String, ImmutableList<IdnTableEnum>> idnTableListsPerTld =
|
||||
ImmutableMap.of("xn--q9jyb4c", ImmutableList.of(EXTENDED_LATIN, JA));
|
||||
private ImmutableMap<String, ImmutableList<IdnTableEnum>> idnTableListsPerTld;
|
||||
|
||||
IdnLabelValidator(ImmutableMap<String, ImmutableList<IdnTableEnum>> indTableListsPerTld) {
|
||||
this.idnTableListsPerTld = indTableListsPerTld;
|
||||
}
|
||||
|
||||
public static IdnLabelValidator createDefaultIdnLabelValidator() {
|
||||
return new IdnLabelValidator(DEFAULT_IDN_TABLE_LISTS_PER_TLD);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns name of first matching {@link IdnTable} if domain label is valid for the given TLD.
|
||||
|
|
@ -41,16 +50,14 @@ public final class IdnLabelValidator {
|
|||
* <p>A label is valid if it is considered valid by at least one configured IDN table for that
|
||||
* TLD. If no match is found, an absent value is returned.
|
||||
*/
|
||||
public static Optional<String> findValidIdnTableForTld(String label, String tld) {
|
||||
public Optional<String> findValidIdnTableForTld(String label, String tld) {
|
||||
String unicodeString = Idn.toUnicode(label);
|
||||
for (IdnTableEnum idnTable
|
||||
: Optional.ofNullable(idnTableListsPerTld.get(tld)).orElse(DEFAULT_IDN_TABLES)) {
|
||||
for (IdnTableEnum idnTable :
|
||||
Optional.ofNullable(idnTableListsPerTld.get(tld)).orElse(DEFAULT_IDN_TABLES)) {
|
||||
if (idnTable.getTable().isValidLabel(unicodeString)) {
|
||||
return Optional.of(idnTable.getTable().getName());
|
||||
}
|
||||
}
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
private IdnLabelValidator() {}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,12 +15,9 @@
|
|||
package google.registry.tldconfig.idn;
|
||||
|
||||
import static com.google.common.truth.Truth8.assertThat;
|
||||
import static google.registry.tldconfig.idn.IdnLabelValidator.findValidIdnTableForTld;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import google.registry.testing.InjectRule;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.junit.runners.JUnit4;
|
||||
|
|
@ -29,64 +26,63 @@ import org.junit.runners.JUnit4;
|
|||
@RunWith(JUnit4.class)
|
||||
public class IdnLabelValidatorTest {
|
||||
|
||||
@Rule
|
||||
public final InjectRule inject = new InjectRule();
|
||||
private IdnLabelValidator idnLabelValidator = IdnLabelValidator.createDefaultIdnLabelValidator();
|
||||
|
||||
private void doJapaneseLanguageTests(String tld) {
|
||||
assertThat(findValidIdnTableForTld("foo", tld)).isPresent();
|
||||
assertThat(findValidIdnTableForTld("12379foar", tld)).isPresent();
|
||||
assertThat(findValidIdnTableForTld("みんな", tld)).isPresent();
|
||||
assertThat(findValidIdnTableForTld("アシヨ", tld)).isPresent();
|
||||
assertThat(findValidIdnTableForTld("わみけ", tld)).isPresent();
|
||||
assertThat(findValidIdnTableForTld("みんなアシヨわみけabc", tld)).isPresent();
|
||||
assertThat(findValidIdnTableForTld("-みんなアシヨわみけ-", tld)).isPresent();
|
||||
assertThat(findValidIdnTableForTld("あいう〆", tld)).isPresent();
|
||||
assertThat(findValidIdnTableForTld("〆わをん", tld)).isPresent();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("foo", tld)).isPresent();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("12379foar", tld)).isPresent();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("みんな", tld)).isPresent();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("アシヨ", tld)).isPresent();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("わみけ", tld)).isPresent();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("みんなアシヨわみけabc", tld)).isPresent();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("-みんなアシヨわみけ-", tld)).isPresent();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("あいう〆", tld)).isPresent();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("〆わをん", tld)).isPresent();
|
||||
|
||||
// This should fail since it mixes Japanese characters with extended Latin characters. These are
|
||||
// allowed individually, but not together, since they are in separate IDN tables.
|
||||
assertThat(findValidIdnTableForTld("みんなアシヨわみけæ", tld)).isEmpty();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("みんなアシヨわみけæ", tld)).isEmpty();
|
||||
|
||||
// This fails because it has Cyrillic characters, which just aren't allowed in either IDN table.
|
||||
assertThat(findValidIdnTableForTld("aЖЗ", tld)).isEmpty();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("aЖЗ", tld)).isEmpty();
|
||||
|
||||
assertThat(findValidIdnTableForTld("abcdefghæ", tld)).isPresent();
|
||||
assertThat(findValidIdnTableForTld("happy", tld)).isPresent();
|
||||
assertThat(findValidIdnTableForTld("ite-love-you", tld)).isPresent();
|
||||
assertThat(findValidIdnTableForTld("凹凸商事", tld)).isPresent();
|
||||
assertThat(findValidIdnTableForTld("いすゞ製鉄", tld)).isPresent();
|
||||
assertThat(findValidIdnTableForTld("日々の生活", tld)).isPresent();
|
||||
assertThat(findValidIdnTableForTld("1000万円", tld)).isPresent();
|
||||
assertThat(findValidIdnTableForTld("たか--い", tld)).isPresent();
|
||||
assertThat(findValidIdnTableForTld("ザ・セール", tld)).isPresent();
|
||||
assertThat(findValidIdnTableForTld("example・例", tld)).isPresent();
|
||||
assertThat(findValidIdnTableForTld("カレー・ライス", tld)).isPresent();
|
||||
assertThat(findValidIdnTableForTld("〆切・明日", tld)).isPresent();
|
||||
assertThat(findValidIdnTableForTld("そのスピードで", tld)).isPresent();
|
||||
assertThat(findValidIdnTableForTld("visaクレジットカード", tld)).isPresent();
|
||||
assertThat(findValidIdnTableForTld("cdケース", tld)).isPresent();
|
||||
assertThat(findValidIdnTableForTld("らーめん", tld)).isPresent();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("abcdefghæ", tld)).isPresent();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("happy", tld)).isPresent();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("ite-love-you", tld)).isPresent();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("凹凸商事", tld)).isPresent();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("いすゞ製鉄", tld)).isPresent();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("日々の生活", tld)).isPresent();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("1000万円", tld)).isPresent();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("たか--い", tld)).isPresent();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("ザ・セール", tld)).isPresent();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("example・例", tld)).isPresent();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("カレー・ライス", tld)).isPresent();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("〆切・明日", tld)).isPresent();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("そのスピードで", tld)).isPresent();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("visaクレジットカード", tld)).isPresent();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("cdケース", tld)).isPresent();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("らーめん", tld)).isPresent();
|
||||
|
||||
// These fail because they have a KATAKANA MIDDLE DOT or IDEOGRAPHIC_CLOSING_MARK without any
|
||||
// Japanese non-exception characters.
|
||||
assertThat(findValidIdnTableForTld("eco・driving", tld)).isEmpty();
|
||||
assertThat(findValidIdnTableForTld("・ー・", tld)).isEmpty();
|
||||
assertThat(findValidIdnTableForTld("〆〆example・・", tld)).isEmpty();
|
||||
assertThat(findValidIdnTableForTld("abc〆", tld)).isEmpty();
|
||||
assertThat(findValidIdnTableForTld("〆xyz", tld)).isEmpty();
|
||||
assertThat(findValidIdnTableForTld("〆bar・", tld)).isEmpty();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("eco・driving", tld)).isEmpty();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("・ー・", tld)).isEmpty();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("〆〆example・・", tld)).isEmpty();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("abc〆", tld)).isEmpty();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("〆xyz", tld)).isEmpty();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("〆bar・", tld)).isEmpty();
|
||||
|
||||
// This is a Japanese label with exactly 15 characters.
|
||||
assertThat(findValidIdnTableForTld("カレー・ライスaaaaaaaa", tld)).isPresent();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("カレー・ライスaaaaaaaa", tld)).isPresent();
|
||||
|
||||
// Should fail since it has Japanese characters but is more than 15 characters long.
|
||||
assertThat(findValidIdnTableForTld("カレー・ライスaaaaaaaaa", tld)).isEmpty();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("カレー・ライスaaaaaaaaa", tld)).isEmpty();
|
||||
|
||||
// Should fail since it has a prolonged sound mark that is not preceded by Hiragana or Katakana
|
||||
// characters.
|
||||
assertThat(findValidIdnTableForTld("aー", tld)).isEmpty();
|
||||
assertThat(findValidIdnTableForTld("-ー", tld)).isEmpty();
|
||||
assertThat(findValidIdnTableForTld("0ー", tld)).isEmpty();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("aー", tld)).isEmpty();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("-ー", tld)).isEmpty();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("0ー", tld)).isEmpty();
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -107,11 +103,10 @@ public class IdnLabelValidatorTest {
|
|||
@Test
|
||||
public void testOverridenTables() {
|
||||
// Set .tld to have only the extended latin table and not japanese.
|
||||
inject.setStaticField(
|
||||
IdnLabelValidator.class,
|
||||
"idnTableListsPerTld",
|
||||
ImmutableMap.of("tld", ImmutableList.of(IdnTableEnum.EXTENDED_LATIN)));
|
||||
assertThat(findValidIdnTableForTld("foo", "tld")).isPresent();
|
||||
assertThat(findValidIdnTableForTld("みんな", "tld")).isEmpty();
|
||||
idnLabelValidator =
|
||||
new IdnLabelValidator(
|
||||
ImmutableMap.of("tld", ImmutableList.of(IdnTableEnum.EXTENDED_LATIN)));
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("foo", "tld")).isPresent();
|
||||
assertThat(idnLabelValidator.findValidIdnTableForTld("みんな", "tld")).isEmpty();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue