http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/dto/html5/Html5ComboTest.java ---------------------------------------------------------------------- diff --git a/juneau-core-test/src/test/java/org/apache/juneau/dto/html5/Html5ComboTest.java b/juneau-core-test/src/test/java/org/apache/juneau/dto/html5/Html5ComboTest.java index 62e3c15..9a74cd9 100755 --- a/juneau-core-test/src/test/java/org/apache/juneau/dto/html5/Html5ComboTest.java +++ b/juneau-core-test/src/test/java/org/apache/juneau/dto/html5/Html5ComboTest.java @@ -27,7 +27,7 @@ import org.junit.runners.*; @RunWith(Parameterized.class) @SuppressWarnings({"javadoc"}) public class Html5ComboTest extends ComboTest { - + private static final B btag = b("bbb"); @Parameterized.Parameters @@ -61,6 +61,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>a</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:href rdf:resource='http://foo'/>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>bar</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(A o) { assertType(A.class, o); } @@ -94,6 +95,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>a</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:href rdf:resource='http://foo'/>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>bar</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>b</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>bbb</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li>baz</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(A o) { assertType(A.class, o); } @@ -127,6 +129,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>a</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:href rdf:resource='http://foo'/>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li></rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(A o) { assertType(A.class, o); } @@ -160,6 +163,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>a</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:href rdf:resource='http://foo'/>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>_x0020_</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(A o) { assertType(A.class, o); } @@ -193,6 +197,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>a</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:href rdf:resource='http://foo'/>\n </jp:a>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(A o) { assertType(A.class, o); } @@ -226,6 +231,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>abbr</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Abbr o) { assertType(Abbr.class, o); } @@ -259,6 +265,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>abbr</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:title>foo</jp:title>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>bar</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>b</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>bbb</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li>baz</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Abbr o) { assertType(Abbr.class, o); } @@ -292,6 +299,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>address</jp:_type>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Address o) { assertType(Address.class, o); } @@ -325,6 +333,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>address</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li></rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Address o) { assertType(Address.class, o); } @@ -358,6 +367,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>address</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>a</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:href>bar</jp:href>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>baz</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>a</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:href>qux</jp:href>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>quux</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Address o) { assertType(Address.class, o); assertType(A.class, o.getChild(1)); @@ -395,6 +405,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>aside</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>h1</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>header1</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Aside o) { assertType(Aside.class, o); assertType(H1.class, o.getChild(0)); @@ -433,6 +444,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>audio</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:controls>true</jp:controls>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>source</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:src>foo.ogg</jp:src>\n <jp:type>audio/ogg</jp:type>\n </jp:a>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>source</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:src>foo.mp3</jp:src>\n <jp:type>audio/mpeg</jp:type>\n </jp:a>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Audio o) { assertType(Audio.class, o); assertType(Source.class, o.getChild(0)); @@ -466,8 +478,9 @@ public class Html5ComboTest extends ComboTest { /* RdfXml */ "<rdf:RDF>\n<rdf:Description>\n<jp:_type>p</jp:_type>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:_type>bdi</jp:_type>\n<jp:c>Ø¥ÙاÙ</jp:c>\n</rdf:li>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n", /* RdfXmlT */ "<rdf:RDF>\n<rdf:Description>\n<jp:t>p</jp:t>\n<jp:c>\n<rdf:Seq>\n<rdf:li>foo</rdf:li>\n<rdf:li rdf:parseType='Resource'>\n<jp:t>bdi</jp:t>\n<jp:c>Ø¥ÙاÙ</jp:c>\n</rdf:li>\n<rdf:li>bar</rdf:li>\n</rdf:Seq>\n</jp:c>\n</rdf:Description>\n</rdf:RDF>\n", /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>bdi</jp:_type>\n <jp:c>Ø¥ÙاÙ</jp:c>\n </rdf:li>\n <rdf:li>bar</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" - ) + ) { + @Override public void verify(P o) { assertType(P.class, o); assertType(Bdi.class, o.getChild(1)); @@ -502,6 +515,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>bdo</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:dir>rtl</jp:dir>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>baz</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li>bar</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(P o) { assertType(P.class, o); assertType(Bdo.class, o.getChild(1)); @@ -536,6 +550,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>blockquote</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Blockquote o) { assertType(Blockquote.class, o); } @@ -569,6 +584,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>br</jp:_type>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Br o) { assertType(Br.class, o); } @@ -602,6 +618,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>br</jp:_type>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(P o) { assertType(P.class, o); assertType(Br.class, o.getChild(0)); @@ -636,6 +653,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>button</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:type>button</jp:type>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Button o) { assertType(Button.class, o); } @@ -669,6 +687,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>canvas</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:width>100</jp:width>\n <jp:height>200</jp:height>\n </jp:a>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Canvas o) { assertType(Canvas.class, o); } @@ -702,6 +721,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>cite</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(P o) { assertType(P.class, o); assertType(Cite.class, o.getChild(0)); @@ -736,6 +756,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>code</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo_x000A__x0009_bar</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Code o) { assertType(Code.class, o); } @@ -772,6 +793,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>datalist</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:id>foo</jp:id>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>option</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:value>One</jp:value>\n </jp:a>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>option</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:value>Two</jp:value>\n </jp:a>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Datalist o) { assertType(Datalist.class, o); assertType(Option.class, o.getChild(0)); @@ -810,6 +832,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>dl</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>dt</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>dd</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>bar</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Dl o) { assertType(Dl.class, o); assertType(Dt.class, o.getChild(0)); @@ -845,6 +868,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>del</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>b</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>bbb</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li>bar</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>ins</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>baz</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(P o) { assertType(P.class, o); assertType(Del.class, o.getChild(0)); @@ -881,6 +905,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>dfn</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(P o) { assertType(P.class, o); assertType(Dfn.class, o.getChild(0)); @@ -915,6 +940,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>div</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>b</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>bbb</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li>bar</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Div o) { assertType(Div.class, o); assertType(B.class, o.getChild(1)); @@ -949,6 +975,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>em</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>bar</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li>baz</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(P o) { assertType(P.class, o); assertType(Em.class, o.getChild(1)); @@ -983,6 +1010,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>embed</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:src>foo.swf</jp:src>\n </jp:a>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Embed o) { assertType(Embed.class, o); } @@ -1024,6 +1052,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>form</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:action>bar</jp:action>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>fieldset</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>legend</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo:</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li>Name:</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>input</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:type>text</jp:type>\n </jp:a>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>br</jp:_type>\n </rdf:li>\n <rdf :li>Email:</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>input</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:type>text</jp:type>\n </jp:a>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>br</jp:_type>\n </rdf:li>\n <rdf:li>X:</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>keygen</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:name>X</jp:name>\n </jp:a>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>label</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:for>Name</jp:for>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>label</rdf:li>\n </rdf:Seq>\n </jp:c> \n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Form o) { assertType(Form.class, o); assertType(Fieldset.class, o.getChild(0)); @@ -1068,6 +1097,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>figure</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>img</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:src>foo.png</jp:src>\n <jp:alt>foo</jp:alt>\n <jp:width>100</jp:width>\n <jp:height>200</jp:height>\n </jp:a>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>figcaption</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>The caption</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Figure o) { assertType(Figure.class, o); assertType(Img.class, o.getChild(0)); @@ -1105,6 +1135,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>div</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>h1</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>One</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>h2</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>Two</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>h3</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>Three</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>h4</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>Four</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>h5</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>Five</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>h6</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>Six</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Div o) { assertType(Div.class, o); assertType(H1.class, o.getChild(0)); @@ -1144,6 +1175,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>hr</jp:_type>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(P o) { assertType(P.class, o); assertType(Hr.class, o.getChild(0)); @@ -1170,7 +1202,7 @@ public class Html5ComboTest extends ComboTest { /* JsonR */ "{\n\t_type: 'html',\n\tc: [\n\t\t{\n\t\t\t_type: 'head',\n\t\t\tc: [\n\t\t\t\t{\n\t\t\t\t\t_type: 'title',\n\t\t\t\t\tc: 'title'\n\t\t\t\t},\n\t\t\t\t{\n\t\t\t\t\t_type: 'base',\n\t\t\t\t\ta: {\n\t\t\t\t\t\thref: 'foo',\n\t\t\t\t\t\ttarget: '_blank'\n\t\t\t\t\t}\n\t\t\t\t},\n\t\t\t\t{\n\t\t\t\t\t_type: 'link',\n\t\t\t\t\ta: {\n\t\t\t\t\t\trel: 'stylesheet',\n\t\t\t\t\t\ttype: 'text/css',\n\t\t\t\t\t\thref: 'theme.css'\n\t\t\t\t\t}\n\t\t\t\t},\n\t\t\t\t{\n\t\t\t\t\t_type: 'meta',\n\t\t\t\t\ta: {\n\t\t\t\t\t\tcharset: 'UTF-8'\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t]\n\t\t},\n\t\t{\n\t\t\t_type: 'body',\n\t\t\tc: [\n\t\t\t\t'bar'\n\t\t\t]\n\t\t}\n\t]\n}", /* Xml */ "<html><head><title>title</title><base href='foo' target='_blank'/><link rel='stylesheet' type='text/css' href='theme.css'/><meta charset='UTF-8'/></head><body>bar</body></html>", /* XmlT */ "<html><head><title>title</title><base href='foo' target='_blank'/><link rel='stylesheet' type='text/css' href='theme.css'/><meta charset='UTF-8'/></head><body>bar</body></html>", - /* XmlR */ + /* XmlR */ "<html>\n" +" <head>\n" +" <title>title</title>\n" @@ -1183,7 +1215,7 @@ public class Html5ComboTest extends ComboTest { /* XmlNs */ "<html><head><title>title</title><base href='foo' target='_blank'/><link rel='stylesheet' type='text/css' href='theme.css'/><meta charset='UTF-8'/></head><body>bar</body></html>", /* Html */ "<html><head><title>title</title><base href='foo' target='_blank'/><link rel='stylesheet' type='text/css' href='theme.css'/><meta charset='UTF-8'/></head><body>bar</body></html>", /* HtmlT */ "<html><head><title>title</title><base href='foo' target='_blank'/><link rel='stylesheet' type='text/css' href='theme.css'/><meta charset='UTF-8'/></head><body>bar</body></html>", - /* HtmlR */ + /* HtmlR */ "<html>\n" +" <head>\n" +" <title>title</title>\n" @@ -1206,6 +1238,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>html</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>head</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>title</jp:_type>\n <jp:c>title</jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>base</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:href>foo</jp:href>\n <jp:target>_blank</jp:target>\n </jp:a>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>link</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:rel>stylesheet</jp:rel>\n <jp:type>text/css</jp:type>\n <jp:href>theme.css</jp:href>\n </jp:a>\n </rdf: li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>meta</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:charset>UTF-8</jp:charset>\n </jp:a>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>body</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>bar</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Html o) { assertType(Html.class, o); assertType(Head.class, o.getChild(0)); @@ -1245,6 +1278,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>i</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(P o) { assertType(P.class, o); assertType(I.class, o.getChild(0)); @@ -1279,6 +1313,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>iframe</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Iframe o) { assertType(Iframe.class, o); } @@ -1312,6 +1347,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>kbd</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(P o) { assertType(P.class, o); assertType(Kbd.class, o.getChild(0)); @@ -1352,6 +1388,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>main</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>article</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>header</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>h1</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>header1</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>header2</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>content</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>footer</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>h2</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>footer1</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>footer2</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Main o) { assertType(Main.class, o); assertType(Article.class, o.getChild(0)); @@ -1393,6 +1430,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>map</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:name>baz</jp:name>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>area</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:shape>rect</jp:shape>\n <jp:coords>0,1,2,3</jp:coords>\n <jp:href>foo</jp:href>\n <jp:alt>bar</jp:alt>\n </jp:a>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Map o) { assertType(Map.class, o); assertType(Area.class, o.getChild(0)); @@ -1427,6 +1465,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>mark</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(P o) { assertType(P.class, o); assertType(Mark.class, o.getChild(0)); @@ -1461,6 +1500,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>meter</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:value>1</jp:value>\n <jp:min>0</jp:min>\n <jp:max>2</jp:max>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Meter o) { assertType(Meter.class, o); } @@ -1494,6 +1534,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>nav</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>a</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:href>foo</jp:href>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>bar</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Nav o) { assertType(Nav.class, o); assertType(A.class, o.getChild(0)); @@ -1528,6 +1569,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>noscript</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>No script!</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Noscript o) { assertType(Noscript.class, o); } @@ -1561,6 +1603,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>object</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:width>1</jp:width>\n <jp:height>2</jp:height>\n <jp:data>foo.swf</jp:data>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>param</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:name>autoplay</jp:name>\n <jp:value>true</jp:value>\n </jp:a>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Object2 o) { assertType(Object2.class, o); assertType(Param.class, o.getChild(0)); @@ -1595,6 +1638,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>ol</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>li</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Ol o) { assertType(Ol.class, o); assertType(Li.class, o.getChild(0)); @@ -1633,6 +1677,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>form</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:action>testform</jp:action>\n <jp:oninput>x.value=parseInt(a.value)+parseInt(b.value)</jp:oninput>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>0</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>input</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:type>range</jp:type>\n <jp:id>a</jp:id>\n <jp:value>50</jp:value>\n </jp:a>\n </rdf:li>\n <rdf:li>+</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>input</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:type>number</jp:type>\n <jp:id>b</jp:id>\n <jp:value>50</jp:value>\n </jp:a>\n </rdf:li>\n <rdf:li>=</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>output</jp:_type>\n <jp:a rdf :parseType='Resource'>\n <jp:name>x</jp:name>\n <jp:for>a b</jp:for>\n </jp:a>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Form o) { assertType(Form.class, o); assertType(Input.class, o.getChild(1)); @@ -1669,6 +1714,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(P o) { assertType(P.class, o); } @@ -1702,6 +1748,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>pre</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo _x000A_ bar</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Pre o) { assertType(Pre.class, o); } @@ -1735,6 +1782,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>progress</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:value>1</jp:value>\n </jp:a>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Progress o) { assertType(Progress.class, o); } @@ -1768,6 +1816,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>q</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>bar</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li>baz</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(P o) { assertType(P.class, o); assertType(Q.class, o.getChild(1)); @@ -1804,6 +1853,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>ruby</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>æ³</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>rb</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>è¯</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li>çµ</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>rtc</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>ã</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>rp</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>ã</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li>ã</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Ruby o) { assertType(Ruby.class, o); assertType(Rb.class, o.getChild(1)); @@ -1840,6 +1890,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>s</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>bar</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li>baz</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(P o) { assertType(P.class, o); assertType(S.class, o.getChild(1)); @@ -1874,6 +1925,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>samp</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Samp o) { assertType(Samp.class, o); } @@ -1907,6 +1959,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>script</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:type>text/javascript</jp:type>\n </jp:a>\n <jp:c>_x000A__x0009_alert('hello world!');_x000A_</jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Script o) { assertType(Script.class, o); } @@ -1940,6 +1993,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>section</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>h1</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>bar</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Section o) { assertType(Section.class, o); assertType(H1.class, o.getChild(0)); @@ -1975,6 +2029,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>select</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:name>foo</jp:name>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>optgroup</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:label>bar</jp:label>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>option</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:value>o1</jp:value>\n </jp:a>\n <jp:c>v1</jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Select o) { assertType(Select.class, o); assertType(Optgroup.class, o.getChild(0)); @@ -2010,6 +2065,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>small</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(P o) { assertType(P.class, o); assertType(Small.class, o.getChild(0)); @@ -2044,6 +2100,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>My mother has_x0020_</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>span</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:style>color:blue</jp:style>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>blue</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li>_x0020_eyes.</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(P o) { assertType(P.class, o); assertType(Span.class, o.getChild(1)); @@ -2078,6 +2135,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>strong</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(P o) { assertType(P.class, o); assertType(Strong.class, o.getChild(0)); @@ -2112,6 +2170,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>head</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>style</jp:_type>\n <jp:c>_x000A__x0009_h1 {color:red;}_x000A__x0009_p: {color:blue;}_x000A_</jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Head o) { assertType(Head.class, o); assertType(Style.class, o.getChild(0)); @@ -2146,6 +2205,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>sub</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(P o) { assertType(P.class, o); assertType(Sub.class, o.getChild(0)); @@ -2180,6 +2240,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>sup</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(P o) { assertType(P.class, o); assertType(Sup.class, o.getChild(0)); @@ -2398,6 +2459,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>table</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>caption</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>caption1</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>colgroup</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>col</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:class>foo</jp:class>\n </jp:a>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>col</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:class>bar</jp:class>\n </jp:a>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>thead</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>tr</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>th</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>c1</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>th</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>c2</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>tbody</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>tr</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>td</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>v1</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>td</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>v2</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:l i>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>tfoot</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>tr</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>td</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>f1</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>td</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>f2</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Table o) { assertType(Table.class, o); assertType(Caption.class, o.getChild(0)); @@ -2447,6 +2509,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>template</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:id>foo</jp:id>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>div</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>bar</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Template o) { assertType(Template.class, o); assertType(Div.class, o.getChild(0)); @@ -2481,12 +2544,13 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>textarea</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:name>foo</jp:name>\n </jp:a>\n <jp:c>bar</jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Textarea o) { assertType(Textarea.class, o); } } }, - { /* 64 */ + { /* 64 */ new ComboInput<P>( "Time", P.class, @@ -2514,6 +2578,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>I have a date on_x0020_</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>time</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:datetime>2016-02-14 18:00</jp:datetime>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li>Valentines day</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n <rdf:li>.</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(P o) { assertType(P.class, o); assertType(Time.class, o.getChild(1)); @@ -2548,6 +2613,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>u</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(P o) { assertType(P.class, o); assertType(U.class, o.getChild(0)); @@ -2582,6 +2648,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>ul</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>li</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Ul o) { assertType(Ul.class, o); assertType(Li.class, o.getChild(0)); @@ -2616,6 +2683,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>var</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(P o) { assertType(P.class, o); assertType(Var.class, o.getChild(0)); @@ -2653,6 +2721,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>video</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:width>100</jp:width>\n <jp:height>200</jp:height>\n <jp:controls>true</jp:controls>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>source</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:src>foo.mp4</jp:src>\n <jp:type>video/mp4</jp:type>\n </jp:a>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>track</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:src>subtitles_en.vtt</jp:src>\n <jp:kind>subtitles</jp:kind>\n <jp:srclang>en</jp:srclang>\n </jp:a>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(Video o) { assertType(Video.class, o); assertType(Source.class, o.getChild(0)); @@ -2688,6 +2757,7 @@ public class Html5ComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:_type>p</jp:_type>\n <jp:c>\n <rdf:Seq>\n <rdf:li>foo</rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>wbr</jp:_type>\n </rdf:li>\n <rdf:li>bar</rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(P o) { assertType(P.class, o); assertType(Wbr.class, o.getChild(1));
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/dto/html5/Html5TemplateComboTest.java ---------------------------------------------------------------------- diff --git a/juneau-core-test/src/test/java/org/apache/juneau/dto/html5/Html5TemplateComboTest.java b/juneau-core-test/src/test/java/org/apache/juneau/dto/html5/Html5TemplateComboTest.java index 65e4dcb..7fad0fb 100644 --- a/juneau-core-test/src/test/java/org/apache/juneau/dto/html5/Html5TemplateComboTest.java +++ b/juneau-core-test/src/test/java/org/apache/juneau/dto/html5/Html5TemplateComboTest.java @@ -61,6 +61,7 @@ public class Html5TemplateComboTest extends ComboTest { /* RdfXmlR */ "<rdf:RDF>\n <rdf:Description>\n <jp:a rdf:parseType='Resource'>\n <jp:action rdf:resource='http://myaction'/>\n </jp:a>\n <jp:c>\n <rdf:Seq>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>input</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:type>text</jp:type>\n <jp:name>v1</jp:name>\n <jp:value>123</jp:value>\n </jp:a>\n </rdf:li>\n <rdf:li rdf:parseType='Resource'>\n <jp:_type>input</jp:_type>\n <jp:a rdf:parseType='Resource'>\n <jp:type>text</jp:type>\n <jp:name>v2</jp:name>\n <jp:value>true</jp:value>\n </jp:a>\n </rdf:li>\n </rdf:Seq>\n </jp:c>\n </rdf:Description>\n</rdf:RDF>\n" ) { + @Override public void verify(FormTemplate o) { assertType(FormTemplate.class, o); } @@ -69,26 +70,26 @@ public class Html5TemplateComboTest extends ComboTest { }); } - + @Bean(beanDictionary=HtmlBeanDictionary.class) public static class FormTemplate { - + private String action; private int value1; private boolean value2; - + public FormTemplate(Form f) { this.action = f.getAttr("action"); this.value1 = f.getChild(Input.class, 0).getAttr(int.class, "value"); this.value2 = f.getChild(Input.class, 1).getAttr(boolean.class, "value"); } - + public FormTemplate(String action, int value1, boolean value2) { this.action = action; this.value1 = value1; this.value2 = value2; } - + public Form swap(BeanSession session) { return form(action, input("text").name("v1").value(value1), @@ -96,7 +97,7 @@ public class Html5TemplateComboTest extends ComboTest { ); } } - + public Html5TemplateComboTest(ComboInput<?> comboInput) { super(comboInput); } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/dto/jsonschema/JsonSchemaTest.java ---------------------------------------------------------------------- diff --git a/juneau-core-test/src/test/java/org/apache/juneau/dto/jsonschema/JsonSchemaTest.java b/juneau-core-test/src/test/java/org/apache/juneau/dto/jsonschema/JsonSchemaTest.java index 1700106..19d95e9 100755 --- a/juneau-core-test/src/test/java/org/apache/juneau/dto/jsonschema/JsonSchemaTest.java +++ b/juneau-core-test/src/test/java/org/apache/juneau/dto/jsonschema/JsonSchemaTest.java @@ -189,7 +189,7 @@ public class JsonSchemaTest { .setNot(new SchemaRef("http://not";)) ; } - + /** Bean with other possible property value types not covered in test1 */ public static Schema getTest2() { return new Schema() http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/encoders/EncoderGroupTest.java ---------------------------------------------------------------------- diff --git a/juneau-core-test/src/test/java/org/apache/juneau/encoders/EncoderGroupTest.java b/juneau-core-test/src/test/java/org/apache/juneau/encoders/EncoderGroupTest.java index e6e2ec1..3a0e026 100755 --- a/juneau-core-test/src/test/java/org/apache/juneau/encoders/EncoderGroupTest.java +++ b/juneau-core-test/src/test/java/org/apache/juneau/encoders/EncoderGroupTest.java @@ -24,7 +24,7 @@ public class EncoderGroupTest { //==================================================================================================== @Test public void testEncoderGroupMatching() throws Exception { - + EncoderGroup g = new EncoderGroupBuilder().append(Encoder1.class, Encoder2.class, Encoder3.class).build(); assertType(Encoder1.class, g.getEncoder("gzip1")); assertType(Encoder2.class, g.getEncoder("gzip2")); @@ -36,14 +36,14 @@ public class EncoderGroupTest { assertType(Encoder3.class, g.getEncoder("gzip2;q=0.9,gzip1;q=0.1,gzip3")); assertType(Encoder2.class, g.getEncoder("gzip1;q=0.9,gzip3;q=0.1,gzip2")); } - + public static class Encoder1 extends GzipEncoder { @Override /* Encoder */ public String[] getCodings() { return new String[]{"gzip1"}; } } - + public static class Encoder2 extends GzipEncoder { @Override /* Encoder */ public String[] getCodings() { @@ -57,7 +57,7 @@ public class EncoderGroupTest { return new String[]{"gzip3","gzip3a"}; } } - + //==================================================================================================== // Test inheritence //==================================================================================================== @@ -65,11 +65,11 @@ public class EncoderGroupTest { public void testInheritence() throws Exception { EncoderGroupBuilder gb = null; EncoderGroup g = null; - + gb = new EncoderGroupBuilder().append(E1.class, E2.class); g = gb.build(); assertObjectEquals("['E1','E2','E2a']", g.getSupportedEncodings()); - + gb = new EncoderGroupBuilder(g).append(E3.class, E4.class); g = gb.build(); assertObjectEquals("['E3','E4','E4a','E1','E2','E2a']", g.getSupportedEncodings()); @@ -78,14 +78,14 @@ public class EncoderGroupTest { g = gb.build(); assertObjectEquals("['E5','E3','E4','E4a','E1','E2','E2a']", g.getSupportedEncodings()); } - + public static class E1 extends GzipEncoder { @Override /* Encoder */ public String[] getCodings() { return new String[]{"E1"}; } } - + public static class E2 extends GzipEncoder { @Override /* Encoder */ public String[] getCodings() { @@ -99,14 +99,14 @@ public class EncoderGroupTest { return new String[]{"E3"}; } } - + public static class E4 extends GzipEncoder { @Override /* Encoder */ public String[] getCodings() { return new String[]{"E4","E4a"}; } } - + public static class E5 extends GzipEncoder { @Override /* Encoder */ public String[] getCodings() { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/html/BasicHtmlTest.java ---------------------------------------------------------------------- diff --git a/juneau-core-test/src/test/java/org/apache/juneau/html/BasicHtmlTest.java b/juneau-core-test/src/test/java/org/apache/juneau/html/BasicHtmlTest.java index 5745237..18eb41a 100644 --- a/juneau-core-test/src/test/java/org/apache/juneau/html/BasicHtmlTest.java +++ b/juneau-core-test/src/test/java/org/apache/juneau/html/BasicHtmlTest.java @@ -51,6 +51,7 @@ public class BasicHtmlTest { "<string>foo</string>" ) { + @Override public void verify(String o) { assertType(String.class, o); } @@ -66,6 +67,7 @@ public class BasicHtmlTest { "<boolean>true</boolean>" ) { + @Override public void verify(Boolean o) { assertType(Boolean.class, o); } @@ -81,6 +83,7 @@ public class BasicHtmlTest { "<number>123</number>" ) { + @Override public void verify(Integer o) { assertType(Integer.class, o); } @@ -96,6 +99,7 @@ public class BasicHtmlTest { "<number>1.23</number>" ) { + @Override public void verify(Float o) { assertType(Float.class, o); } @@ -121,6 +125,7 @@ public class BasicHtmlTest { "<ul><li>foo</li></ul>" ) { + @Override public void verify(String[] o) { assertType(String.class, o[0]); } @@ -146,6 +151,7 @@ public class BasicHtmlTest { "<ul><li>foo</li><li><number>123</number></li><li><boolean>true</boolean></li></ul>" ) { + @Override public void verify(Object[] o) { assertType(String.class, o[0]); assertType(Integer.class, o[1]); @@ -163,6 +169,7 @@ public class BasicHtmlTest { "<ul><li>123</li></ul>" ) { + @Override public void verify(int[] o) { assertType(int[].class, o); } @@ -178,6 +185,7 @@ public class BasicHtmlTest { "<ul><li>true</li></ul>" ) { + @Override public void verify(boolean[] o) { assertType(boolean[].class, o); } @@ -193,6 +201,7 @@ public class BasicHtmlTest { "<ul><li><ul><li>foo</li></ul></li></ul>" ) { + @Override public void verify(String[][] o) { assertType(String[][].class, o); } @@ -213,7 +222,7 @@ public class BasicHtmlTest { +"<td><null/></td>" +"</tr>" +"</table>", - + "<table>\n" +"\t<tr>\n" +"\t\t<td>k1</td>\n" @@ -224,7 +233,7 @@ public class BasicHtmlTest { +"\t\t<td><null/></td>\n" +"\t</tr>\n" +"</table>\n", - + "<table>" +"<tr>" +"<td>k1</td>" @@ -237,6 +246,7 @@ public class BasicHtmlTest { +"</table>" ) { + @Override public void verify(Map<String,String> o) { assertType(String.class, o.get("k1")); } @@ -261,7 +271,7 @@ public class BasicHtmlTest { +"<td><null/></td>" +"</tr>" +"</table>", - + "<table>\n" +"\t<tr>\n" +"\t\t<td>k1</td>\n" @@ -276,7 +286,7 @@ public class BasicHtmlTest { +"\t\t<td><null/></td>\n" +"\t</tr>\n" +"</table>\n", - + "<table>" +"<tr>" +"<td>k1</td>" @@ -293,6 +303,7 @@ public class BasicHtmlTest { +"</table>" ) { + @Override public void verify(Map<String,Number> o) { assertType(Number.class, o.get("k1")); } @@ -325,7 +336,7 @@ public class BasicHtmlTest { +"<td><null/></td>" +"</tr>" +"</table>", - + "<table>\n" +"\t<tr>\n" +"\t\t<td>k1</td>\n" @@ -348,7 +359,7 @@ public class BasicHtmlTest { +"\t\t<td><null/></td>\n" +"\t</tr>\n" +"</table>\n", - + "<table>" +"<tr>" +"<td>k1</td>" @@ -373,6 +384,7 @@ public class BasicHtmlTest { +"</table>" ) { + @Override public void verify(Map<String,Object> o) { assertType(String.class, o.get("k1")); assertType(Integer.class, o.get("k2")); @@ -391,6 +403,7 @@ public class BasicHtmlTest { "<ul><li>foo</li><li><null/></li></ul>" ) { + @Override public void verify(List<String> o) { assertType(String.class, o.get(0)); } @@ -406,6 +419,7 @@ public class BasicHtmlTest { "<ul><li>123</li><li>1.23</li><li><null/></li></ul>" ) { + @Override public void verify(List<Number> o) { assertType(Integer.class, o.get(0)); assertType(Float.class, o.get(1)); @@ -422,6 +436,7 @@ public class BasicHtmlTest { "<ul><li>foo</li><li><number>123</number></li><li><number>1.23</number></li><li><boolean>true</boolean></li><li><null/></li></ul>" ) { + @Override public void verify(List<Object> o) { assertType(String.class, o.get(0)); assertType(Integer.class, o.get(1)); @@ -480,7 +495,7 @@ public class BasicHtmlTest { +"</td>" +"</tr>" +"</table>", - + "<table>\n" +"\t<tr>\n" +"\t\t<td>a</td>\n" @@ -526,7 +541,7 @@ public class BasicHtmlTest { +"\t\t</td>\n" +"\t</tr>\n" +"</table>\n", - + "<table>" +"<tr>" +"<td>a</td>" @@ -574,6 +589,7 @@ public class BasicHtmlTest { +"</table>" ) { + @Override public void verify(BeanWithNormalProperties o) { assertType(String.class, o.c); assertType(Integer.class, o.d); @@ -633,7 +649,7 @@ public class BasicHtmlTest { +"</td>" +"</tr>" +"</table>", - + "<table>\n" +"\t<tr>\n" +"\t\t<td>a</td>\n" @@ -681,7 +697,7 @@ public class BasicHtmlTest { +"\t\t</td>\n" +"\t</tr>\n" +"</table>\n", - + "<table>" +"<tr>" +"<td>a</td>" @@ -731,6 +747,7 @@ public class BasicHtmlTest { +"</table>" ) { + @Override public void verify(BeanWithMapProperties o) { assertType(String.class, o.a.get("k1")); assertType(Integer.class, o.b.get("k2")); @@ -755,7 +772,7 @@ public class BasicHtmlTest { +"<td>foo</td>" +"</tr>" +"</table>", - + "<table _type='X'>\n" +"\t<tr>\n" +"\t\t<td>a</td>\n" @@ -766,7 +783,7 @@ public class BasicHtmlTest { +"\t\t<td>foo</td>\n" +"\t</tr>\n" +"</table>\n", - + "<table>" +"<tr>" +"<td>a</td>" @@ -779,6 +796,7 @@ public class BasicHtmlTest { +"</table>" ) { + @Override public void verify(BeanWithTypeName o) { assertType(BeanWithTypeName.class, o); } @@ -813,7 +831,7 @@ public class BasicHtmlTest { +"</td>" +"</tr>" +"</table>", - + "<table>\n" +"\t<tr>\n" +"\t\t<td>b1</td>\n" @@ -838,7 +856,7 @@ public class BasicHtmlTest { +"\t\t</td>\n" +"\t</tr>\n" +"</table>\n", - + "<table>" +"<tr>" +"<td>b1</td>" @@ -865,6 +883,7 @@ public class BasicHtmlTest { +"</table>" ) { + @Override public void verify(BeanWithPropertiesWithTypeNames o) { assertType(B.class, o.b2); } @@ -916,7 +935,7 @@ public class BasicHtmlTest { +"</td>" +"</tr>" +"</table>", - + "<table>\n" +"\t<tr>\n" +"\t\t<td>b1</td>\n" @@ -958,7 +977,7 @@ public class BasicHtmlTest { +"\t\t</td>\n" +"\t</tr>\n" +"</table>\n", - + "<table>" +"<tr>" +"<td>b1</td>" @@ -1002,6 +1021,7 @@ public class BasicHtmlTest { +"</table>" ) { + @Override public void verify(BeanWithPropertiesWithArrayTypeNames o) { assertType(B.class, o.b2[0]); assertType(B.class, o.b3[0]); @@ -1176,6 +1196,7 @@ public class BasicHtmlTest { +"</table>" ) { + @Override public void verify(BeanWithPropertiesWith2dArrayTypeNames o) { assertType(B.class, o.b2[0][0]); assertType(B.class, o.b3[0][0]); @@ -1264,7 +1285,7 @@ public class BasicHtmlTest { +"\t\t</td>\n" +"\t</tr>\n" +"</table>\n", - + "<table>" +"<tr>" +"<td>b1</td>" @@ -1305,6 +1326,7 @@ public class BasicHtmlTest { +"</table>" ) { + @Override public void verify(BeanWithPropertiesWithMapTypeNames o) { assertType(B.class, o.b1.get("k1")); assertType(B.class, o.b2.get("k2")); @@ -1321,6 +1343,7 @@ public class BasicHtmlTest { "<a href='http://apache.org'>foo</a>" ) { + @Override public void verify(LinkBean o) { assertType(LinkBean.class, o); } @@ -1336,6 +1359,7 @@ public class BasicHtmlTest { "<ul><li><a href='http://apache.org'>foo</a></li><li><a href='http://apache.org'>foo</a></li></ul>" ) { + @Override public void verify(LinkBean[] o) { assertType(LinkBean.class, o[0]); } @@ -1351,6 +1375,7 @@ public class BasicHtmlTest { "<ul><li><a href='http://apache.org'>foo</a></li><li><a href='http://apache.org'>foo</a></li></ul>" ) { + @Override public void verify(List<LinkBean> o) { assertType(LinkBean.class, o.get(0)); } @@ -1412,7 +1437,7 @@ public class BasicHtmlTest { +"\t\t</td>\n" +"\t</tr>\n" +"</table>\n", - + "<table>" +"<tr>" +"<td>a</td>" @@ -1440,6 +1465,7 @@ public class BasicHtmlTest { +"</table>" ) { + @Override public void verify(BeanWithLinkBeanProperties o) { assertType(LinkBean.class, o.a); assertType(LinkBean.class, o.b.get(0)); @@ -1457,6 +1483,7 @@ public class BasicHtmlTest { "<table><tr><td>a</td><td><sp> </sp> <bs/><ff/><br/><sp> </sp> <sp> </sp></td></tr></table>" ) { + @Override public void verify(BeanWithSpecialCharacters o) { assertType(BeanWithSpecialCharacters.class, o); } @@ -1475,10 +1502,11 @@ public class BasicHtmlTest { +" <td><sp> </sp> <bs/><ff/><br/><sp> </sp> <sp> </sp></td>\n" +" </tr>\n" +"</table>\n", - + "<table><tr><td>a</td><td><sp> </sp> <bs/><ff/><br/><sp> </sp> <sp> </sp></td></tr></table>" ) { + @Override public void verify(BeanWithSpecialCharacters o) { assertType(BeanWithSpecialCharacters.class, o); } @@ -1494,6 +1522,7 @@ public class BasicHtmlTest { "<table></table>" ) { + @Override public void verify(BeanWithNullProperties o) { assertType(BeanWithNullProperties.class, o); } @@ -1597,7 +1626,7 @@ public class BasicHtmlTest { +"\t\t</td>\n" +"\t</tr>\n" +"</table>\n", - + "<table>" +"<tr>" +"<td>a</td>" @@ -1646,6 +1675,7 @@ public class BasicHtmlTest { +"</table>" ) { + @Override public void verify(BeanWithAbstractFields o) { assertType(A.class, o.a); assertType(A.class, o.ia); @@ -1942,6 +1972,7 @@ public class BasicHtmlTest { +"</table>" ) { + @Override public void verify(BeanWithAbstractArrayFields o) { assertType(A.class, o.a[0]); assertType(A.class, o.ia1[0]); @@ -2071,7 +2102,7 @@ public class BasicHtmlTest { +"\t\t</td>\n" +"\t</tr>\n" +"</table>\n", - + "<table>" +"<tr>" +"<td>a</td>" @@ -2130,6 +2161,7 @@ public class BasicHtmlTest { +"</table>" ) { + @Override public void verify(BeanWithAbstractMapFields o) { assertType(A.class, o.a.get("k1")); assertType(A.class, o.b.get("k2")); @@ -2147,6 +2179,7 @@ public class BasicHtmlTest { "<object></object>" ) { + @Override public void verify(BeanWithWhitespaceTextFields o) { assertType(BeanWithWhitespaceTextFields.class, o); } @@ -2162,6 +2195,7 @@ public class BasicHtmlTest { "<object><sp/></object>" ) { + @Override public void verify(BeanWithWhitespaceTextFields o) { assertType(BeanWithWhitespaceTextFields.class, o); } @@ -2177,6 +2211,7 @@ public class BasicHtmlTest { "<object><sp> </sp></object>" ) { + @Override public void verify(BeanWithWhitespaceTextFields o) { assertType(BeanWithWhitespaceTextFields.class, o); } @@ -2192,6 +2227,7 @@ public class BasicHtmlTest { "<object><sp> </sp><sp> </sp></object>" ) { + @Override public void verify(BeanWithWhitespaceTextFields o) { assertType(BeanWithWhitespaceTextFields.class, o); } @@ -2207,6 +2243,7 @@ public class BasicHtmlTest { "<object><sp> </sp> foobar <sp> </sp></object>" ) { + @Override public void verify(BeanWithWhitespaceTextFields o) { assertType(BeanWithWhitespaceTextFields.class, o); } @@ -2222,6 +2259,7 @@ public class BasicHtmlTest { "<object></object>" ) { + @Override public void verify(BeanWithWhitespaceTextPwsFields o) { assertType(BeanWithWhitespaceTextPwsFields.class, o); } @@ -2237,6 +2275,7 @@ public class BasicHtmlTest { "<object><sp/></object>" ) { + @Override public void verify(BeanWithWhitespaceTextPwsFields o) { assertType(BeanWithWhitespaceTextPwsFields.class, o); } @@ -2252,6 +2291,7 @@ public class BasicHtmlTest { "<object> </object>" ) { + @Override public void verify(BeanWithWhitespaceTextPwsFields o) { assertType(BeanWithWhitespaceTextPwsFields.class, o); } @@ -2267,6 +2307,7 @@ public class BasicHtmlTest { "<object> </object>" ) { + @Override public void verify(BeanWithWhitespaceTextPwsFields o) { assertType(BeanWithWhitespaceTextPwsFields.class, o); } @@ -2282,6 +2323,7 @@ public class BasicHtmlTest { "<object> foobar </object>" ) { + @Override public void verify(BeanWithWhitespaceTextPwsFields o) { assertType(BeanWithWhitespaceTextPwsFields.class, o); } @@ -2297,6 +2339,7 @@ public class BasicHtmlTest { "<object></object>" ) { + @Override public void verify(BeanWithWhitespaceMixedFields o) { assertType(BeanWithWhitespaceMixedFields.class, o); } @@ -2312,6 +2355,7 @@ public class BasicHtmlTest { "<object></object>" ) { + @Override public void verify(BeanWithWhitespaceMixedFields o) { assertType(BeanWithWhitespaceMixedFields.class, o); } @@ -2327,6 +2371,7 @@ public class BasicHtmlTest { "<object><sp/></object>" ) { + @Override public void verify(BeanWithWhitespaceMixedFields o) { assertType(BeanWithWhitespaceMixedFields.class, o); } @@ -2342,6 +2387,7 @@ public class BasicHtmlTest { "<object><sp> </sp></object>" ) { + @Override public void verify(BeanWithWhitespaceMixedFields o) { assertType(BeanWithWhitespaceMixedFields.class, o); } @@ -2357,6 +2403,7 @@ public class BasicHtmlTest { "<object><sp> </sp><sp> </sp></object>" ) { + @Override public void verify(BeanWithWhitespaceMixedFields o) { assertType(BeanWithWhitespaceMixedFields.class, o); } @@ -2372,6 +2419,7 @@ public class BasicHtmlTest { "<object><sp> </sp> foobar <sp> </sp></object>" ) { + @Override public void verify(BeanWithWhitespaceMixedFields o) { assertType(BeanWithWhitespaceMixedFields.class, o); } @@ -2387,6 +2435,7 @@ public class BasicHtmlTest { "<object></object>" ) { + @Override public void verify(BeanWithWhitespaceMixedPwsFields o) { assertType(BeanWithWhitespaceMixedPwsFields.class, o); } @@ -2402,6 +2451,7 @@ public class BasicHtmlTest { "<object></object>" ) { + @Override public void verify(BeanWithWhitespaceMixedPwsFields o) { assertType(BeanWithWhitespaceMixedPwsFields.class, o); } @@ -2417,6 +2467,7 @@ public class BasicHtmlTest { "<object><sp/></object>" ) { + @Override public void verify(BeanWithWhitespaceMixedPwsFields o) { assertType(BeanWithWhitespaceMixedPwsFields.class, o); } @@ -2432,6 +2483,7 @@ public class BasicHtmlTest { "<object> </object>" ) { + @Override public void verify(BeanWithWhitespaceMixedPwsFields o) { assertType(BeanWithWhitespaceMixedPwsFields.class, o); } @@ -2447,6 +2499,7 @@ public class BasicHtmlTest { "<object> </object>" ) { + @Override public void verify(BeanWithWhitespaceMixedPwsFields o) { assertType(BeanWithWhitespaceMixedPwsFields.class, o); } @@ -2462,6 +2515,7 @@ public class BasicHtmlTest { "<object> foobar </object>" ) { + @Override public void verify(BeanWithWhitespaceMixedPwsFields o) { assertType(BeanWithWhitespaceMixedPwsFields.class, o); } @@ -2475,12 +2529,12 @@ public class BasicHtmlTest { public BasicHtmlTest(Input input) throws Exception { this.input = input; } - + public static class Input<T> { private final String label, e1, e2, e3; private final Type type; private final Object in; - + public Input(String label, Type type, T in, String e1, String e2, String e3) { this.label = label; this.type = type; @@ -2489,7 +2543,7 @@ public class BasicHtmlTest { this.e2 = e2; this.e3 = e3; } - + public void verify(T o) {} } @@ -2831,7 +2885,7 @@ public class BasicHtmlTest { return this; } } - + public static class BeanWithNullProperties { public String a; public String[] b; @@ -2915,23 +2969,23 @@ public class BasicHtmlTest { return this; } } - + @Html(asXml=true) public static class BeanWithWhitespaceTextFields { @Xml(format=XmlFormat.TEXT) public String a; - + public BeanWithWhitespaceTextFields init(String s) { a = s; return this; } } - + @Html(asXml=true) public static class BeanWithWhitespaceTextPwsFields { @Xml(format=XmlFormat.TEXT_PWS) public String a; - + public BeanWithWhitespaceTextPwsFields init(String s) { a = s; return this; @@ -2942,7 +2996,7 @@ public class BasicHtmlTest { public static class BeanWithWhitespaceMixedFields { @Xml(format=XmlFormat.MIXED) public String[] a; - + public BeanWithWhitespaceMixedFields init(String[] s) { a = s; return this; @@ -2953,7 +3007,7 @@ public class BasicHtmlTest { public static class BeanWithWhitespaceMixedPwsFields { @Xml(format=XmlFormat.MIXED_PWS) public String[] a; - + public BeanWithWhitespaceMixedPwsFields init(String[] s) { a = s; return this; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/html/CommonParserTest.java ---------------------------------------------------------------------- diff --git a/juneau-core-test/src/test/java/org/apache/juneau/html/CommonParserTest.java b/juneau-core-test/src/test/java/org/apache/juneau/html/CommonParserTest.java index 8e4a059..865ab54 100755 --- a/juneau-core-test/src/test/java/org/apache/juneau/html/CommonParserTest.java +++ b/juneau-core-test/src/test/java/org/apache/juneau/html/CommonParserTest.java @@ -149,7 +149,7 @@ public class CommonParserTest { assertEquals(1, MyParserListener.events.size()); assertEquals("unknown,-1,-1", MyParserListener.events.get(0)); } - + public static class MyParserListener extends ParserListener { final static List<String> events = new LinkedList<String>(); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/https/AcceptExtensionsTest.java ---------------------------------------------------------------------- diff --git a/juneau-core-test/src/test/java/org/apache/juneau/https/AcceptExtensionsTest.java b/juneau-core-test/src/test/java/org/apache/juneau/https/AcceptExtensionsTest.java index 6a7b0d3..c2759d4 100644 --- a/juneau-core-test/src/test/java/org/apache/juneau/https/AcceptExtensionsTest.java +++ b/juneau-core-test/src/test/java/org/apache/juneau/https/AcceptExtensionsTest.java @@ -30,7 +30,7 @@ public class AcceptExtensionsTest { public void testExtensions() throws Exception { Accept accept; MediaTypeRange mr; - + accept = Accept.forString("text/json"); mr = accept.asRanges().get(0); assertTextEquals("text/json", mr); @@ -62,7 +62,7 @@ public class AcceptExtensionsTest { assertObjectEquals("{a:['1']}", mr.getMediaType().getParameters()); assertTextEquals("0.9", mr.getQValue()); assertObjectEquals("{b:['2']}", mr.getExtensions()); - + accept = Accept.forString("text/json;a=1;a=2;q=0.9;b=3;b=4"); mr = accept.asRanges().get(0); assertTextEquals("text/json;a=1;a=2;q=0.9;b=3;b=4", mr); @@ -86,7 +86,7 @@ public class AcceptExtensionsTest { assertObjectEquals("{a:['1']}", mr.getMediaType().getParameters()); assertTextEquals("1.0", mr.getQValue()); assertObjectEquals("{}", mr.getExtensions()); - + accept = Accept.forString("text/json;q=0.9"); mr = accept.asRanges().get(0); assertTextEquals("text/json;q=0.9", mr); @@ -103,7 +103,7 @@ public class AcceptExtensionsTest { assertTextEquals("0.9", mr.getQValue()); assertObjectEquals("{}", mr.getExtensions()); } - + //-------------------------------------------------------------------------------- // Tests the Accept.hasSubtypePart() method. //-------------------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7231baab/juneau-core-test/src/test/java/org/apache/juneau/https/AcceptTest.java ---------------------------------------------------------------------- diff --git a/juneau-core-test/src/test/java/org/apache/juneau/https/AcceptTest.java b/juneau-core-test/src/test/java/org/apache/juneau/https/AcceptTest.java index 8a2b174..6f44506 100644 --- a/juneau-core-test/src/test/java/org/apache/juneau/https/AcceptTest.java +++ b/juneau-core-test/src/test/java/org/apache/juneau/https/AcceptTest.java @@ -29,20 +29,20 @@ public class AcceptTest { @Parameterized.Parameters public static Collection<Object[]> getParameters() { return Arrays.asList(new Object[][] { - + // label, accept-header, media-types, expected-index - + // Simple matches { "SimpleMatch-1", "text/json", "['text/json']", 0 }, { "SimpleMatch-2", "text/json", "['text/json','text/foo']", 0 }, { "SimpleMatch-3", "text/json", "['text/foo','text/json']", 1 }, - + // Simple no-matches { "SimpleNoMatch-1", "text/jsonx", "['text/json']", -1 }, { "SimpleNoMatch-2", "text/jso", "['text/json']", -1 }, { "SimpleNoMatch-3", "text/json", "['application/json']", -1 }, { "SimpleNoMatch-4", "text/json", "[]", -1 }, - + // Meta-character matches { "MetaMatch-1", "text/*", "['text/a','text/b+c','text/b+d+e']", 2 }, { "MetaMatch-2", "text/b+*", "['text/a','text/b+c','text/b+d+e']", 2 }, @@ -59,7 +59,7 @@ public class AcceptTest { { "RevMetaMatch-1", "text/a", "['text/*']", 0 }, { "RevMetaMatch-3", "text/a", "['*/a']", 0 }, { "RevMetaMatch-3", "text/a", "['*/*']", 0 }, - + // Meta-character mixture matches { "MixedMetaMatch-1", "text/*", "['text/*','text/a','text/a+b','text/b+c','text/d+*']", 0 }, { "MixedMetaMatch-2", "*/a", "['text/*','text/a','text/a+b','text/b+c','text/d+*']", 1 }, @@ -89,7 +89,7 @@ public class AcceptTest { { "Fuzzy-10", "text/1+2+3+4", "['text/1+2+3','text/1+2']", 0 }, { "Fuzzy-11", "text/4+2+3+1", "['text/1+2+3','text/1+2']", 0 }, { "Fuzzy-12", "text/4+2+3+1", "['text/1+2','text/1+2+3']", 1 }, - + // Q metrics { "Q-1", "text/A;q=0.9,text/B;q=0.1", "['text/A','text/B']", 0 }, { "Q-2", "text/A;q=0.9,text/B;q=0.1", "['text/B','text/A']", 1 }, @@ -100,23 +100,23 @@ public class AcceptTest { // Test q=0 { "Q0-1", "text/A;q=0,text/B;q=0.1", "['text/A','text/B']", 1 }, { "Q0-2", "text/A;q=0,text/B;q=0.1", "['text/A','text/A+1']", -1 }, - + // Test media types with parameters { "Parms-1", "text/A", "['text/A;foo=bar','text/B']", 0 }, { "Parms-2", "text/A;foo=bar", "['text/A','text/B']", 0 }, }); } - + private String label, accept, mediaTypes; private int expected; - + public AcceptTest(String label, String accept, String mediaTypes, int expected) { this.label = label; this.accept = accept; this.mediaTypes = mediaTypes; this.expected = expected; } - + @Test public void test() throws Exception { Accept accept = Accept.forString(this.accept);
