[jboss-cvs] JBossAS SVN: r66705 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/web and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2007-11-03 11:58:46 -0400 (Sat, 03 Nov 2007)
New Revision: 66705

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMappingMetaData.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp5EverythingUnitTestCase.java
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp5Everything_testEverything.xml
Log:
Validate filter-mappings

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMappingMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMappingMetaData.java	2007-11-03 14:43:45 UTC (rev 66704)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/spec/FilterMappingMetaData.java	2007-11-03 15:58:46 UTC (rev 66705)
@@ -73,7 +73,7 @@
    {
       return dispatchers;
    }
-   @XmlElement(name="dispatcher")
+   @XmlElement(name="dispatcher", type=DispatcherType.class)
    public void setDispatchers(List<DispatcherType> dispatchers)
    {
       this.dispatchers = dispatchers;

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp5EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp5EverythingUnitTestCase.java	2007-11-03 14:43:45 UTC (rev 66704)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp5EverythingUnitTestCase.java	2007-11-03 15:58:46 UTC (rev 66705)
@@ -27,11 +27,17 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.jboss.annotation.javaee.Icon;
+import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
 import org.jboss.metadata.javaee.spec.MessageDestinationMetaData;
 import org.jboss.metadata.javaee.spec.MessageDestinationsMetaData;
 import org.jboss.metadata.javaee.spec.ParamValueMetaData;
 import org.jboss.metadata.javaee.spec.SecurityRoleRefMetaData;
 import org.jboss.metadata.javaee.spec.SecurityRoleRefsMetaData;
+import org.jboss.metadata.web.spec.DispatcherType;
+import org.jboss.metadata.web.spec.FilterMappingMetaData;
+import org.jboss.metadata.web.spec.FilterMetaData;
+import org.jboss.metadata.web.spec.FiltersMetaData;
 import org.jboss.metadata.web.spec.ServletMappingMetaData;
 import org.jboss.metadata.web.spec.ServletMetaData;
 import org.jboss.metadata.web.spec.ServletsMetaData;
@@ -82,6 +88,8 @@
       assertMessageDestinations5("webAppMessageDestination", 2, webApp.getMessageDestinations(), true);
       assertServlets(webApp);
       assertServletMappings(webApp);
+      assertFilters(webApp);
+      assertFilterMappings(webApp);
    }
 
    private void assertMessageDestinations5(String prefix, int size, MessageDestinationsMetaData messageDestinations, boolean full)
@@ -149,4 +157,42 @@
          count ++;
       }
    }
+   private void assertFilters(WebMetaData webApp)
+      throws Exception
+   {
+      FiltersMetaData filters = webApp.getFilters();
+      assertEquals(2, filters.size());
+      FilterMetaData f0 = filters.get("filter0Name");
+      assertEquals("filter0Class", f0.getFilterClass());
+      int count = 0;
+      for(FilterMetaData f : filters)
+      {
+         assertEquals("filter"+count, f.getId());
+         assertEquals("filter"+count+"Class", f.getFilterClass());
+         DescriptionGroupMetaData dg = f.getDescriptionGroup();
+         Icon[] icons = dg.getIcons().value();
+         assertEquals("filter"+count+"-description", dg.getDescription());
+         assertEquals("filter"+count+"-display-name", dg.getDisplayName());
+         assertEquals("filter"+count+"-large-icon", icons[0].largeIcon());
+         assertEquals("filter"+count+"-small-icon", icons[0].smallIcon());
+         count ++;
+      }
+   }
+   private void assertFilterMappings(WebMetaData webApp)
+      throws Exception
+   {
+      List<FilterMappingMetaData> mappings = webApp.getFilterMappings();
+      assertEquals(2, mappings.size());
+      FilterMappingMetaData m0 = mappings.get(0);
+      assertEquals("filter0-mapping", m0.getId());
+      assertEquals("filter0Name", m0.getFilterName());
+      assertEquals(null, m0.getServletNames());
+      assertEquals(2, m0.getUrlPatterns().size());
+      assertEquals("/filter0/*", m0.getUrlPatterns().get(0));
+      assertEquals("/*", m0.getUrlPatterns().get(1));
+      List<DispatcherType> dispatchers = m0.getDispatchers();
+      assertEquals(2, dispatchers.size());
+      assertEquals(DispatcherType.FORWARD, dispatchers.get(0));
+      assertEquals(DispatcherType.REQUEST, dispatchers.get(1));
+   }
 }

Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp5Everything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp5Everything_testEverything.xml	2007-11-03 14:43:45 UTC (rev 66704)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp5Everything_testEverything.xml	2007-11-03 15:58:46 UTC (rev 66705)
@@ -41,10 +41,26 @@
    <distributable/>
 
    <filter id="filter0">
+      <description>filter0-description</description>
+      <display-name>filter0-display-name</display-name>
+      <icon>
+         <small-icon>filter0-small-icon</small-icon>
+         <large-icon>filter0-large-icon</large-icon>
+      </icon>
       <filter-name>filter0Name</filter-name>
-      <filter-class>filter0.class</filter-class>
+      <filter-class>filter0Class</filter-class>
    </filter>
-   <filter-mapping id="filter0-mapping">
+    <filter id="filter1">
+       <description>filter1-description</description>
+       <display-name>filter1-display-name</display-name>
+       <icon>
+          <small-icon>filter1-small-icon</small-icon>
+          <large-icon>filter1-large-icon</large-icon>
+       </icon>
+       <filter-name>filter1Name</filter-name>
+       <filter-class>filter1Class</filter-class>
+    </filter>
+    <filter-mapping id="filter0-mapping">
       <filter-name>filter0Name</filter-name>
       <url-pattern>/filter0/*</url-pattern>
       <url-pattern>/*</url-pattern>