[jboss-cvs] JBossAS SVN: r82631 - in projects/metadata/trunk/src/test: resources/org/jboss/test/metadata/rar and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jan 6 08:06:20 EST 2009
Author: alex.loubyansky at jboss.com
Date: 2009-01-06 08:06:20 -0500 (Tue, 06 Jan 2009)
New Revision: 82631
Modified:
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/xml/XmlValidationUnitTestCase.java
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Everything_testEverything.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/JBossWeb50_testClassLoading.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/JBossWeb50_testClassLoading42.xml
Log:
JBMETA-159
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/xml/XmlValidationUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/xml/XmlValidationUnitTestCase.java 2009-01-06 13:06:08 UTC (rev 82630)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/xml/XmlValidationUnitTestCase.java 2009-01-06 13:06:20 UTC (rev 82631)
@@ -32,6 +32,7 @@
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
+import org.jboss.logging.Logger;
import org.jboss.util.xml.JBossEntityResolver;
import org.xml.sax.EntityResolver;
import org.xml.sax.ErrorHandler;
@@ -51,6 +52,8 @@
*/
public class XmlValidationUnitTestCase extends TestCase
{
+ private static final Logger log = Logger.getLogger(XmlValidationUnitTestCase.class);
+
private static final SAXParserFactory FACTORY;
private static final Set<String> IGNORE = new HashSet<String>();
@@ -88,14 +91,8 @@
if(pathname.getName().endsWith(".xml") && !IGNORE.contains(pathname.getName()))
{
names.add(pathname.getName());
- try
- {
- validate(pathname);
- }
- catch(SAXException e)
- {
+ if(!isValid(pathname))
++invalid;
- }
++total;
}
@@ -104,10 +101,10 @@
});
// TODO there are currently 30 expected
- assertEquals("Zero invalid files among total of " + total, 30, invalid);
+ assertEquals("Zero invalid files among total of " + total, 0, invalid);
}
- private static boolean validate(File xmlFile) throws SAXException
+ private static boolean isValid(final File xmlFile)
{
SAXParser parser;
try
@@ -139,6 +136,7 @@
throw new IllegalStateException("Failed to open file: " + xmlFile.getAbsolutePath(), e);
}
+ final boolean[] failed = new boolean[1];
try
{
parser.parse(is, new DefaultHandler()
@@ -149,11 +147,15 @@
public void error(SAXParseException e) throws SAXException
{
+ log.error(xmlFile.getPath() + "[" + e.getLineNumber() + "," + e.getColumnNumber() + "]: " + e.getMessage());
+ failed[0] = true;
throw e;
}
public void fatalError(SAXParseException e) throws SAXException
{
+ log.error(xmlFile.getPath() + "[" + e.getLineNumber() + "," + e.getColumnNumber() + "]: " + e.getMessage());
+ failed[0] = true;
throw e;
}
@@ -181,11 +183,14 @@
}
});
}
+ catch(SAXException e)
+ {
+ }
catch (IOException e)
{
throw new IllegalStateException("Failed to read file: " + xmlFile.getAbsolutePath(), e);
}
- return true;
+ return !failed[0];
}
}
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Everything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Everything_testEverything.xml 2009-01-06 13:06:08 UTC (rev 82630)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Everything_testEverything.xml 2009-01-06 13:06:20 UTC (rev 82631)
@@ -2,9 +2,9 @@
<!-- $Id$ -->
-<connector xmlns="http://java.sun.com/xml/ns/j2ee"
+<connector xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/j2ee/connector_1_6.xsd"
version="1.6" metadata-complete="true">
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/JBossWeb50_testClassLoading.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/JBossWeb50_testClassLoading.xml 2009-01-06 13:06:08 UTC (rev 82630)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/JBossWeb50_testClassLoading.xml 2009-01-06 13:06:20 UTC (rev 82631)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE jboss-web
- PUBLIC "-//JBoss//DTD Web Application 4.2//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd">
+ PUBLIC "-//JBoss//DTD Web Application 5.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-web_5_0.dtd">
<jboss-web>
<!-- Use parent first class loading model -->
<class-loading java2ClassLoadingCompliance="true">
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/JBossWeb50_testClassLoading42.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/JBossWeb50_testClassLoading42.xml 2009-01-06 13:06:08 UTC (rev 82630)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/JBossWeb50_testClassLoading42.xml 2009-01-06 13:06:20 UTC (rev 82631)
@@ -1,8 +1,12 @@
+<!DOCTYPE jboss-web
+ PUBLIC "-//JBoss//DTD Web Application 4.2//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd">
+
<jboss-web>
- <context-root>/jboss-as5-testsuite</context-root>
<class-loading>
<loader-repository>
<loader-repository-config>java2ParentDelegation=false</loader-repository-config>
</loader-repository>
</class-loading>
+ <context-root>/jboss-as5-testsuite</context-root>
</jboss-web>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list