[jboss-cvs] JBossAS SVN: r92800 - projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web.

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

Author: remy.maucherat at jboss.com
Date: 2009-08-25 13:16:29 -0400 (Tue, 25 Aug 2009)
New Revision: 92800

Modified:
   projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6EverythingUnitTestCase.java
   projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6FragmentUnitTestCase.java
Log:
- Test the correct parsing of the ordering (it works :) ).
- Obviously the code to read it is not so nice ...

Modified: projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6EverythingUnitTestCase.java
===================================================================
--- projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6EverythingUnitTestCase.java	2009-08-25 16:21:15 UTC (rev 92799)
+++ projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6EverythingUnitTestCase.java	2009-08-25 17:16:29 UTC (rev 92800)
@@ -30,11 +30,14 @@
 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.AbsoluteOrderingMetaData;
 import org.jboss.metadata.web.spec.AuthConstraintMetaData;
 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.NameMetaData;
+import org.jboss.metadata.web.spec.OthersMetaData;
 import org.jboss.metadata.web.spec.SecurityConstraintMetaData;
 import org.jboss.metadata.web.spec.ServletMappingMetaData;
 import org.jboss.metadata.web.spec.ServletMetaData;
@@ -85,8 +88,25 @@
       assertFilters(webApp);
       assertFilterMappings(webApp);
       assertSecurityConstraints(webApp);
+      assertAbsoluteOrdering(webApp);
    }
 
+   protected void assertAbsoluteOrdering(WebMetaData webApp)
+   throws Exception
+   {
+      Web30MetaData webApp30 = (Web30MetaData) webApp;
+      AbsoluteOrderingMetaData absoluteOrdering = webApp30.getAbsoluteOrdering();
+      List<Object> ordering = absoluteOrdering.getOrdering();
+      assertEquals(4, ordering.size());
+      assertEquals(NameMetaData.class.getName(), ordering.get(0).getClass().getName());
+      assertEquals("foo1", ((NameMetaData) ordering.get(0)).getName());
+      assertEquals(NameMetaData.class.getName(), ordering.get(1).getClass().getName());
+      assertEquals("foo2", ((NameMetaData) ordering.get(1)).getName());
+      assertEquals(OthersMetaData.class.getName(), ordering.get(2).getClass().getName());
+      assertEquals(NameMetaData.class.getName(), ordering.get(3).getClass().getName());
+      assertEquals("foo3", ((NameMetaData) ordering.get(3)).getName());
+   }
+
    private void assertMessageDestinations5(String prefix, int size, MessageDestinationsMetaData messageDestinations, boolean full)
    {
       assertNotNull("no message destinations are set", messageDestinations);

Modified: projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6FragmentUnitTestCase.java
===================================================================
--- projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6FragmentUnitTestCase.java	2009-08-25 16:21:15 UTC (rev 92799)
+++ projects/metadata/web/trunk/src/test/java/org/jboss/test/metadata/web/WebApp6FragmentUnitTestCase.java	2009-08-25 17:16:29 UTC (rev 92800)
@@ -30,19 +30,27 @@
 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.AbsoluteOrderingMetaData;
 import org.jboss.metadata.web.spec.AuthConstraintMetaData;
 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.NameMetaData;
+import org.jboss.metadata.web.spec.OrderingMetaData;
+import org.jboss.metadata.web.spec.OthersMetaData;
+import org.jboss.metadata.web.spec.RelativeOrderingMetaData;
 import org.jboss.metadata.web.spec.SecurityConstraintMetaData;
 import org.jboss.metadata.web.spec.ServletMappingMetaData;
 import org.jboss.metadata.web.spec.ServletMetaData;
 import org.jboss.metadata.web.spec.ServletsMetaData;
 import org.jboss.metadata.web.spec.TransportGuaranteeType;
 import org.jboss.metadata.web.spec.UserDataConstraintMetaData;
+import org.jboss.metadata.web.spec.Web30MetaData;
 import org.jboss.metadata.web.spec.WebCommonMetaData;
+import org.jboss.metadata.web.spec.WebFragment30MetaData;
 import org.jboss.metadata.web.spec.WebFragmentMetaData;
+import org.jboss.metadata.web.spec.WebMetaData;
 import org.jboss.metadata.web.spec.WebResourceCollectionMetaData;
 import org.jboss.metadata.web.spec.WebResourceCollectionsMetaData;
 import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
@@ -85,8 +93,31 @@
       assertFilters(webApp);
       assertFilterMappings(webApp);
       assertSecurityConstraints(webApp);
+      assertOrdering(webApp);
    }
 
+   protected void assertOrdering(WebCommonMetaData webApp)
+   throws Exception
+   {
+      WebFragment30MetaData webApp30 = (WebFragment30MetaData) webApp;
+      OrderingMetaData absoluteOrdering = webApp30.getOrdering();
+      RelativeOrderingMetaData after = absoluteOrdering.getAfter();
+      RelativeOrderingMetaData before = absoluteOrdering.getBefore();
+      List<Object> ordering = after.getOrdering();
+      assertEquals(1, ordering.size());
+      assertEquals(NameMetaData.class.getName(), ordering.get(0).getClass().getName());
+      assertEquals("foo4", ((NameMetaData) ordering.get(0)).getName());
+      ordering = before.getOrdering();
+      assertEquals(4, ordering.size());
+      assertEquals(NameMetaData.class.getName(), ordering.get(0).getClass().getName());
+      assertEquals("foo1", ((NameMetaData) ordering.get(0)).getName());
+      assertEquals(NameMetaData.class.getName(), ordering.get(1).getClass().getName());
+      assertEquals("foo2", ((NameMetaData) ordering.get(1)).getName());
+      assertEquals(NameMetaData.class.getName(), ordering.get(2).getClass().getName());
+      assertEquals("foo3", ((NameMetaData) ordering.get(2)).getName());
+      assertEquals(OthersMetaData.class.getName(), ordering.get(3).getClass().getName());
+   }
+
    private void assertMessageDestinations5(String prefix, int size, MessageDestinationsMetaData messageDestinations, boolean full)
    {
       assertNotNull("no message destinations are set", messageDestinations);