http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/bde9b101/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 3d43c1e..4a39c33 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
@@ -12,6 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.dto.html5;
+import static org.apache.juneau.TestUtils.*;
+
import static org.apache.juneau.dto.html5.HtmlBuilder.*;
import java.util.*;
@@ -32,29 +34,37 @@ public class Html5TemplateComboTest extends ComboTest {
public static Collection<Object[]> getParameters() {
return Arrays.asList(new Object[][] {
{
- "FormTemplate-1",
- new FormTemplate("myaction", 123, true),
- /* Json */
"{a:{action:'myaction'},c:[{_type:'input',a:{type:'text',name:'v1',value:123}},{_type:'input',a:{type:'text',name:'v2',value:true}}]}",
- /* JsonT */
"{a:{action:'myaction'},c:[{t:'input',a:{type:'text',name:'v1',value:123}},{t:'input',a:{type:'text',name:'v2',value:true}}]}",
- /* JsonR */ "{\n\ta: {\n\t\taction:
'myaction'\n\t},\n\tc: [\n\t\t{\n\t\t\t_type: 'input',\n\t\t\ta:
{\n\t\t\t\ttype: 'text',\n\t\t\t\tname: 'v1',\n\t\t\t\tvalue:
123\n\t\t\t}\n\t\t},\n\t\t{\n\t\t\t_type: 'input',\n\t\t\ta: {\n\t\t\t\ttype:
'text',\n\t\t\t\tname: 'v2',\n\t\t\t\tvalue: true\n\t\t\t}\n\t\t}\n\t]\n}",
- /* Xml */ "<form
action='myaction'><input type='text' name='v1' value='123'/><input type='text'
name='v2' value='true'/></form>",
- /* XmlT */ "<form
action='myaction'><input type='text' name='v1' value='123'/><input type='text'
name='v2' value='true'/></form>",
- /* XmlR */ "<form
action='myaction'><input type='text' name='v1' value='123'/><input type='text'
name='v2' value='true'/></form>\n",
- /* XmlNs */ "<form
action='myaction'><input type='text' name='v1' value='123'/><input type='text'
name='v2' value='true'/></form>",
- /* Html */ "<form
action='myaction'><input type='text' name='v1' value='123'/><input type='text'
name='v2' value='true'/></form>",
- /* HtmlT */ "<form
action='myaction'><input type='text' name='v1' value='123'/><input type='text'
name='v2' value='true'/></form>",
- /* HtmlR */ "<form
action='myaction'><input type='text' name='v1' value='123'/><input type='text'
name='v2' value='true'/></form>\n",
- /* Uon */
"(a=(action=myaction),c=@((_type=input,a=(type=text,name=v1,value=123)),(_type=input,a=(type=text,name=v2,value=true))))",
- /* UonT */
"(a=(action=myaction),c=@((t=input,a=(type=text,name=v1,value=123)),(t=input,a=(type=text,name=v2,value=true))))",
- /* UonR */
"(\n\ta=(\n\t\taction=myaction\n\t),\n\tc=@(\n\t\t(\n\t\t\t_type=input,\n\t\t\ta=(\n\t\t\t\ttype=text,\n\t\t\t\tname=v1,\n\t\t\t\tvalue=123\n\t\t\t)\n\t\t),\n\t\t(\n\t\t\t_type=input,\n\t\t\ta=(\n\t\t\t\ttype=text,\n\t\t\t\tname=v2,\n\t\t\t\tvalue=true\n\t\t\t)\n\t\t)\n\t)\n)",
- /* UrlEnc */
"a=(action=myaction)&c=@((_type=input,a=(type=text,name=v1,value=123)),(_type=input,a=(type=text,name=v2,value=true)))",
- /* UrlEncT */
"a=(action=myaction)&c=@((t=input,a=(type=text,name=v1,value=123)),(t=input,a=(type=text,name=v2,value=true)))",
- /* UrlEncR */
"a=(\n\taction=myaction\n)\n&c=@(\n\t(\n\t\t_type=input,\n\t\ta=(\n\t\t\ttype=text,\n\t\t\tname=v1,\n\t\t\tvalue=123\n\t\t)\n\t),\n\t(\n\t\t_type=input,\n\t\ta=(\n\t\t\ttype=text,\n\t\t\tname=v2,\n\t\t\tvalue=true\n\t\t)\n\t)\n)",
- /* MsgPack */
"82A16181A6616374696F6EA86D79616374696F6EA1639282A55F74797065A5696E707574A16183A474797065A474657874A46E616D65A27631A576616C75657B82A55F74797065A5696E707574A16183A474797065A474657874A46E616D65A27632A576616C7565C3",
- /* MsgPackT */
"82A16181A6616374696F6EA86D79616374696F6EA1639282A174A5696E707574A16183A474797065A474657874A46E616D65A27631A576616C75657B82A174A5696E707574A16183A474797065A474657874A46E616D65A27632A576616C7565C3",
- /* RdfXml */
"<rdf:RDF>\n<rdf:Description>\n<jp:a
rdf:parseType='Resource'>\n<jp:action>myaction</jp:action>\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",
- /* RdfXmlT */
"<rdf:RDF>\n<rdf:Description>\n<jp:a
rdf:parseType='Resource'>\n<jp:action>myaction</jp:action>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li
rdf:parseType='Resource'>\n<jp:t>input</jp:t>\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:t>input</jp:t>\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",
- /* RdfXmlR */ "<rdf:RDF>\n
<rdf:Description>\n <jp:a rdf:parseType='Resource'>\n
<jp:action>myaction</jp:action>\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",
+ new ComboInput<FormTemplate>(
+ "FormTemplate-1",
+ FormTemplate.class,
+ new FormTemplate("myaction", 123, true),
+ /* Json */
"{a:{action:'myaction'},c:[{_type:'input',a:{type:'text',name:'v1',value:123}},{_type:'input',a:{type:'text',name:'v2',value:true}}]}",
+ /* JsonT */
"{a:{action:'myaction'},c:[{t:'input',a:{type:'text',name:'v1',value:123}},{t:'input',a:{type:'text',name:'v2',value:true}}]}",
+ /* JsonR */ "{\n\ta:
{\n\t\taction: 'myaction'\n\t},\n\tc: [\n\t\t{\n\t\t\t_type: 'input',\n\t\t\ta:
{\n\t\t\t\ttype: 'text',\n\t\t\t\tname: 'v1',\n\t\t\t\tvalue:
123\n\t\t\t}\n\t\t},\n\t\t{\n\t\t\t_type: 'input',\n\t\t\ta: {\n\t\t\t\ttype:
'text',\n\t\t\t\tname: 'v2',\n\t\t\t\tvalue: true\n\t\t\t}\n\t\t}\n\t]\n}",
+ /* Xml */ "<form
action='myaction'><input type='text' name='v1' value='123'/><input type='text'
name='v2' value='true'/></form>",
+ /* XmlT */ "<form
action='myaction'><input type='text' name='v1' value='123'/><input type='text'
name='v2' value='true'/></form>",
+ /* XmlR */ "<form
action='myaction'><input type='text' name='v1' value='123'/><input type='text'
name='v2' value='true'/></form>\n",
+ /* XmlNs */ "<form
action='myaction'><input type='text' name='v1' value='123'/><input type='text'
name='v2' value='true'/></form>",
+ /* Html */ "<form
action='myaction'><input type='text' name='v1' value='123'/><input type='text'
name='v2' value='true'/></form>",
+ /* HtmlT */ "<form
action='myaction'><input type='text' name='v1' value='123'/><input type='text'
name='v2' value='true'/></form>",
+ /* HtmlR */ "<form
action='myaction'><input type='text' name='v1' value='123'/><input type='text'
name='v2' value='true'/></form>\n",
+ /* Uon */
"(a=(action=myaction),c=@((_type=input,a=(type=text,name=v1,value=123)),(_type=input,a=(type=text,name=v2,value=true))))",
+ /* UonT */
"(a=(action=myaction),c=@((t=input,a=(type=text,name=v1,value=123)),(t=input,a=(type=text,name=v2,value=true))))",
+ /* UonR */
"(\n\ta=(\n\t\taction=myaction\n\t),\n\tc=@(\n\t\t(\n\t\t\t_type=input,\n\t\t\ta=(\n\t\t\t\ttype=text,\n\t\t\t\tname=v1,\n\t\t\t\tvalue=123\n\t\t\t)\n\t\t),\n\t\t(\n\t\t\t_type=input,\n\t\t\ta=(\n\t\t\t\ttype=text,\n\t\t\t\tname=v2,\n\t\t\t\tvalue=true\n\t\t\t)\n\t\t)\n\t)\n)",
+ /* UrlEnc */
"a=(action=myaction)&c=@((_type=input,a=(type=text,name=v1,value=123)),(_type=input,a=(type=text,name=v2,value=true)))",
+ /* UrlEncT */
"a=(action=myaction)&c=@((t=input,a=(type=text,name=v1,value=123)),(t=input,a=(type=text,name=v2,value=true)))",
+ /* UrlEncR */
"a=(\n\taction=myaction\n)\n&c=@(\n\t(\n\t\t_type=input,\n\t\ta=(\n\t\t\ttype=text,\n\t\t\tname=v1,\n\t\t\tvalue=123\n\t\t)\n\t),\n\t(\n\t\t_type=input,\n\t\ta=(\n\t\t\ttype=text,\n\t\t\tname=v2,\n\t\t\tvalue=true\n\t\t)\n\t)\n)",
+ /* MsgPack */
"82A16181A6616374696F6EA86D79616374696F6EA1639282A55F74797065A5696E707574A16183A474797065A474657874A46E616D65A27631A576616C75657B82A55F74797065A5696E707574A16183A474797065A474657874A46E616D65A27632A576616C7565C3",
+ /* MsgPackT */
"82A16181A6616374696F6EA86D79616374696F6EA1639282A174A5696E707574A16183A474797065A474657874A46E616D65A27631A576616C75657B82A174A5696E707574A16183A474797065A474657874A46E616D65A27632A576616C7565C3",
+ /* RdfXml */
"<rdf:RDF>\n<rdf:Description>\n<jp:a
rdf:parseType='Resource'>\n<jp:action>myaction</jp:action>\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",
+ /* RdfXmlT */
"<rdf:RDF>\n<rdf:Description>\n<jp:a
rdf:parseType='Resource'>\n<jp:action>myaction</jp:action>\n</jp:a>\n<jp:c>\n<rdf:Seq>\n<rdf:li
rdf:parseType='Resource'>\n<jp:t>input</jp:t>\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:t>input</jp:t>\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",
+ /* RdfXmlR */ "<rdf:RDF>\n
<rdf:Description>\n <jp:a rdf:parseType='Resource'>\n
<jp:action>myaction</jp:action>\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"
+ )
+ {
+ public void verify(FormTemplate o) {
+ assertType(FormTemplate.class,
o);
+ }
+ }
},
});
}
@@ -87,27 +97,7 @@ public class Html5TemplateComboTest extends ComboTest {
}
}
- public Html5TemplateComboTest(
- String label,
- Object in,
- String oJson, String oJsonT, String oJsonR,
- String oXml, String oXmlT, String oXmlR, String oXmlNs,
- String oHtml, String oHtmlT, String oHtmlR,
- String oUon, String oUonT, String oUonR,
- String oUrlEncoding, String oUrlEncodingT, String
oUrlEncodingR,
- String oMsgPack, String oMsgPackT,
- String oRdfXml, String oRdfXmlT, String oRdfXmlR
- ) {
- super(
- label,
- in,
- oJson, oJsonT, oJsonR,
- oXml, oXmlT, oXmlR, oXmlNs,
- oHtml, oHtmlT, oHtmlR,
- oUon, oUonT, oUonR,
- oUrlEncoding, oUrlEncodingT, oUrlEncodingR,
- oMsgPack, oMsgPackT,
- oRdfXml, oRdfXmlT, oRdfXmlR
- );
+ public Html5TemplateComboTest(ComboInput<?> comboInput) {
+ super(comboInput);
}
}
