[jboss-cvs] JBossAS SVN: r67979 - in projects/metadata/trunk/src/test: resources/org/jboss/test/metadata/ear and 1 other directory.

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

Author: scott.stark at jboss.org
Date: 2007-12-06 03:10:04 -0500 (Thu, 06 Dec 2007)
New Revision: 67979

Added:
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testNoDtd.xml
Modified:
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java
Log:
Add a test of an application.xml without a doctype

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java	2007-12-06 05:35:44 UTC (rev 67978)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java	2007-12-06 08:10:04 UTC (rev 67979)
@@ -22,7 +22,6 @@
 package org.jboss.test.metadata.ear;
 
 
-import java.security.Principal;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -41,6 +40,7 @@
 import org.jboss.metadata.ear.spec.Ear14MetaData;
 import org.jboss.metadata.ear.spec.EarMetaData;
 import org.jboss.metadata.ear.spec.ModuleMetaData;
+import org.jboss.metadata.ear.spec.ModulesMetaData;
 import org.jboss.metadata.ear.spec.WebModuleMetaData;
 import org.jboss.metadata.ear.spec.ModuleMetaData.ModuleType;
 import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
@@ -69,6 +69,7 @@
    public static SchemaBindingResolver initResolver()
    {
       DefaultSchemaResolver resolver = new DefaultSchemaResolver();
+      resolver.addClassBindingForLocation("application", Ear13DTDMetaData.class);
       resolver.addClassBindingForLocation("application_1_2.dtd", Ear13DTDMetaData.class);
       resolver.addClassBindingForLocation("application_1_3.dtd", Ear13DTDMetaData.class);
       resolver.addClassBindingForLocation("application_1_4.xsd", Ear14MetaData.class);
@@ -90,6 +91,18 @@
       return unmarshal(EarMetaData.class);
    }
 
+   public void testNoDtd() throws Exception
+   {
+      EarMetaData result = unmarshal();
+      assertEquals("JBossTest Web Container Testsuite", result.getDescriptionGroup().getDisplayName());
+      ModulesMetaData modules = result.getModules();
+      assertNotNull(modules);
+      assertEquals(1, modules.size());
+      ModuleMetaData module = modules.get(0);
+      assertEquals("manifest-web.war", module.getFileName());
+      WebModuleMetaData webModule = (WebModuleMetaData) module.getValue();
+      assertEquals("/manifest", webModule.getContextRoot());
+   }
    public void testVersion14() throws Exception
    {
       EarMetaData result = unmarshal();

Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testNoDtd.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testNoDtd.xml	                        (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testNoDtd.xml	2007-12-06 08:10:04 UTC (rev 67979)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<application>
+    <display-name>JBossTest Web Container Testsuite</display-name>
+    
+    <module>
+        <web>
+            <web-uri>manifest-web.war</web-uri>
+            <context-root>/manifest</context-root>
+        </web>
+    </module>
+    
+</application>


Property changes on: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testNoDtd.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + native