zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-06-05 03:57:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

Make name and address fields required on Registrar

Browse source 
The absence of these fields causes RDE failures, so they are in effect
required on any functioning registry system. We are currently
experiencing problems in sandbox caused by null values on these fields.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=155474895
This commit is contained in:
mcilwain 2017-05-09 00:27:41 -07:00 • committed by Ben McIlwain
parent 5313ca58d6
commit ef1487cb57
18 changed files with 460 additions and 272 deletions
Download patch file Download diff file Expand all files Collapse all files

38
javatests/google/registry/rde/RdeMarshallerTest.java
View file

@ -20,8 +20,6 @@ import google.registry.model.registrar.Registrar;
import google.registry.testing.AppEngineRule;
import google.registry.testing.ShardableTestCase;
import google.registry.xml.XmlTestUtils;
import org.joda.time.DateTime;
import org.joda.time.format.ISODateTimeFormat;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@ -82,46 +80,10 @@ public class RdeMarshallerTest extends ShardableTestCase {
"registrar.upDate");
}
@Test
public void testMarshalRegistrar_breaksRdeXmlSchema_producesErrorMessage() throws Exception {
Registrar reg = Registrar.loadByClientId("TheRegistrar").asBuilder()
.setLocalizedAddress(null)
.setInternationalizedAddress(null)
.build();
DepositFragment fragment = new RdeMarshaller().marshalRegistrar(reg);
assertThat(fragment.type()).isEqualTo(RdeResourceType.REGISTRAR);
assertThat(fragment.xml()).isEmpty();
assertThat(fragment.error()).isEqualTo(""
+ "RDE XML schema validation failed: "
+ "Key<?>(EntityGroupRoot(\"cross-tld\")/Registrar(\"TheRegistrar\"))\n"
+ "org.xml.sax.SAXParseException; lineNumber: 0; columnNumber: 0; cvc-complex-type.2.4.a: "
+ "Invalid content was found starting with element 'rdeRegistrar:voice'. "
+ "One of '{\"urn:ietf:params:xml:ns:rdeRegistrar-1.0\":postalInfo}' is expected.\n"
+ "<rdeRegistrar:registrar>\n"
+ " <rdeRegistrar:id>TheRegistrar</rdeRegistrar:id>\n"
+ " <rdeRegistrar:name>The Registrar</rdeRegistrar:name>\n"
+ " <rdeRegistrar:gurid>1</rdeRegistrar:gurid>\n"
+ " <rdeRegistrar:status>ok</rdeRegistrar:status>\n"
+ " <rdeRegistrar:voice>+1.2223334444</rdeRegistrar:voice>\n"
+ " <rdeRegistrar:email>new.registrar@example.com</rdeRegistrar:email>\n"
+ " <rdeRegistrar:whoisInfo>\n"
+ " <rdeRegistrar:name>whois.nic.fakewhois.example</rdeRegistrar:name>\n"
+ " </rdeRegistrar:whoisInfo>\n"
+ " <rdeRegistrar:crDate>" + ft(reg.getCreationTime()) + "</rdeRegistrar:crDate>\n"
+ " <rdeRegistrar:upDate>" + ft(reg.getLastUpdateTime()) + "</rdeRegistrar:upDate>\n"
+ "</rdeRegistrar:registrar>\n"
+ "\n");
}
@Test
public void testMarshalRegistrar_unicodeCharacters_dontGetMangled() throws Exception {
DepositFragment fragment =
new RdeMarshaller().marshalRegistrar(Registrar.loadByClientId("TheRegistrar"));
assertThat(fragment.xml()).contains("123 Example Bőulevard");
}
/** Formats {@code timestamp} without milliseconds. */
private static String ft(DateTime timestamp) {
return ISODateTimeFormat.dateTimeNoMillis().withZoneUTC().print(timestamp);
}
}