maven-doxia-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ltheu...@apache.org
Subject svn commit: r1061696 - in /maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd: AbstractXmlValidator.java AbstractXmlValidatorTest.java
Date Fri, 21 Jan 2011 09:06:14 GMT
Author: ltheussl
Date: Fri Jan 21 09:06:14 2011
New Revision: 1061696

URL: http://svn.apache.org/viewvc?rev=1061696&view=rev
Log:
refactor: extract an abstract super class that is more general to implement

Added:
    maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
Modified:
    maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java

Added: maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java?rev=1061696&view=auto
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
(added)
+++ maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidator.java
Fri Jan 21 09:06:14 2011
@@ -0,0 +1,417 @@
+package org.apache.maven.doxia.xsd;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import junit.framework.AssertionFailedError;
+
+import org.apache.maven.doxia.parser.AbstractXmlParser;
+
+import org.codehaus.plexus.PlexusTestCase;
+
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
+import org.xml.sax.SAXParseException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.DefaultHandler;
+import org.xml.sax.helpers.XMLReaderFactory;
+
+/**
+ * Abstract class to validate XML files.
+ *
+ * @author ltheussl
+ *
+ * @since 1.1.5
+ */
+public abstract class AbstractXmlValidator
+        extends PlexusTestCase
+{
+    protected static final String EOL = System.getProperty( "line.separator" );
+
+    /** XMLReader to validate xml file */
+    private XMLReader xmlReader;
+
+    /**
+     * Filter fail message.
+     *
+     * @param message not null
+     * @return <code>true</code> if the given message will fail the test.
+     * @since 1.1.1
+     */
+    protected boolean isFailErrorMessage( String message )
+    {
+        if ( message.indexOf( "schema_reference.4: Failed to read schema document 'http://www.w3.org/2001/xml.xsd'"
) == -1
+            && message.indexOf( "cvc-complex-type.4: Attribute 'alt' must appear
on element 'img'." ) == -1
+            && message.indexOf( "cvc-complex-type.2.4.a: Invalid content starting
with element" ) == -1
+            && message.indexOf( "cvc-complex-type.2.4.a: Invalid content was found
starting with element" ) == -1
+            && message.indexOf( "cvc-datatype-valid.1.2.1:" ) == -1 // Doxia allow
space
+            && message.indexOf( "cvc-attribute.3:" ) == -1 ) // Doxia allow space
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    protected void tearDown()
+            throws Exception
+    {
+        super.tearDown();
+
+        xmlReader = null;
+    }
+
+    /**
+     * Validate the test documents returned by {@link #getTestDocuments()} with DTD or XSD
using xerces.
+     *
+     * @throws Exception if any
+     *
+     * @see #addNamespaces(String)
+     * @see #getTestDocuments()
+     */
+    public void testValidateFiles()
+        throws Exception
+    {
+        for ( Iterator it = getTestDocuments().entrySet().iterator(); it.hasNext(); )
+        {
+            Map.Entry entry = (Map.Entry) it.next();
+
+            if ( getContainer().getLogger().isDebugEnabled() )
+            {
+                getContainer().getLogger().debug( "Validate '" + entry.getKey() + "'" );
+            }
+
+            List errors = parseXML( entry.getValue().toString() );
+
+            for ( Iterator it2 = errors.iterator(); it2.hasNext(); )
+            {
+                ErrorMessage error = (ErrorMessage) it2.next();
+
+                if ( isFailErrorMessage( error.getMessage() ) )
+                {
+                    fail( entry.getKey() + EOL + error.toString() );
+                }
+                else
+                {
+                    if ( getContainer().getLogger().isDebugEnabled() )
+                    {
+                        getContainer().getLogger().debug( entry.getKey() + EOL + error.toString()
);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * @param content xml content not null
+     * @return xml content with the wanted Doxia namespace
+     */
+    protected abstract String addNamespaces( String content );
+
+    /**
+     * @return a Map &lt; filePath, fileContent &gt; of files to validate.
+     * @throws IOException if any
+     * @see #getIncludes()
+     * @see #getAllTestDocuments()
+     */
+    protected abstract Map getTestDocuments()
+            throws IOException;
+
+
+    // ----------------------------------------------------------------------
+    // Private methods
+    // ----------------------------------------------------------------------
+
+    private XMLReader getXMLReader()
+    {
+        if ( xmlReader == null )
+        {
+            try
+            {
+                xmlReader = XMLReaderFactory.createXMLReader( "org.apache.xerces.parsers.SAXParser"
);
+                xmlReader.setFeature( "http://xml.org/sax/features/validation", true );
+                xmlReader.setFeature( "http://apache.org/xml/features/validation/schema",
true );
+                xmlReader.setErrorHandler( new MessagesErrorHandler() );
+                xmlReader.setEntityResolver( new AbstractXmlParser.CachedFileEntityResolver()
);
+            }
+            catch ( SAXNotRecognizedException e )
+            {
+                throw new AssertionFailedError( "SAXNotRecognizedException: " + e.getMessage()
);
+            }
+            catch ( SAXNotSupportedException e )
+            {
+                throw new AssertionFailedError( "SAXNotSupportedException: " + e.getMessage()
);
+            }
+            catch ( SAXException e )
+            {
+                throw new AssertionFailedError( "SAXException: " + e.getMessage() );
+            }
+        }
+
+        ( (MessagesErrorHandler) xmlReader.getErrorHandler() ).clearMessages();
+
+        return xmlReader;
+    }
+
+    /**
+     * @param content
+     * @return a list of ErrorMessage
+     * @throws IOException is any
+     * @throws SAXException if any
+     */
+    private List parseXML( String content )
+        throws IOException, SAXException
+    {
+        String xmlContent = addNamespaces( content );
+
+        MessagesErrorHandler errorHandler = (MessagesErrorHandler) getXMLReader().getErrorHandler();
+
+        getXMLReader().parse( new InputSource( new StringReader( xmlContent ) ) );
+
+        return errorHandler.getMessages();
+    }
+
+    private static class ErrorMessage
+        extends DefaultHandler
+    {
+        private final String level;
+        private final String publicID;
+        private final String systemID;
+        private final int lineNumber;
+        private final int columnNumber;
+        private final String message;
+
+        ErrorMessage( String level, String publicID, String systemID, int lineNumber, int
columnNumber,
+                             String message )
+        {
+            super();
+            this.level = level;
+            this.publicID = publicID;
+            this.systemID = systemID;
+            this.lineNumber = lineNumber;
+            this.columnNumber = columnNumber;
+            this.message = message;
+        }
+
+        /**
+         * @return the level
+         */
+        protected String getLevel()
+        {
+            return level;
+        }
+
+        /**
+         * @return the publicID
+         */
+        protected String getPublicID()
+        {
+            return publicID;
+        }
+        /**
+         * @return the systemID
+         */
+        protected String getSystemID()
+        {
+            return systemID;
+        }
+        /**
+         * @return the lineNumber
+         */
+        protected int getLineNumber()
+        {
+            return lineNumber;
+        }
+        /**
+         * @return the columnNumber
+         */
+        protected int getColumnNumber()
+        {
+            return columnNumber;
+        }
+        /**
+         * @return the message
+         */
+        protected String getMessage()
+        {
+            return message;
+        }
+
+        /** {@inheritDoc} */
+        public String toString()
+        {
+            StringBuffer sb = new StringBuffer( 512 );
+
+            sb.append( level ).append( EOL );
+            sb.append( "  Public ID: " ).append( publicID ).append( EOL );
+            sb.append( "  System ID: " ).append( systemID ).append( EOL );
+            sb.append( "  Line number: " ).append( lineNumber ).append( EOL );
+            sb.append( "  Column number: " ).append( columnNumber ).append( EOL );
+            sb.append( "  Message: " ).append( message ).append( EOL );
+
+            return sb.toString();
+        }
+
+        /** {@inheritDoc} */
+        public int hashCode()
+        {
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + columnNumber;
+            result = prime * result + ( ( level == null ) ? 0 : level.hashCode() );
+            result = prime * result + lineNumber;
+            result = prime * result + ( ( message == null ) ? 0 : message.hashCode() );
+            result = prime * result + ( ( publicID == null ) ? 0 : publicID.hashCode() );
+            result = prime * result + ( ( systemID == null ) ? 0 : systemID.hashCode() );
+            return result;
+        }
+
+        /** {@inheritDoc} */
+        public boolean equals( Object obj )
+        {
+            if ( this == obj )
+            {
+                return true;
+            }
+            if ( obj == null )
+            {
+                return false;
+            }
+            if ( getClass() != obj.getClass() )
+            {
+                return false;
+            }
+            ErrorMessage other = (ErrorMessage) obj;
+            if ( columnNumber != other.getColumnNumber() )
+            {
+                return false;
+            }
+            if ( level == null )
+            {
+                if ( other.getLevel() != null )
+                {
+                    return false;
+                }
+            }
+            else if ( !level.equals( other.getLevel() ) )
+            {
+                return false;
+            }
+            if ( lineNumber != other.getLineNumber() )
+            {
+                return false;
+            }
+            if ( message == null )
+            {
+                if ( other.getMessage() != null )
+                {
+                    return false;
+                }
+            }
+            else if ( !message.equals( other.getMessage() ) )
+            {
+                return false;
+            }
+            if ( publicID == null )
+            {
+                if ( other.getPublicID() != null )
+                {
+                    return false;
+                }
+            }
+            else if ( !publicID.equals( other.getPublicID() ) )
+            {
+                return false;
+            }
+            if ( systemID == null )
+            {
+                if ( other.getSystemID() != null )
+                {
+                    return false;
+                }
+            }
+            else if ( !systemID.equals( other.getSystemID() ) )
+            {
+                return false;
+            }
+            return true;
+        }
+    }
+
+    private static class MessagesErrorHandler
+        extends DefaultHandler
+    {
+        private final List messages;
+
+        MessagesErrorHandler()
+        {
+            messages = new ArrayList( 8 );
+        }
+
+        /** {@inheritDoc} */
+        public void warning( SAXParseException e )
+            throws SAXException
+        {
+            addMessage( "Warning", e );
+        }
+
+        /** {@inheritDoc} */
+        public void error( SAXParseException e )
+            throws SAXException
+        {
+            addMessage( "Error", e );
+        }
+
+        /** {@inheritDoc} */
+        public void fatalError( SAXParseException e )
+            throws SAXException
+        {
+            addMessage( "Fatal error", e );
+        }
+
+        private void addMessage( String pre, SAXParseException e )
+        {
+            ErrorMessage error =
+                new ErrorMessage( pre, e.getPublicId(), e.getSystemId(), e.getLineNumber(),
e.getColumnNumber(),
+                                  e.getMessage() );
+
+            messages.add( error );
+        }
+
+        protected List getMessages()
+        {
+            return Collections.unmodifiableList( messages );
+        }
+
+        protected void clearMessages()
+        {
+            messages.clear();
+        }
+    }
+}

Modified: maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java?rev=1061696&r1=1061695&r2=1061696&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java
(original)
+++ maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/xsd/AbstractXmlValidatorTest.java
Fri Jan 21 09:06:14 2011
@@ -23,10 +23,8 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
-import java.io.StringReader;
 import java.net.JarURLConnection;
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.Hashtable;
@@ -37,23 +35,11 @@ import java.util.Map;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
-import junit.framework.AssertionFailedError;
-
-import org.apache.maven.doxia.parser.AbstractXmlParser;
-import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.SelectorUtils;
 import org.codehaus.plexus.util.xml.XmlUtil;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.DefaultHandler;
-import org.xml.sax.helpers.XMLReaderFactory;
 
 /**
  * Abstract class to validate XML files with DTD or XSD mainly for Doxia namespaces.
@@ -63,10 +49,8 @@ import org.xml.sax.helpers.XMLReaderFact
  * @since 1.0
  */
 public abstract class AbstractXmlValidatorTest
-    extends PlexusTestCase
+    extends AbstractXmlValidator
 {
-    /** The vm line separator */
-    protected static final String EOL = System.getProperty( "line.separator" );
 
     /** Simple cache mechanism to load test documents. */
     private static final Map CACHE_DOXIA_TEST_DOCUMENTS = new Hashtable();
@@ -74,65 +58,6 @@ public abstract class AbstractXmlValidat
     /** Maven resource in the doxia-test-docs-XXX.jar */
     private static final String MAVEN_RESOURCE_PATH = "META-INF/maven/org.apache.maven.doxia/doxia-test-docs/";
 
-    /** XMLReader to validate xml file */
-    private XMLReader xmlReader;
-
-    /** {@inheritDoc} */
-    protected void setUp()
-        throws Exception
-    {
-        super.setUp();
-    }
-
-    /** {@inheritDoc} */
-    protected void tearDown()
-        throws Exception
-    {
-        super.tearDown();
-
-        xmlReader = null;
-    }
-
-    /**
-     * Validate tests documents with DTD or XSD using xerces.
-     *
-     * @throws Exception if any
-     * @see #addNamespaces(String)
-     * @see #getTestDocuments()
-     */
-    public void testValidateFiles()
-        throws Exception
-    {
-        for ( Iterator it = getTestDocuments().entrySet().iterator(); it.hasNext(); )
-        {
-            Map.Entry entry = (Map.Entry) it.next();
-
-            if ( getContainer().getLogger().isDebugEnabled() )
-            {
-                getContainer().getLogger().debug( "Validate '" + entry.getKey() + "'" );
-            }
-
-            List errors = parseXML( entry.getValue().toString() );
-
-            for ( Iterator it2 = errors.iterator(); it2.hasNext(); )
-            {
-                ErrorMessage error = (ErrorMessage) it2.next();
-
-                if ( isFailErrorMessage( error.getMessage() ) )
-                {
-                    fail( entry.getKey() + EOL + error.toString() );
-                }
-                else
-                {
-                    if ( getContainer().getLogger().isDebugEnabled() )
-                    {
-                        getContainer().getLogger().debug( entry.getKey() + EOL + error.toString()
);
-                    }
-                }
-            }
-        }
-    }
-
     // ----------------------------------------------------------------------
     // Protected methods
     // ----------------------------------------------------------------------
@@ -144,12 +69,6 @@ public abstract class AbstractXmlValidat
     protected abstract String[] getIncludes();
 
     /**
-     * @param content xml content not null
-     * @return xml content with the wanted Doxia namespace
-     */
-    protected abstract String addNamespaces( String content );
-
-    /**
      * @return a map of test resources filtered by patterns from {@link #getIncludes()}.
      * @throws IOException if any
      * @see #getIncludes()
@@ -198,7 +117,7 @@ public abstract class AbstractXmlValidat
     {
         if ( CACHE_DOXIA_TEST_DOCUMENTS != null && !CACHE_DOXIA_TEST_DOCUMENTS.isEmpty()
)
         {
-            return CACHE_DOXIA_TEST_DOCUMENTS;
+            return Collections.unmodifiableMap( CACHE_DOXIA_TEST_DOCUMENTS );
         }
 
         URL testJar = AbstractXmlValidatorTest.class.getClassLoader().getResource( MAVEN_RESOURCE_PATH
);
@@ -274,274 +193,6 @@ public abstract class AbstractXmlValidat
             }
         }
 
-        return CACHE_DOXIA_TEST_DOCUMENTS;
-    }
-
-    /**
-     * Filter fail message.
-     *
-     * @param message not null
-     * @return <code>true</code> if the given message will fail the test.
-     * @since 1.1.1
-     */
-    protected boolean isFailErrorMessage( String message )
-    {
-        if ( message
-                    .indexOf( "schema_reference.4: Failed to read schema document 'http://www.w3.org/2001/xml.xsd'"
) == -1
-            && message.indexOf( "cvc-complex-type.4: Attribute 'alt' must appear
on element 'img'." ) == -1
-            && message.indexOf( "cvc-complex-type.2.4.a: Invalid content starting
with element" ) == -1
-            && message.indexOf( "cvc-complex-type.2.4.a: Invalid content was found
starting with element" ) == -1
-            && message.indexOf( "cvc-datatype-valid.1.2.1:" ) == -1 // Doxia allow
space
-            && message.indexOf( "cvc-attribute.3:" ) == -1 ) // Doxia allow space
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    // ----------------------------------------------------------------------
-    // Private methods
-    // ----------------------------------------------------------------------
-
-    private XMLReader getXMLReader()
-    {
-        if ( xmlReader == null )
-        {
-            try
-            {
-                xmlReader = XMLReaderFactory.createXMLReader( "org.apache.xerces.parsers.SAXParser"
);
-                xmlReader.setFeature( "http://xml.org/sax/features/validation", true );
-                xmlReader.setFeature( "http://apache.org/xml/features/validation/schema",
true );
-                xmlReader.setErrorHandler( new MessagesErrorHandler() );
-                xmlReader.setEntityResolver( new AbstractXmlParser.CachedFileEntityResolver()
);
-            }
-            catch ( SAXNotRecognizedException e )
-            {
-                throw new AssertionFailedError( "SAXNotRecognizedException: " + e.getMessage()
);
-            }
-            catch ( SAXNotSupportedException e )
-            {
-                throw new AssertionFailedError( "SAXNotSupportedException: " + e.getMessage()
);
-            }
-            catch ( SAXException e )
-            {
-                throw new AssertionFailedError( "SAXException: " + e.getMessage() );
-            }
-        }
-
-        ( (MessagesErrorHandler) xmlReader.getErrorHandler() ).clearMessages();
-
-        return xmlReader;
-    }
-
-    /**
-     * @param xmlContent
-     * @return a list of ErrorMessage
-     * @throws IOException is any
-     * @throws SAXException if any
-     */
-    private List parseXML( String xmlContent )
-        throws IOException, SAXException
-    {
-        xmlContent = addNamespaces( xmlContent );
-
-        MessagesErrorHandler errorHandler = (MessagesErrorHandler) getXMLReader().getErrorHandler();
-
-        getXMLReader().parse( new InputSource( new StringReader( xmlContent ) ) );
-
-        return errorHandler.getMessages();
-    }
-
-    private static class ErrorMessage
-        extends DefaultHandler
-    {
-        private final String level;
-        private final String publicID;
-        private final String systemID;
-        private final int lineNumber;
-        private final int columnNumber;
-        private final String message;
-
-        public ErrorMessage( String level, String publicID, String systemID, int lineNumber,
int columnNumber,
-                             String message )
-        {
-            super();
-            this.level = level;
-            this.publicID = publicID;
-            this.systemID = systemID;
-            this.lineNumber = lineNumber;
-            this.columnNumber = columnNumber;
-            this.message = message;
-        }
-
-        /**
-         * @return the level
-         */
-        protected String getLevel()
-        {
-            return level;
-        }
-
-        /**
-         * @return the publicID
-         */
-        protected String getPublicID()
-        {
-            return publicID;
-        }
-        /**
-         * @return the systemID
-         */
-        protected String getSystemID()
-        {
-            return systemID;
-        }
-        /**
-         * @return the lineNumber
-         */
-        protected int getLineNumber()
-        {
-            return lineNumber;
-        }
-        /**
-         * @return the columnNumber
-         */
-        protected int getColumnNumber()
-        {
-            return columnNumber;
-        }
-        /**
-         * @return the message
-         */
-        protected String getMessage()
-        {
-            return message;
-        }
-
-        /** {@inheritDoc} */
-        public String toString()
-        {
-            StringBuffer sb = new StringBuffer();
-
-            sb.append( level ).append( EOL );
-            sb.append( "  Public ID: " ).append( publicID ).append( EOL );
-            sb.append( "  System ID: " ).append( systemID ).append( EOL );
-            sb.append( "  Line number: " ).append( lineNumber ).append( EOL );
-            sb.append( "  Column number: " ).append( columnNumber ).append( EOL );
-            sb.append( "  Message: " ).append( message ).append( EOL );
-
-            return sb.toString();
-        }
-
-        /** {@inheritDoc} */
-        public int hashCode()
-        {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + columnNumber;
-            result = prime * result + ( ( level == null ) ? 0 : level.hashCode() );
-            result = prime * result + lineNumber;
-            result = prime * result + ( ( message == null ) ? 0 : message.hashCode() );
-            result = prime * result + ( ( publicID == null ) ? 0 : publicID.hashCode() );
-            result = prime * result + ( ( systemID == null ) ? 0 : systemID.hashCode() );
-            return result;
-        }
-
-        /** {@inheritDoc} */
-        public boolean equals( Object obj )
-        {
-            if ( this == obj )
-                return true;
-            if ( obj == null )
-                return false;
-            if ( getClass() != obj.getClass() )
-                return false;
-            ErrorMessage other = (ErrorMessage) obj;
-            if ( columnNumber != other.columnNumber )
-                return false;
-            if ( level == null )
-            {
-                if ( other.level != null )
-                    return false;
-            }
-            else if ( !level.equals( other.level ) )
-                return false;
-            if ( lineNumber != other.lineNumber )
-                return false;
-            if ( message == null )
-            {
-                if ( other.message != null )
-                    return false;
-            }
-            else if ( !message.equals( other.message ) )
-                return false;
-            if ( publicID == null )
-            {
-                if ( other.publicID != null )
-                    return false;
-            }
-            else if ( !publicID.equals( other.publicID ) )
-                return false;
-            if ( systemID == null )
-            {
-                if ( other.systemID != null )
-                    return false;
-            }
-            else if ( !systemID.equals( other.systemID ) )
-                return false;
-            return true;
-        }
-    }
-
-    private static class MessagesErrorHandler
-        extends DefaultHandler
-    {
-        private final List messages;
-
-        public MessagesErrorHandler()
-        {
-            messages = new ArrayList();
-        }
-
-        /** {@inheritDoc} */
-        public void warning( SAXParseException e )
-            throws SAXException
-        {
-            addMessage( "Warning", e );
-        }
-
-        /** {@inheritDoc} */
-        public void error( SAXParseException e )
-            throws SAXException
-        {
-            addMessage( "Error", e );
-        }
-
-        /** {@inheritDoc} */
-        public void fatalError( SAXParseException e )
-            throws SAXException
-        {
-            addMessage( "Fatal error", e );
-        }
-
-        private void addMessage( String pre, SAXParseException e )
-        {
-            ErrorMessage error =
-                new ErrorMessage( pre, e.getPublicId(), e.getSystemId(), e.getLineNumber(),
e.getColumnNumber(),
-                                  e.getMessage() );
-
-            messages.add( error );
-        }
-
-        protected List getMessages()
-        {
-            return messages;
-        }
-
-        protected void clearMessages()
-        {
-            messages.clear();
-        }
+        return Collections.unmodifiableMap( CACHE_DOXIA_TEST_DOCUMENTS );
     }
 }



Mime
View raw message