Added DataEnumRestriction for validating with datatypes that have a limited set of good values.
Added a test for it.
1.1 --- a/schema2beans/test/unit/src/data/TestWebAppDelegator.java Thu Feb 27 19:21:37 2003 +0000
1.2 +++ b/schema2beans/test/unit/src/data/TestWebAppDelegator.java Thu Feb 27 22:17:58 2003 +0000
1.3 @@ -97,5 +97,19 @@
1.4 sc.getWebResourceCollection(0).addUrlPattern("*.html");
1.5 webApp.write(out);
1.6 webApp.validate();
1.7 +
1.8 + FilterMappingType fm = new FilterMappingType();
1.9 + webApp.addFilterMapping(fm);
1.10 + fm.setServletName("Bob");
1.11 + fm.addDispatcher("I am a dispatcher.");
1.12 + try {
1.13 + webApp.validate();
1.14 + check(false, "Failed to get validate exception");
1.15 + } catch (webapp.WebApp.ValidateException e) {
1.16 + check(true, "Got good validate exception: "+e.getMessage());
1.17 + }
1.18 + fm.setDispatcher(0, "FORWARD");
1.19 + webApp.write(out);
1.20 + webApp.validate();
1.21 }
1.22 }
2.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testWebAppDelegator.pass Thu Feb 27 19:21:37 2003 +0000
2.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testWebAppDelegator.pass Thu Feb 27 22:17:58 2003 +0000
2.3 @@ -263,4 +263,29 @@
2.4 out: </auth-constraint>
2.5 out: </security-constraint>
2.6 out: </web-app>
2.7 +out: TestWebAppDelegator null Got good validate exception: element enumeration test -> OK
2.8 +out: <?xml version='1.0' encoding='UTF-8' ?>
2.9 +out: <web-app xmlns='http://java.sun.com/xml/ns/j2ee' version='2.4'>
2.10 +out: <description>Changed the description</description>
2.11 +out: <display-name>MyWebApp</display-name>
2.12 +out: <filter>
2.13 +out: <filter-name>Bob</filter-name>
2.14 +out: <filter-class>foo</filter-class>
2.15 +out: </filter>
2.16 +out: <filter-mapping>
2.17 +out: <filter-name></filter-name>
2.18 +out: <servlet-name>Bob</servlet-name>
2.19 +out: <dispatcher>FORWARD</dispatcher>
2.20 +out: </filter-mapping>
2.21 +out: <security-constraint>
2.22 +out: <web-resource-collection>
2.23 +out: <web-resource-name>blue</web-resource-name>
2.24 +out: <url-pattern>*.html</url-pattern>
2.25 +out: </web-resource-collection>
2.26 +out: <auth-constraint>
2.27 +out: <goodPresidentCandidate>true</goodPresidentCandidate>
2.28 +out: <goodPresidentCandidate>false</goodPresidentCandidate>
2.29 +out: </auth-constraint>
2.30 +out: </security-constraint>
2.31 +out: </web-app>
2.32 Finished running TestWebAppDelegator: 0