diff --git a/j2ee/src/test/org/apache/maven/j2ee/J2EEEntityResolverTest.java b/j2ee/src/test/org/apache/maven/j2ee/J2EEEntityResolverTest.java
new file mode 100644
index 00000000..7eb929d6
--- /dev/null
+++ b/j2ee/src/test/org/apache/maven/j2ee/J2EEEntityResolverTest.java
@@ -0,0 +1,118 @@
+package org.apache.maven.j2ee;
+
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *    if any, must include the following acknowledgment:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself,
+ *    if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ *    "Apache Maven" must not be used to endorse or promote products
+ *    derived from this software without prior written permission. For
+ *    written permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ *    "Apache Maven", nor may "Apache" appear in their name, without
+ *    prior written permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+import org.xml.sax.InputSource;
+
+import junit.framework.TestCase;
+
+/**
+ * Test cases for the {@link J2EEEntityResolver}
+ *
+ * @author <a href="mailto:dion@multitask.com.au">dIon Gillard</a>
+ * @version $Id: J2EEEntityResolverTest.java,v 1.1 2003/03/31 03:01:44 dion Exp $
+ */
+public class J2EEEntityResolverTest extends TestCase
+{
+    
+    /** instance for unit testing */
+    private J2EEEntityResolver instance;
+    /** 
+     * Creates a new instance of J2EEEntityResolverTest
+     * @param testName the name of the test
+     */
+    public J2EEEntityResolverTest(String testName)
+    {
+        super(testName);
+    }
+
+    /**
+     * Initialize per test data
+     * @throws Exception when there is an unexpected problem
+     */
+    public void setUp() throws Exception
+    {
+        instance = new J2EEEntityResolver();
+    }
+    
+    /**
+     * Test that all public ids are available and being found 
+     */
+    public void testAllAvailable()
+    {
+        assertNotNull("id to resource map not available", instance.getIdToResource());
+        int numDTDs = J2EEEntityResolver.J2EE_DTDS.length;
+        assertEquals("wrong number of entries", numDTDs, instance.getIdToResource().size());
+        for (int i = 0; i < numDTDs; i++)
+        {
+            assertNotNull("Can't find resource for publicId", 
+                instance.getIdToResource().get(J2EEEntityResolver.J2EE_DTDS[i]));        
+        }
+    }
+    
+    /**
+     * Test that the resolver is getting resources locally 
+     */
+    public void testResolvingLocally() throws Exception
+    {
+        int numDTDs = J2EEEntityResolver.J2EE_DTDS.length;
+        for (int i = 0; i < numDTDs; i++)
+        {
+            String publicId = J2EEEntityResolver.J2EE_DTDS[i];
+            assertNotNull("Can't find resource for publicId " + publicId, 
+                instance.resolveEntity(publicId, null));   
+        }
+    }
+}
\ No newline at end of file