1.1 --- a/schema2beans/test/unit/src/data/TestWebAppDelegatorBaseBean.java Fri Mar 07 18:04:02 2003 +0000
1.2 +++ b/schema2beans/test/unit/src/data/TestWebAppDelegatorBaseBean.java Fri Mar 07 20:14:59 2003 +0000
1.3 @@ -117,5 +117,10 @@
1.4 webApp.setDescriptionXmlLang(1, "de");
1.5 webApp.validate();
1.6 webApp.write(out);
1.7 +
1.8 + out("Test multiple things");
1.9 + check("thing1".equals(webApp.getThing().getFilterName()), "thing1");
1.10 + check("thing2".equals(webApp.getThing2().getFilterName()), "thing2");
1.11 + check("thing3".equals(webApp.getThing3().getFilterName()), "thing3");
1.12 }
1.13 }
2.1 --- a/schema2beans/test/unit/src/data/TestWebAppDelegatorBaseBean.xml Fri Mar 07 18:04:02 2003 +0000
2.2 +++ b/schema2beans/test/unit/src/data/TestWebAppDelegatorBaseBean.xml Fri Mar 07 20:14:59 2003 +0000
2.3 @@ -6,4 +6,16 @@
2.4 <filter>
2.5 <filter-name>Bob</filter-name>
2.6 </filter>
2.7 + <thing>
2.8 + <filter-name>thing1</filter-name>
2.9 + <filter-class>A</filter-class>
2.10 + </thing>
2.11 + <thing>
2.12 + <filter-name>thing2</filter-name>
2.13 + <filter-class>B</filter-class>
2.14 + </thing>
2.15 + <thing>
2.16 + <filter-name>thing3</filter-name>
2.17 + <filter-class>C</filter-class>
2.18 + </thing>
2.19 </web-app>
3.1 --- a/schema2beans/test/unit/src/data/TestWebAppDelegatorBaseBean.xsd Fri Mar 07 18:04:02 2003 +0000
3.2 +++ b/schema2beans/test/unit/src/data/TestWebAppDelegatorBaseBean.xsd Fri Mar 07 20:14:59 2003 +0000
3.3 @@ -3,6 +3,7 @@
3.4 targetNamespace="http://java.sun.com/xml/ns/j2ee"
3.5 xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
3.6 xmlns:xsd="http://www.w3.org/2001/XMLSchema"
3.7 + xmlns:s2b="http://schema2beans.netbeans.org"
3.8 elementFormDefault="qualified"
3.9 attributeFormDefault="unqualified"
3.10 version="2.4">
3.11 @@ -1110,6 +1111,7 @@
3.12 </xsd:annotation>
3.13 </xsd:element>
3.14
3.15 + <xsd:element name="thing" type="j2ee:filterType" minOccurs="0"/>
3.16 <xsd:element name="filter"
3.17 type="j2ee:filterType"
3.18 minOccurs="0" maxOccurs="unbounded">
3.19 @@ -1118,6 +1120,8 @@
3.20 <xsd:field xpath="param-name"/>
3.21 </xsd:key>
3.22 </xsd:element>
3.23 + <xsd:element name="thing" type="j2ee:filterType" minOccurs="0"/>
3.24 + <xsd:element name="thing" type="j2ee:filterType" minOccurs="0"/>
3.25 <xsd:element name="filter-mapping"
3.26 type="j2ee:filter-mappingType"
3.27 minOccurs="0"
4.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testWebAppDelegatorBaseBean.pass Fri Mar 07 18:04:02 2003 +0000
4.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testWebAppDelegatorBaseBean.pass Fri Mar 07 20:14:59 2003 +0000
4.3 @@ -16,6 +16,22 @@
4.4 [attr: xml:lang CDATA #IMPLIED : java.lang.String]
4.5 param-name : java.lang.String [whiteSpace (collapse)]
4.6 param-value : java.lang.String
4.7 + thing : FilterType?
4.8 + description : java.lang.String[0,n]
4.9 + [attr: xml:lang CDATA #IMPLIED : java.lang.String]
4.10 + display-name : java.lang.String[0,n]
4.11 + [attr: xml:lang CDATA #IMPLIED : java.lang.String]
4.12 + icon : IconType[0,n]
4.13 + [attr: xml:lang CDATA #IMPLIED : java.lang.String]
4.14 + small-icon : java.lang.String?
4.15 + large-icon : java.lang.String?
4.16 + filter-name : java.lang.String
4.17 + filter-class : java.lang.String
4.18 + init-param : ParamValueType[0,n]
4.19 + description : java.lang.String[0,n]
4.20 + [attr: xml:lang CDATA #IMPLIED : java.lang.String]
4.21 + param-name : java.lang.String [whiteSpace (collapse)]
4.22 + param-value : java.lang.String
4.23 filter : FilterType[0,n]
4.24 description : java.lang.String[0,n]
4.25 [attr: xml:lang CDATA #IMPLIED : java.lang.String]
4.26 @@ -32,6 +48,38 @@
4.27 [attr: xml:lang CDATA #IMPLIED : java.lang.String]
4.28 param-name : java.lang.String [whiteSpace (collapse)]
4.29 param-value : java.lang.String
4.30 + thing2 : FilterType?
4.31 + description : java.lang.String[0,n]
4.32 + [attr: xml:lang CDATA #IMPLIED : java.lang.String]
4.33 + display-name : java.lang.String[0,n]
4.34 + [attr: xml:lang CDATA #IMPLIED : java.lang.String]
4.35 + icon : IconType[0,n]
4.36 + [attr: xml:lang CDATA #IMPLIED : java.lang.String]
4.37 + small-icon : java.lang.String?
4.38 + large-icon : java.lang.String?
4.39 + filter-name : java.lang.String
4.40 + filter-class : java.lang.String
4.41 + init-param : ParamValueType[0,n]
4.42 + description : java.lang.String[0,n]
4.43 + [attr: xml:lang CDATA #IMPLIED : java.lang.String]
4.44 + param-name : java.lang.String [whiteSpace (collapse)]
4.45 + param-value : java.lang.String
4.46 + thing3 : FilterType?
4.47 + description : java.lang.String[0,n]
4.48 + [attr: xml:lang CDATA #IMPLIED : java.lang.String]
4.49 + display-name : java.lang.String[0,n]
4.50 + [attr: xml:lang CDATA #IMPLIED : java.lang.String]
4.51 + icon : IconType[0,n]
4.52 + [attr: xml:lang CDATA #IMPLIED : java.lang.String]
4.53 + small-icon : java.lang.String?
4.54 + large-icon : java.lang.String?
4.55 + filter-name : java.lang.String
4.56 + filter-class : java.lang.String
4.57 + init-param : ParamValueType[0,n]
4.58 + description : java.lang.String[0,n]
4.59 + [attr: xml:lang CDATA #IMPLIED : java.lang.String]
4.60 + param-name : java.lang.String [whiteSpace (collapse)]
4.61 + param-value : java.lang.String
4.62 filter-mapping : FilterMappingType[0,n]
4.63 filter-name : java.lang.String
4.64 | url-pattern : java.lang.String
4.65 @@ -208,6 +256,18 @@
4.66 out: <filter>
4.67 out: <filter-name>Bob</filter-name>
4.68 out: </filter>
4.69 +out: <thing>
4.70 +out: <filter-name>thing1</filter-name>
4.71 +out: <filter-class>A</filter-class>
4.72 +out: </thing>
4.73 +out: <thing>
4.74 +out: <filter-name>thing2</filter-name>
4.75 +out: <filter-class>B</filter-class>
4.76 +out: </thing>
4.77 +out: <thing>
4.78 +out: <filter-name>thing3</filter-name>
4.79 +out: <filter-class>C</filter-class>
4.80 +out: </thing>
4.81 out: </web-app>
4.82 out: TestWebAppDelegatorBaseBean - making some minor changes
4.83 out: <?xml version="1.0" encoding="UTF-8"?>
4.84 @@ -218,6 +278,18 @@
4.85 out: <filter-name>Bob</filter-name>
4.86 out: <filter-class>foo</filter-class>
4.87 out: </filter>
4.88 +out: <thing>
4.89 +out: <filter-name>thing1</filter-name>
4.90 +out: <filter-class>A</filter-class>
4.91 +out: </thing>
4.92 +out: <thing>
4.93 +out: <filter-name>thing2</filter-name>
4.94 +out: <filter-class>B</filter-class>
4.95 +out: </thing>
4.96 +out: <thing>
4.97 +out: <filter-name>thing3</filter-name>
4.98 +out: <filter-class>C</filter-class>
4.99 +out: </thing>
4.100 out: </web-app>
4.101 out: TestWebAppDelegatorBaseBean - set some goodnesses
4.102 out: TestWebAppDelegatorBaseBean null firstCandiateGoodness is good -> OK
4.103 @@ -232,6 +304,18 @@
4.104 out: <filter-name>Bob</filter-name>
4.105 out: <filter-class>foo</filter-class>
4.106 out: </filter>
4.107 +out: <thing>
4.108 +out: <filter-name>thing1</filter-name>
4.109 +out: <filter-class>A</filter-class>
4.110 +out: </thing>
4.111 +out: <thing>
4.112 +out: <filter-name>thing2</filter-name>
4.113 +out: <filter-class>B</filter-class>
4.114 +out: </thing>
4.115 +out: <thing>
4.116 +out: <filter-name>thing3</filter-name>
4.117 +out: <filter-class>C</filter-class>
4.118 +out: </thing>
4.119 out: <security-constraint>
4.120 out: <auth-constraint>
4.121 out: <goodPresidentCandidate>true</goodPresidentCandidate>
4.122 @@ -251,6 +335,18 @@
4.123 out: <filter-name>Bob</filter-name>
4.124 out: <filter-class>foo</filter-class>
4.125 out: </filter>
4.126 +out: <thing>
4.127 +out: <filter-name>thing1</filter-name>
4.128 +out: <filter-class>A</filter-class>
4.129 +out: </thing>
4.130 +out: <thing>
4.131 +out: <filter-name>thing2</filter-name>
4.132 +out: <filter-class>B</filter-class>
4.133 +out: </thing>
4.134 +out: <thing>
4.135 +out: <filter-name>thing3</filter-name>
4.136 +out: <filter-class>C</filter-class>
4.137 +out: </thing>
4.138 out: <security-constraint>
4.139 out: <web-resource-collection>
4.140 out: <web-resource-name>blue</web-resource-name>
4.141 @@ -272,6 +368,18 @@
4.142 out: <filter-name>Bob</filter-name>
4.143 out: <filter-class>foo</filter-class>
4.144 out: </filter>
4.145 +out: <thing>
4.146 +out: <filter-name>thing1</filter-name>
4.147 +out: <filter-class>A</filter-class>
4.148 +out: </thing>
4.149 +out: <thing>
4.150 +out: <filter-name>thing2</filter-name>
4.151 +out: <filter-class>B</filter-class>
4.152 +out: </thing>
4.153 +out: <thing>
4.154 +out: <filter-name>thing3</filter-name>
4.155 +out: <filter-class>C</filter-class>
4.156 +out: </thing>
4.157 out: <security-constraint>
4.158 out: <web-resource-collection>
4.159 out: <web-resource-name>blue</web-resource-name>
4.160 @@ -283,4 +391,8 @@
4.161 out: </auth-constraint>
4.162 out: </security-constraint>
4.163 out: </web-app>
4.164 +out: TestWebAppDelegatorBaseBean - Test multiple things
4.165 +out: TestWebAppDelegatorBaseBean null thing1 -> OK
4.166 +out: TestWebAppDelegatorBaseBean null thing2 -> OK
4.167 +out: TestWebAppDelegatorBaseBean null thing3 -> OK
4.168 Finished running TestWebAppDelegatorBaseBean: 0