zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-07-16 07:55:19 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix generics in EppXmlTransformer.unmarshal to not be only on the return type.

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=124914271
This commit is contained in:
cgoldfeder 2016-06-14 20:58:57 -07:00 • committed by Ben McIlwain
parent 6466ad51f6
commit ec39f15a23
31 changed files with 133 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

9
javatests/google/registry/xjc/XjcObjectTest.java
View file

@ -86,7 +86,7 @@ public class XjcObjectTest {
@Test
public void testUnmarshalUTF16() throws Exception {
XjcRdeDeposit deposit = unmarshal(new ByteArrayInputStream(
XjcRdeDeposit deposit = unmarshal(XjcRdeDeposit.class, new ByteArrayInputStream(
RDE_DEPOSIT_FULL.replaceFirst("UTF-8", "UTF-16").getBytes(UTF_16)));
assertThat(deposit).isNotNull();
assertThat(deposit.getType()).isEqualTo(XjcRdeDepositTypeType.FULL);
@ -96,7 +96,7 @@ public class XjcObjectTest {
@Test
public void testUnmarshalValidation() throws Exception {
thrown.expect(Throwable.class, "pattern '\\w{1,13}' for type 'depositIdType'");
unmarshal(new ByteArrayInputStream(
unmarshal(XjcRdeDeposit.class, new ByteArrayInputStream(
RDE_DEPOSIT_FULL.replaceFirst("id=\"[^\"]+\"", "id=\"\"").getBytes(UTF_8)));
}
@ -115,7 +115,7 @@ public class XjcObjectTest {
@Test
public void testNamespaceEpp() throws Exception {
String xml = unmarshal(new ByteArrayInputStream(readResourceUtf8(
String xml = unmarshal(XjcObject.class, new ByteArrayInputStream(readResourceUtf8(
XjcObjectTest.class, "testdata/greeting.xml").getBytes(UTF_8))).toString();
assertWithMessage(xml).that(xml).startsWith("<epp:epp ");
assertWithMessage(xml).that(xml).contains("\"urn:ietf:params:xml:ns:epp-1.0\"");
@ -124,6 +124,7 @@ public class XjcObjectTest {
/** Unmarshals XML assuming UTF-8 encoding. */
private static XjcRdeDeposit unmarshalFullDeposit() throws Exception {
return unmarshal(new ByteArrayInputStream(RDE_DEPOSIT_FULL.getBytes(UTF_8)));
return unmarshal(
XjcRdeDeposit.class, new ByteArrayInputStream(RDE_DEPOSIT_FULL.getBytes(UTF_8)));
}
}