db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mad...@apache.org
Subject svn commit: r1180967 [1/2] - in /db/jdo/trunk/api/test: java/javax/jdo/ java/javax/jdo/stub/ java/javax/jdo/util/ schema/jdoconfig/Negative09/9b/META-INF/services/ schema/jdoconfig/Pmfmapmap01/META-INF/ schema/jdoconfig/Pmfmapmap02/
Date Mon, 10 Oct 2011 13:51:01 GMT
Author: madams
Date: Mon Oct 10 13:51:00 2011
New Revision: 1180967

URL: http://svn.apache.org/viewvc?rev=1180967&view=rev
Log:
Forgot a bunch of files when isolating changes for JDO-688.

Added:
    db/jdo/trunk/api/test/java/javax/jdo/AbstractJDOConfigTest.java   (with props)
    db/jdo/trunk/api/test/java/javax/jdo/stub/
    db/jdo/trunk/api/test/java/javax/jdo/stub/StubPMF.java   (with props)
Removed:
    db/jdo/trunk/api/test/java/javax/jdo/ClasspathHelper.java
Modified:
    db/jdo/trunk/api/test/java/javax/jdo/EnhancerTest.java
    db/jdo/trunk/api/test/java/javax/jdo/JDOConfigTestClassLoader.java
    db/jdo/trunk/api/test/java/javax/jdo/JDOHelperConfigTest.java
    db/jdo/trunk/api/test/java/javax/jdo/JDOHelperTest.java
    db/jdo/trunk/api/test/java/javax/jdo/PMFMapMapTest.java
    db/jdo/trunk/api/test/java/javax/jdo/util/AbstractTest.java
    db/jdo/trunk/api/test/schema/jdoconfig/Negative09/9b/META-INF/services/javax.jdo.PersistenceManagerFactory
    db/jdo/trunk/api/test/schema/jdoconfig/Pmfmapmap01/META-INF/jdoconfig.xml
    db/jdo/trunk/api/test/schema/jdoconfig/Pmfmapmap02/propsfile.props

Added: db/jdo/trunk/api/test/java/javax/jdo/AbstractJDOConfigTest.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/test/java/javax/jdo/AbstractJDOConfigTest.java?rev=1180967&view=auto
==============================================================================
--- db/jdo/trunk/api/test/java/javax/jdo/AbstractJDOConfigTest.java (added)
+++ db/jdo/trunk/api/test/java/javax/jdo/AbstractJDOConfigTest.java Mon Oct 10 13:51:00 2011
@@ -0,0 +1,126 @@
+package javax.jdo;
+
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Random;
+
+import javax.jdo.util.AbstractTest;
+
+public abstract class AbstractJDOConfigTest extends AbstractTest {
+
+    /**
+     * A class path prefix used in the various tests where the class path
+     * needs to be set.
+     */
+    protected static String JDOCONFIG_CLASSPATH_PREFIX
+            = initJDOConfigClasspathPrefix();
+
+    /**
+     * Returns the JDO configuration class path prefix's default value, which is
+     * the project base directory suffixed by the path to the configuration
+     * directory (<tt>test/schema/jdoconfig</tt>).
+     * 
+     * @return the default class path prefix used by this test suite.
+     * 
+     */
+    protected static String initJDOConfigClasspathPrefix() {
+        return initBasedir() + "test/schema/jdoconfig";
+    }
+
+    /**
+     * The class path used to specify the location of test class files.
+     * @return the class path where test class files can be found.
+     */
+    protected static String TEST_CLASSPATH =
+            initTestClasspath();
+
+    /**
+     * Returns the default class path for JDO test class files 
+     * (<tt>target/test-classes/</tt>).
+     * @return the default class path for JDO test class files.
+     */
+    protected static String initTestClasspath() {
+        return initBasedir() + "target/test-classes/";
+    }
+
+    /**
+     * The class path used to locate the JDO API class files.
+     */
+    protected static String API_CLASSPATH =
+            initAPIClasspath();
+
+    /**
+     * Returns the default class path for JDO API class files
+     * (<tt>target/classes/</tt>).
+     * @return the default class path for JDO API class files.
+     */
+    protected static String initAPIClasspath() {
+        return initBasedir() + "target/classes/";
+    }
+
+    /**
+     * Returns the base directory for this project.  This base directory
+     * is used to build up the other class paths defined in this test suite.
+     * The value returned is the value returned by 
+     * <code>System.getProperty("basedir")</code>.
+     * A trailing slash is appended to the path if it doesn't exist.
+     * 
+     * @return the default base directory of the project.
+     */
+    protected static String initBasedir() {
+        String basedir = System.getProperty("basedir");
+        if (basedir != null) {
+            if (!basedir.endsWith("/")) {
+                basedir += "/";
+            }
+        } else {
+            basedir = "";
+        }
+        return basedir;
+    }
+    
+    /**
+     * A randomizer seeded with the system clock's current time.
+     */
+    protected static Random RANDOM = new Random(System.currentTimeMillis());
+
+    /**
+     * Fails the test if the number of properties in the two specified
+     * {@link java.util.Map Map} objects are not identical or their values
+     * do not match.
+     * @param expected the first {@link java.util.Map Map} object to test.
+     * @param actual the second {@link java.util.Map Map} object to test.
+     */
+    static void assertEqualProperties(Map expected, Map actual) {
+        Iterator i = expected.entrySet().iterator();
+        while (i.hasNext()) {
+            Map.Entry entry = (Map.Entry) i.next();
+            String key = (String) entry.getKey();
+            String expectedValue = (String) entry.getValue();
+            String actualValue = (String) actual.get(key);
+
+            assertEquals(
+                    "Actual property at key [" + key + "] with value [" +
+                            actualValue + "] not equal to expected value [" +
+                            expectedValue + "]",
+                    expectedValue,
+                    actualValue);
+        }
+    }
+    
+    protected String getPMFClassNameViaServiceLookup(ClassLoader loader) {
+        try {
+            Enumeration urls = JDOHelper.getResources(loader, 
+                SERVICE_LOOKUP_PMF_RESOURCE_NAME);
+            while (urls.hasMoreElements()) {
+                // return the first one found
+                return JDOHelper.getClassNameFromURL((URL)urls.nextElement());
+            }
+        } catch (Exception ex) {
+            // ignore exceptions from i/o errors
+        }
+        return null;            
+    }
+}

Propchange: db/jdo/trunk/api/test/java/javax/jdo/AbstractJDOConfigTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: db/jdo/trunk/api/test/java/javax/jdo/EnhancerTest.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/test/java/javax/jdo/EnhancerTest.java?rev=1180967&r1=1180966&r2=1180967&view=diff
==============================================================================
--- db/jdo/trunk/api/test/java/javax/jdo/EnhancerTest.java (original)
+++ db/jdo/trunk/api/test/java/javax/jdo/EnhancerTest.java Mon Oct 10 13:51:00 2011
@@ -27,10 +27,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
-import static javax.jdo.Constants.ENHANCER_USAGE_ERROR;
-import static javax.jdo.Constants.PROPERTY_ENHANCER_VENDOR_NAME;
-import static javax.jdo.Constants.PROPERTY_ENHANCER_VERSION_NUMBER;
-
 import javax.jdo.util.AbstractTest;
 import javax.jdo.util.BatchTestRunner;
 

Modified: db/jdo/trunk/api/test/java/javax/jdo/JDOConfigTestClassLoader.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/test/java/javax/jdo/JDOConfigTestClassLoader.java?rev=1180967&r1=1180966&r2=1180967&view=diff
==============================================================================
--- db/jdo/trunk/api/test/java/javax/jdo/JDOConfigTestClassLoader.java (original)
+++ db/jdo/trunk/api/test/java/javax/jdo/JDOConfigTestClassLoader.java Mon Oct 10 13:51:00 2011
@@ -1,100 +1,43 @@
 package javax.jdo;
 
-import org.apache.tools.ant.AntClassLoader;
-
+import java.io.File;
+import java.io.IOException;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.net.MalformedURLException;
-import java.io.File;
-import java.util.StringTokenizer;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Iterator;
 
 /**
- * A class loader used to ensure that classpath URLs added in JUnit tests
- * aren't included in subsequent JUnit tests.
+ * A class loader that allows the user to add classpath entries.
  */
 public class JDOConfigTestClassLoader extends URLClassLoader {
 
-    public JDOConfigTestClassLoader(
-            String partialPathToIgnore,
-            ClassLoader unparent
-    ) {
-        this(new String[]{partialPathToIgnore}, unparent);
+    /**
+     * Uses the CTCCL as the parent and adds the given path to this loader's classpath.
+     */
+    public JDOConfigTestClassLoader(String... additionalPath) throws IOException {
+	this(Thread.currentThread().getContextClassLoader(), additionalPath);
+    }
+    
+    /**
+     * Uses the given ClassLoader as the parent & adds the given paths to this loader's classpath.
+     */
+    public JDOConfigTestClassLoader(ClassLoader parent, String... additionalPaths) throws IOException {
+	super(new URL[] {}, parent);
+
+	for (String path : additionalPaths) {
+	    addFile(path);
+	}
     }
 
-    public JDOConfigTestClassLoader(
-            String[] partialPathsToIgnore,
-            ClassLoader unparent
-    ) {
-        super(new URL[]{}, null);
-        
-        if (unparent instanceof URLClassLoader) {
-            addNonTestURLs(
-                    partialPathsToIgnore == null
-                            ? new String[]{}
-                            : partialPathsToIgnore,
-                    (URLClassLoader) unparent);
-        }
-        else if (unparent instanceof AntClassLoader) {
-            addNonTestURLs(
-                    partialPathsToIgnore == null
-                            ? new String[]{}
-                            : partialPathsToIgnore,
-                    (AntClassLoader) unparent);
-        }
-        else {
-            throw new RuntimeException(
-                    "unknown ClassLoader type: "
-                            + unparent.getClass().getName());
-        }
+    public void addFile(String s) throws IOException {
+	addFile(new File(s));
     }
 
-    // HACK:  need to identify a better way of controlling test classpath
-    protected void addNonTestURLs(
-            String[] partialPathsToIgnore,
-            URLClassLoader unparent
-    ) {
-        URL[] urls = unparent.getURLs();
-        for (int i = 0; i < urls.length; i++) {
-            URL url = urls[i];
-            String urlString = url.toString();
-            for (int j = 0; j < partialPathsToIgnore.length; j++) {
-                if (urlString.indexOf(partialPathsToIgnore[j]) == -1) {
-                    addURL(url);
-                }
-            }
-        }
+    public void addFile(File f) throws IOException {
+	addURL(f.toURI().toURL());
     }
 
-    protected void addNonTestURLs(
-            String[] partialPathsToIgnore,
-            AntClassLoader unparent
-    ) {
-        List<String> elements = new ArrayList<String>();
-        String classpath = unparent.getClasspath();
-        StringTokenizer st = new StringTokenizer(classpath, File.pathSeparator);
-        while (st.hasMoreTokens()) {
-            String nextToken = st.nextToken();
-            if(!nextToken.endsWith(".jar")) {
-                nextToken = nextToken.concat(File.separator);
-            }
-            elements.add("file://" + nextToken);
-        }
-        Iterator<String> i = elements.iterator();
-        while (i.hasNext()) {
-            String element = i.next();
-            for (int j = 0; j < partialPathsToIgnore.length; j++) {
-                if (element.indexOf(partialPathsToIgnore[j]) == -1) {
-                    try {
-                        addURL(new URL(element));
-                    }
-                    catch (MalformedURLException e) {
-                        throw new RuntimeException(e);
-                    }
-                }
-            }
-        }
+    @Override
+    public void addURL(URL url) {
+	super.addURL(url);
     }
 }

Modified: db/jdo/trunk/api/test/java/javax/jdo/JDOHelperConfigTest.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/test/java/javax/jdo/JDOHelperConfigTest.java?rev=1180967&r1=1180966&r2=1180967&view=diff
==============================================================================
--- db/jdo/trunk/api/test/java/javax/jdo/JDOHelperConfigTest.java (original)
+++ db/jdo/trunk/api/test/java/javax/jdo/JDOHelperConfigTest.java Mon Oct 10 13:51:00 2011
@@ -17,754 +17,517 @@
 
 package javax.jdo;
 
-import junit.framework.TestSuite;
-
-import javax.jdo.util.AbstractTest;
-import javax.jdo.util.BatchTestRunner;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.Enumeration;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
-import java.util.Random;
+
+import javax.jdo.util.BatchTestRunner;
+
+import junit.framework.TestSuite;
 
 /**
  * 
  * Tests class javax.jdo.JDOHelper for META-INF/jdoconfig.xml compliance.
  * 
  */
-public class JDOHelperConfigTest extends AbstractTest implements Constants {
+public class JDOHelperConfigTest extends AbstractJDOConfigTest implements
+	Constants {
 
     public static void main(String args[]) {
-        BatchTestRunner.run(JDOHelperConfigTest.class);
+	BatchTestRunner.run(JDOHelperConfigTest.class);
     }
 
     /**
      * {@inheritDoc}
+     * 
      * @return {@inheritDoc}
      */
     public static TestSuite suite() {
-        return new TestSuite(JDOHelperConfigTest.class);
+	return new TestSuite(JDOHelperConfigTest.class);
     }
 
     /**
-     * A class path prefix used in the various tests where the class path
-     * needs to be set.
-     */
-    protected static String JDOCONFIG_CLASSPATH_PREFIX
-            = initJDOConfigClasspathPrefix();
-
-    /**
-     * Returns the JDO configuration class path prefix's default value, which is
-     * the project base directory suffixed by the path to the configuration
-     * directory (<tt>test/schema/jdoconfig</tt>).
+     * Builds up a {@link java.util.Map Map} object that contains key parameter
+     * values specific to a named test. All of the properties needed to run a
+     * particular test are loaded into this object.
      * 
-     * @return the default class path prefix used by this test suite.
+     * @param testVariant
+     *            the name of the test to include in the {@link java.util.Map
+     *            Map} values.
+     * @param listenerCount
+     *            the number of life cycle listener class names to add to this
+     *            map. The listener names will begin with the value stored in
+     *            {@link javax.jdo.Constants.PROPERTY_INSTANCE_LIFECYCLE_LISTENER
+     *            PROPERTY_INSTANCE_LIFECYCLE_LISTENER}.
+     * @param vendorSpecificPropertyCount
+     *            the number of properties named of the form
      * 
-     */
-    protected static String initJDOConfigClasspathPrefix() {
-        return initBasedir() + "test/schema/jdoconfig";
-    }
-
-    /**
-     * The class path used to specify the location of test class files.
-     * @return the class path where test class files can be found.
-     */
-    protected static String TEST_CLASSPATH =
-            initTestClasspath();
-
-    /**
-     * Returns the default class path for JDO test class files 
-     * (<tt>target/test-classes/</tt>).
-     * @return the default class path for JDO test class files.
-     */
-    protected static String initTestClasspath() {
-        return initBasedir() + "target/test-classes/";
-    }
-
-    /**
-     * The class path used to locate the JDO API class files.
-     */
-    protected static String API_CLASSPATH =
-            initAPIClasspath();
-
-    /**
-     * Returns the default class path for JDO API class files
-     * (<tt>target/classes/</tt>).
-     * @return the default class path for JDO API class files.
-     */
-    protected static String initAPIClasspath() {
-        return initBasedir() + "target/classes/";
-    }
-
-    /**
-     * Returns the base directory for this project.  This base directory
-     * is used to build up the other class paths defined in this test suite.
-     * The value returned is the value returned by 
-     * <code>System.getProperty("basedir")</code>.
-     * A trailing slash is appended to the path if it doesn't exist.
+     *            <pre>
+     * &quot;property.&quot; + testVariant + &quot;.name&quot;
+     * </pre>
      * 
-     * @return the default base directory of the project.
-     */
-    protected static String initBasedir() {
-        String basedir = System.getProperty("basedir");
-        if (basedir != null) {
-            if (!basedir.endsWith("/")) {
-                basedir += "/";
-            }
-        } else {
-            basedir = "";
-        }
-        return basedir;
-    }
-    
-    /**
-     * A radomizer seeded with the system clock's current time.
-     */
-    protected static Random RANDOM = new Random(System.currentTimeMillis());
-
-    /**
-     * Builds up a {@link java.util.Map Map} object that contains key 
-     * parameter values specific to a named test.  All of the properties
-     * needed to run a particular test are loaded into this object.
-     * @param testVariant the name of the test to include in the 
-     *        {@link java.util.Map Map} values.
-     * @param listenerCount the number of life cycle listener class names to 
-     *        add to this map.  The listener names will begin with the value
-     *        stored in {@link 
-     *        javax.jdo.Constants.PROPERTY_INSTANCE_LIFECYCLE_LISTENER
-     *        PROPERTY_INSTANCE_LIFECYCLE_LISTENER}.
-     * @param vendorSpecificPropertyCount  the number of properties named of
-     *        the form <pre>"property." + testVariant + ".name"</pre> that
-     *        are added to the map.
-     * @param excludeName if true the property specified by 
-     *        {@link javax.jdo.Constants.PROPERTY_NAME PROPERTY_NAME} is
-     *        not added to the map.
-     * @param excludePUName if true the property specified by 
-     *        {@link javax.jdo.Constants.PROPERTY_PERSISTENCE_UNIT_NAME
-     *        PROPERTY_PERSISTENCE_UNIT_NAME} is not added to the map.
+     *            that are added to the map.
+     * @param excludeName
+     *            if true the property specified by
+     *            {@link javax.jdo.Constants.PROPERTY_NAME PROPERTY_NAME} is not
+     *            added to the map.
+     * @param excludePUName
+     *            if true the property specified by
+     *            {@link javax.jdo.Constants.PROPERTY_PERSISTENCE_UNIT_NAME
+     *            PROPERTY_PERSISTENCE_UNIT_NAME} is not added to the map.
      * @return a new {@link java.util.Map Map} object populated with properties
      *         that can be used in this test suite.
      */
-    protected Map prepareInitialExpectedMap(
-            String testVariant,
-            int listenerCount,
-            int vendorSpecificPropertyCount,
-            boolean excludeName,
-            boolean excludePUName
-    ) {
-        Map<String,String> expected = new HashMap<String,String>();
-
-        if (!excludeName) {
-            expected.put(
-                    PROPERTY_NAME,
-                    PMF_ATTRIBUTE_NAME + "." + testVariant);
-        }
-        if (!excludePUName) {
-            expected.put(
-                    PROPERTY_PERSISTENCE_UNIT_NAME,
-                    PMF_ATTRIBUTE_PERSISTENCE_UNIT_NAME + "." + testVariant);
-        }
-
-        expected.put(PROPERTY_PERSISTENCE_MANAGER_FACTORY_CLASS,
-                PMF_ATTRIBUTE_CLASS + "." + testVariant);
-        expected.put(
-                PROPERTY_CONNECTION_DRIVER_NAME,
-                PMF_ATTRIBUTE_CONNECTION_DRIVER_NAME + "." + testVariant);
-        expected.put(
-                PROPERTY_CONNECTION_FACTORY_NAME,
-                PMF_ATTRIBUTE_CONNECTION_FACTORY_NAME + "." + testVariant);
-        expected.put(
-                PROPERTY_CONNECTION_FACTORY2_NAME,
-                PMF_ATTRIBUTE_CONNECTION_FACTORY2_NAME + "." + testVariant);
-        expected.put(
-                PROPERTY_CONNECTION_PASSWORD,
-                PMF_ATTRIBUTE_CONNECTION_PASSWORD + "." + testVariant);
-        expected.put(
-                PROPERTY_CONNECTION_URL,
-                PMF_ATTRIBUTE_CONNECTION_URL + "." + testVariant);
-        expected.put(
-                PROPERTY_CONNECTION_USER_NAME,
-                PMF_ATTRIBUTE_CONNECTION_USER_NAME + "." + testVariant);
-        expected.put(
-                PROPERTY_IGNORE_CACHE,
-                PMF_ATTRIBUTE_IGNORE_CACHE + "." + testVariant);
-        expected.put(
-                PROPERTY_MAPPING,
-                PMF_ATTRIBUTE_MAPPING + "." + testVariant);
-        expected.put(
-                PROPERTY_MULTITHREADED,
-                PMF_ATTRIBUTE_MULTITHREADED + "." + testVariant);
-        expected.put(
-                PROPERTY_NONTRANSACTIONAL_READ,
-                PMF_ATTRIBUTE_NONTRANSACTIONAL_READ + "." + testVariant);
-        expected.put(
-                PROPERTY_NONTRANSACTIONAL_WRITE,
-                PMF_ATTRIBUTE_NONTRANSACTIONAL_WRITE + "." + testVariant);
-        expected.put(
-                PROPERTY_OPTIMISTIC,
-                PMF_ATTRIBUTE_OPTIMISTIC + "." + testVariant);
-        expected.put(
-                PROPERTY_RESTORE_VALUES,
-                PMF_ATTRIBUTE_RESTORE_VALUES + "." + testVariant);
-        expected.put(
-                PROPERTY_RETAIN_VALUES,
-                PMF_ATTRIBUTE_RETAIN_VALUES + "." + testVariant);
-        expected.put(
-                PROPERTY_DETACH_ALL_ON_COMMIT,
-                PMF_ATTRIBUTE_DETACH_ALL_ON_COMMIT + "." + testVariant);
-        expected.put(
-                PROPERTY_SERVER_TIME_ZONE_ID,
-                PMF_ATTRIBUTE_SERVER_TIME_ZONE_ID + "." + testVariant);
-
-        // listeners
-        for (int i = 0; i < listenerCount; i++) {
-            expected.put(
-                    PROPERTY_PREFIX_INSTANCE_LIFECYCLE_LISTENER +
-                            "listener." + testVariant + ".listener" + i,
-                    "classes." + testVariant + ".classes" + i
-            );
-        }
-
-        // vendor-specific properties
-        for (int i = 0; i < vendorSpecificPropertyCount; i++) {
-            expected.put(
-                    "property." + testVariant + ".name" + i,
-                    "property." + testVariant + ".value" + i
-            );
-        }
-
-        return expected;
-    }
-
-    /**
-     * Fails the test if the number of properties in the two specified
-     * {@link java.util.Map Map} objects are not identical or their values
-     * do not match.
-     * @param expected the first {@link java.util.Map Map} object to test.
-     * @param actual the second {@link java.util.Map Map} object to test.
-     */
-    static void assertEqualProperties(Map expected, Map actual) {
-        Iterator i = expected.entrySet().iterator();
-        while (i.hasNext()) {
-            Map.Entry entry = (Map.Entry) i.next();
-            String key = (String) entry.getKey();
-            String expectedValue = (String) entry.getValue();
-            String actualValue = (String) actual.get(key);
-
-            assertEquals(
-                    "Actual property at key [" + key + "] with value [" +
-                            actualValue + "] not equal to expected value [" +
-                            expectedValue + "]",
-                    expectedValue,
-                    actualValue);
-        }
-    }
-
-    /**
-     * Performs a test specified by <tt>testVariantName</tt>, by building
-     * up a property map and executing the test according to the property 
-     * values.  With this version of <tt>doPositiveTest</tt> the property
-     * name ({@link javax.jdo.Constants.PROPERTY_NAME PROPERTY_NAME}) and 
-     * the {@link javax.jdo.Constants.PERSISTENCE_UNIT_NAME 
-     * PERSISTENCE_UNIT_NAME}) are included in the property map that is used
-     * to run the test.
+    protected Map prepareInitialExpectedMap(String testVariant,
+	    int listenerCount, int vendorSpecificPropertyCount,
+	    boolean excludeName, boolean excludePUName) {
+	Map<String, String> expected = new HashMap<String, String>();
+
+	if (!excludeName) {
+	    expected.put(PROPERTY_NAME, PMF_ATTRIBUTE_NAME + "." + testVariant);
+	}
+	if (!excludePUName) {
+	    expected.put(PROPERTY_PERSISTENCE_UNIT_NAME,
+		    PMF_ATTRIBUTE_PERSISTENCE_UNIT_NAME + "." + testVariant);
+	}
+
+	expected.put(PROPERTY_PERSISTENCE_MANAGER_FACTORY_CLASS,
+		PMF_ATTRIBUTE_CLASS + "." + testVariant);
+	expected.put(PROPERTY_CONNECTION_DRIVER_NAME,
+		PMF_ATTRIBUTE_CONNECTION_DRIVER_NAME + "." + testVariant);
+	expected.put(PROPERTY_CONNECTION_FACTORY_NAME,
+		PMF_ATTRIBUTE_CONNECTION_FACTORY_NAME + "." + testVariant);
+	expected.put(PROPERTY_CONNECTION_FACTORY2_NAME,
+		PMF_ATTRIBUTE_CONNECTION_FACTORY2_NAME + "." + testVariant);
+	expected.put(PROPERTY_CONNECTION_PASSWORD,
+		PMF_ATTRIBUTE_CONNECTION_PASSWORD + "." + testVariant);
+	expected.put(PROPERTY_CONNECTION_URL, PMF_ATTRIBUTE_CONNECTION_URL
+		+ "." + testVariant);
+	expected.put(PROPERTY_CONNECTION_USER_NAME,
+		PMF_ATTRIBUTE_CONNECTION_USER_NAME + "." + testVariant);
+	expected.put(PROPERTY_IGNORE_CACHE, PMF_ATTRIBUTE_IGNORE_CACHE + "."
+		+ testVariant);
+	expected.put(PROPERTY_MAPPING, PMF_ATTRIBUTE_MAPPING + "."
+		+ testVariant);
+	expected.put(PROPERTY_MULTITHREADED, PMF_ATTRIBUTE_MULTITHREADED + "."
+		+ testVariant);
+	expected.put(PROPERTY_NONTRANSACTIONAL_READ,
+		PMF_ATTRIBUTE_NONTRANSACTIONAL_READ + "." + testVariant);
+	expected.put(PROPERTY_NONTRANSACTIONAL_WRITE,
+		PMF_ATTRIBUTE_NONTRANSACTIONAL_WRITE + "." + testVariant);
+	expected.put(PROPERTY_OPTIMISTIC, PMF_ATTRIBUTE_OPTIMISTIC + "."
+		+ testVariant);
+	expected.put(PROPERTY_RESTORE_VALUES, PMF_ATTRIBUTE_RESTORE_VALUES
+		+ "." + testVariant);
+	expected.put(PROPERTY_RETAIN_VALUES, PMF_ATTRIBUTE_RETAIN_VALUES + "."
+		+ testVariant);
+	expected.put(PROPERTY_DETACH_ALL_ON_COMMIT,
+		PMF_ATTRIBUTE_DETACH_ALL_ON_COMMIT + "." + testVariant);
+	expected.put(PROPERTY_SERVER_TIME_ZONE_ID,
+		PMF_ATTRIBUTE_SERVER_TIME_ZONE_ID + "." + testVariant);
+
+	// listeners
+	for (int i = 0; i < listenerCount; i++) {
+	    expected.put(PROPERTY_PREFIX_INSTANCE_LIFECYCLE_LISTENER
+		    + "listener." + testVariant + ".listener" + i, "classes."
+		    + testVariant + ".classes" + i);
+	}
+
+	// vendor-specific properties
+	for (int i = 0; i < vendorSpecificPropertyCount; i++) {
+	    expected.put("property." + testVariant + ".name" + i, "property."
+		    + testVariant + ".value" + i);
+	}
+
+	return expected;
+    }
+
+    /**
+     * Performs a test specified by <tt>testVariantName</tt>, by building up a
+     * property map and executing the test according to the property values.
+     * With this version of <tt>doPositiveTest</tt> the property name (
+     * {@link javax.jdo.Constants.PROPERTY_NAME PROPERTY_NAME}) and the
+     * {@link javax.jdo.Constants.PERSISTENCE_UNIT_NAME PERSISTENCE_UNIT_NAME})
+     * are included in the property map that is used to run the test.
      * 
-     * @param classpaths class paths to add to the class loader that runs the 
-     *        test that specify where <tt>jdoconfig.xml</tt> can be found.
-     * @param testVariantName the name of the test.
-     * @param listenerCount number of listeners utilized in the test.
-     * @param vendorSpecificPropertyCount number of vendor properties used
-     *        in the test.
-     * @param checkEqualProperties if true the test's properties are tested.
-     * @throws java.io.IOException if an {@java.io.IOException IOException}
-     *         occurs during class loading or any part of the test.
-     */
-    protected void doPositiveTest(
-            String[] classpaths,
-            String testVariantName,
-            int listenerCount,
-            int vendorSpecificPropertyCount,
-            boolean checkEqualProperties)
-            throws IOException {
-
-        doPositiveTest(
-                classpaths,
-                testVariantName,
-                listenerCount,
-                vendorSpecificPropertyCount,
-                checkEqualProperties,
-                false,
-                false);
+     * @param classpaths
+     *            class paths to add to the class loader that runs the test that
+     *            specify where <tt>jdoconfig.xml</tt> can be found.
+     * @param testVariantName
+     *            the name of the test.
+     * @param listenerCount
+     *            number of listeners utilized in the test.
+     * @param vendorSpecificPropertyCount
+     *            number of vendor properties used in the test.
+     * @param checkEqualProperties
+     *            if true the test's properties are tested.
+     * @throws java.io.IOException
+     *             if an {@java.io.IOException
+     *             IOException} occurs during class loading or any part of the
+     *             test.
+     */
+    protected void doPositiveTest(String[] classpaths, String testVariantName,
+	    int listenerCount, int vendorSpecificPropertyCount,
+	    boolean checkEqualProperties) throws IOException {
+
+	doPositiveTest(classpaths, testVariantName, listenerCount,
+		vendorSpecificPropertyCount, checkEqualProperties, false, false);
     }
 
     /**
-     * Performs a test specified by <tt>testVariantName</tt>, by building
-     * up a property map and executing the test according to the property 
-     * values.  An assertion exeception is thrown if the test being run 
-     * has a negative (non-true) result. With this version of 
-     * <tt>doPositiveTest</tt> the property
-     * name ({@link javax.jdo.Constants.PROPERTY_NAME PROPERTY_NAME}) and 
-     * the {@link javax.jdo.Constants.PERSISTENCE_UNIT_NAME 
-     * PERSISTENCE_UNIT_NAME}) are included in the property map that is used
-     * to run the test.
+     * Performs a test specified by <tt>testVariantName</tt>, by building up a
+     * property map and executing the test according to the property values. An
+     * assertion exeception is thrown if the test being run has a negative
+     * (non-true) result. With this version of <tt>doPositiveTest</tt> the
+     * property name ({@link javax.jdo.Constants.PROPERTY_NAME PROPERTY_NAME})
+     * and the {@link javax.jdo.Constants.PERSISTENCE_UNIT_NAME
+     * PERSISTENCE_UNIT_NAME}) are included in the property map that is used to
+     * run the test.
      * 
-     * @param classpaths class paths to add to the class loader that runs the 
-     *        test that specify where <tt>jdoconfig.xml</tt> can be found.
-     * @param testVariantName the name of the test.
-     * @param listenerCount number of listeners utilized in the test.
-     * @param vendorSpecificPropertyCount number of vendor properties used
-     *        in the test.
-     * @param checkEqualProperties if true the test's properties are tested.
-     * @param excludeName if true the property specified by 
-     *        {@link javax.jdo.Constants.PROPERTY_NAME PROPERTY_NAME} is
-     *        not added to the map.
-     * @param excludePUName if true the property specified by 
-     *        {@link javax.jdo.Constants.PROPERTY_PERSISTENCE_UNIT_NAME
-     *        PROPERTY_PERSISTENCE_UNIT_NAME} is not added to the map.
-     * @throws java.io.IOException if an {@java.io.IOException IOException}
-     *         occurs during class loading or any part of the test.
-     */
-    protected void doPositiveTest(
-            String[] classpaths,
-            String testVariantName,
-            int listenerCount,
-            int vendorSpecificPropertyCount,
-            boolean checkEqualProperties,
-            boolean excludeName,
-            boolean excludePUName)
-            throws IOException {
-
-        URLClassLoader loader = new JDOConfigTestClassLoader(
-                JDOCONFIG_CLASSPATH_PREFIX,
-                getClass().getClassLoader());
-
-        for (int i = 0; i < classpaths.length; i++) {
-            ClasspathHelper.addFile(classpaths[i], loader);
-        }
-
-        Map expected = prepareInitialExpectedMap(
-                testVariantName,
-                listenerCount,
-                vendorSpecificPropertyCount,
-                excludeName,
-                excludePUName);
-        
-        String name = testVariantName == null
-                ? null
-                : (String) expected.get(PROPERTY_NAME);
-
-        Map actual = JDOHelper.getPropertiesFromJdoconfig(name, loader);
-
-        assertNotNull("No properties found", actual);
-        if (checkEqualProperties) {
-            assertEqualProperties(expected, actual);
-        }
+     * @param classpaths
+     *            class paths to add to the class loader that runs the test that
+     *            specify where <tt>jdoconfig.xml</tt> can be found.
+     * @param testVariantName
+     *            the name of the test.
+     * @param listenerCount
+     *            number of listeners utilized in the test.
+     * @param vendorSpecificPropertyCount
+     *            number of vendor properties used in the test.
+     * @param checkEqualProperties
+     *            if true the test's properties are tested.
+     * @param excludeName
+     *            if true the property specified by
+     *            {@link javax.jdo.Constants.PROPERTY_NAME PROPERTY_NAME} is not
+     *            added to the map.
+     * @param excludePUName
+     *            if true the property specified by
+     *            {@link javax.jdo.Constants.PROPERTY_PERSISTENCE_UNIT_NAME
+     *            PROPERTY_PERSISTENCE_UNIT_NAME} is not added to the map.
+     * @throws java.io.IOException
+     *             if an {@java.io.IOException
+     *             IOException} occurs during class loading or any part of the
+     *             test.
+     */
+    protected void doPositiveTest(String[] classpaths, String testVariantName,
+	    int listenerCount, int vendorSpecificPropertyCount,
+	    boolean checkEqualProperties, boolean excludeName,
+	    boolean excludePUName) throws IOException {
+
+	URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
+		.getClassLoader(), classpaths);
+
+	Map expected = prepareInitialExpectedMap(testVariantName,
+		listenerCount, vendorSpecificPropertyCount, excludeName,
+		excludePUName);
+
+	String name = testVariantName == null ? null : (String) expected
+		.get(PROPERTY_NAME);
+
+	Map actual = JDOHelper.getPropertiesFromJdoconfig(name, loader);
+
+	assertNotNull("No properties found", actual);
+	if (checkEqualProperties) {
+	    assertEqualProperties(expected, actual);
+	}
     }
 
     public void testPositive00_PMF0_BasicPMFConfigUsingOnlyStandardAttributesAndListeners()
-            throws IOException {
-        doPositiveTest(
-                new String[]{JDOCONFIG_CLASSPATH_PREFIX + "/Positive00"},
-                "positive00.pmf0",
-                2,
-                0,
-                true);
+	    throws IOException {
+	doPositiveTest(new String[] { JDOCONFIG_CLASSPATH_PREFIX
+		+ "/Positive00" }, "positive00.pmf0", 2, 0, true);
     }
 
     public void testPositive00_PMF1_BasicPMFConfigUsingOnlyPropertyElementsWithStandardJavaxDotJDOProperties()
-            throws IOException {
-        doPositiveTest(
-                new String[]{JDOCONFIG_CLASSPATH_PREFIX + "/Positive00"},
-                "positive00.pmf1",
-                2,
-                0,
-                true);
+	    throws IOException {
+	doPositiveTest(new String[] { JDOCONFIG_CLASSPATH_PREFIX
+		+ "/Positive00" }, "positive00.pmf1", 2, 0, true);
     }
 
     public void testPositive00_PMF2_NestedPropertyElementsWithOnlyStandardAttributeNames()
-            throws IOException {
-        doPositiveTest(
-                new String[]{JDOCONFIG_CLASSPATH_PREFIX + "/Positive00"},
-                "positive00.pmf2",
-                2,
-                0,
-                true);
+	    throws IOException {
+	doPositiveTest(new String[] { JDOCONFIG_CLASSPATH_PREFIX
+		+ "/Positive00" }, "positive00.pmf2", 2, 0, true);
     }
 
     public void testPositive00_PMF3_StandardAttributesPlusNonstandardPropertiesInPropertyElements()
-            throws IOException {
-        doPositiveTest(
-                new String[]{JDOCONFIG_CLASSPATH_PREFIX + "/Positive00"},
-                "positive00.pmf3",
-                2,
-                2,
-                true);
+	    throws IOException {
+	doPositiveTest(new String[] { JDOCONFIG_CLASSPATH_PREFIX
+		+ "/Positive00" }, "positive00.pmf3", 2, 2, true);
     }
 
     public void testPositive00_PMF4_StandardAttributesPlusNonstandardAttributes()
-            throws IOException {
-        doPositiveTest(
-                new String[]{JDOCONFIG_CLASSPATH_PREFIX + "/Positive00"},
-                "positive00.pmf4",
-                0,
-                2,
-                true);
+	    throws IOException {
+	doPositiveTest(new String[] { JDOCONFIG_CLASSPATH_PREFIX
+		+ "/Positive00" }, "positive00.pmf4", 0, 2, true);
     }
 
     public void testPositive01_DuplicatePUsInDifferentConfigFilesButNotRequested()
-            throws IOException {
+	    throws IOException {
 
-        URLClassLoader loader = new JDOConfigTestClassLoader(
-                JDOCONFIG_CLASSPATH_PREFIX,
-                getClass().getClassLoader());
-
-        String[] classpaths = new String[]{
-            JDOCONFIG_CLASSPATH_PREFIX + "/Positive01/1a",
-            JDOCONFIG_CLASSPATH_PREFIX + "/Positive01/1b"
-        };
-        for (int i = 0; i < classpaths.length; i++) {
-            ClasspathHelper.addFile(classpaths[i], loader);
-        }
+	String[] classpaths = new String[] {
+		JDOCONFIG_CLASSPATH_PREFIX + "/Positive01/1a",
+		JDOCONFIG_CLASSPATH_PREFIX + "/Positive01/1b" };
+	URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
+		.getClassLoader(), classpaths);
 
-        Map actual = JDOHelper.getPropertiesFromJdoconfig(
-                ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME, loader);
+	Map actual = JDOHelper.getPropertiesFromJdoconfig(
+		ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME, loader);
     }
 
     public void testPositive02_GetAnonymousPMFWithNoProperties()
-            throws IOException {
-        
-        URLClassLoader loader = new JDOConfigTestClassLoader(
-                JDOCONFIG_CLASSPATH_PREFIX,
-                getClass().getClassLoader());
-
-            ClasspathHelper.addFile(
-                    JDOCONFIG_CLASSPATH_PREFIX + "/Positive02", loader);
-
-        Map properties = JDOHelper.getPropertiesFromJdoconfig(
-                ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME, loader);
-        assertNotNull(
-                "Anonymous PMF with no properties returned null", properties);
-        assertTrue(
-                "Anonymous PMF with no properties had properties",
-                properties.size() == 0);
+	    throws IOException {
+
+	URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
+		.getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX + "/Positive02/");
+
+	Map properties = JDOHelper.getPropertiesFromJdoconfig(
+		ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME, loader);
+	assertNotNull("Anonymous PMF with no properties returned null",
+		properties);
+	assertTrue("Anonymous PMF with no properties had properties",
+		properties.size() == 0);
     }
 
     public void testPositive03_PMF0_PMFClassNameViaServicesLookup()
-            throws IOException {
+	    throws IOException {
 
-        URLClassLoader loader = new JDOConfigTestClassLoader(
-                JDOCONFIG_CLASSPATH_PREFIX,
-                getClass().getClassLoader());
-        ClasspathHelper.addFile(JDOCONFIG_CLASSPATH_PREFIX + "/Positive03", loader);
+	URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
+		.getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX + "/Positive03/");
 
-        String expected = "class.positive03.pmf0";
-        String actual = getPMFClassNameViaServiceLookup(loader);
+	String expected = "class.positive03.pmf0";
+	String actual = getPMFClassNameViaServiceLookup(loader);
 
-        assertNotNull("No PMF name found via services lookup", actual);
-        assertEquals(expected, actual);
+	assertNotNull("No PMF name found via services lookup", actual);
+	assertEquals(expected, actual);
     }
 
     public void testPositive04_PMF0_PMFClassNameViaServicesLookup()
-            throws IOException {
+	    throws IOException {
 
-        URLClassLoader loader = new JDOConfigTestClassLoader(
-                JDOCONFIG_CLASSPATH_PREFIX,
-                getClass().getClassLoader());
-        ClasspathHelper.addFile(JDOCONFIG_CLASSPATH_PREFIX + "/Positive04", loader);
+	URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
+		.getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX + "/Positive04/");
 
-        String expected = "class.positive04.pmf0";
-        String actual = getPMFClassNameViaServiceLookup(loader);
+	String expected = "class.positive04.pmf0";
+	String actual = getPMFClassNameViaServiceLookup(loader);
 
-        assertNotNull("No PMF name found via services lookup", actual);
-        assertEquals(expected, actual);
+	assertNotNull("No PMF name found via services lookup", actual);
+	assertEquals(expected, actual);
     }
 
     public void testPositive05_PMF0_PMFClassNameViaServicesLookup()
-            throws IOException {
+	    throws IOException {
 
-        URLClassLoader loader = new JDOConfigTestClassLoader(
-                JDOCONFIG_CLASSPATH_PREFIX,
-                getClass().getClassLoader());
-        ClasspathHelper.addFile(
-                JDOCONFIG_CLASSPATH_PREFIX + "/Positive05", loader);
+	URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
+		.getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX + "/Positive05/");
 
-        String expected = "class.positive05.pmf0";
-        String actual = getPMFClassNameViaServiceLookup(loader);
+	String expected = "class.positive05.pmf0";
+	String actual = getPMFClassNameViaServiceLookup(loader);
 
-        assertNotNull("No PMF name found via services lookup", actual);
-        assertEquals(expected, actual);
+	assertNotNull("No PMF name found via services lookup", actual);
+	assertEquals(expected, actual);
     }
 
     public void testPositive06_PMF0_GetAnonymousPMFProperties()
-            throws IOException {
+	    throws IOException {
 
-        URLClassLoader loader = new JDOConfigTestClassLoader(
-                JDOCONFIG_CLASSPATH_PREFIX,
-                getClass().getClassLoader());
+	URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
+		.getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX + "/Positive06/");
 
-        ClasspathHelper.addFile(
-                JDOCONFIG_CLASSPATH_PREFIX + "/Positive06", loader);
+	Map expected = prepareInitialExpectedMap("positive06.pmf0", 2, 0, true,
+		true);
 
-        Map expected = prepareInitialExpectedMap(
-                "positive06.pmf0", 2, 0, true, true);
+	Map actual = JDOHelper.getPropertiesFromJdoconfig(
+		ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME, loader);
 
-        Map actual = JDOHelper.getPropertiesFromJdoconfig(
-                ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME, loader);
-
-        assertNotNull("No properties found", actual);
-        assertEqualProperties(expected, actual);
+	assertNotNull("No properties found", actual);
+	assertEqualProperties(expected, actual);
     }
 
     public void testPositive07_PMF0_GetAnonymousPMFPropertiesWithPUName()
-            throws IOException {
-
-        URLClassLoader loader = new JDOConfigTestClassLoader(
-                JDOCONFIG_CLASSPATH_PREFIX,
-                getClass().getClassLoader());
+	    throws IOException {
 
-        ClasspathHelper.addFile(
-                JDOCONFIG_CLASSPATH_PREFIX + "/Positive07", loader);
+	URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
+		.getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX + "/Positive07/");
 
-        Map expected = prepareInitialExpectedMap(
-                "positive07.pmf0", 2, 0, true, false);
+	Map expected = prepareInitialExpectedMap("positive07.pmf0", 2, 0, true,
+		false);
 
-        Map actual = JDOHelper.getPropertiesFromJdoconfig(
-                ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME, loader);
+	Map actual = JDOHelper.getPropertiesFromJdoconfig(
+		ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME, loader);
 
-        assertNotNull("No properties found", actual);
-        assertEqualProperties(expected, actual);
+	assertNotNull("No properties found", actual);
+	assertEqualProperties(expected, actual);
     }
 
     public void testNegative00_EmptyJDOConfigXML() throws IOException {
-        try {
-            URLClassLoader loader = new JDOConfigTestClassLoader(
-                    JDOCONFIG_CLASSPATH_PREFIX,
-                    getClass().getClassLoader());
-            ClasspathHelper.addFile(
-                    JDOCONFIG_CLASSPATH_PREFIX + "/Negative0", loader);
-
-            JDOHelper.getPersistenceManagerFactory(loader);
-            fail("JDOHelper failed to throw JDOFatalUserException");
-        }
-        catch (JDOFatalUserException x) {
-            // sunny day
-        }
+	try {
+	    URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
+		    .getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX
+		    + "/Negative0/");
+
+	    JDOHelper.getPersistenceManagerFactory(loader);
+	    fail("JDOHelper failed to throw JDOFatalUserException");
+	} catch (JDOFatalUserException x) {
+	    // sunny day
+	}
     }
 
     public void testNegative01_NoPersistenceUnitsDefined() throws IOException {
-        try {
-            URLClassLoader loader = new JDOConfigTestClassLoader(
-                    JDOCONFIG_CLASSPATH_PREFIX,
-                    getClass().getClassLoader());
-            ClasspathHelper.addFile(
-                    JDOCONFIG_CLASSPATH_PREFIX + "/Negative01", loader);
-
-            JDOHelper.getPersistenceManagerFactory(loader);
-            fail("JDOHelper failed to throw JDOFatalUserException");
-        }
-        catch (JDOFatalUserException x) {
-            // joy, sweet joy
-        }
+	try {
+	    URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
+		    .getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX
+		    + "/Negative01/");
+
+	    JDOHelper.getPersistenceManagerFactory(loader);
+	    fail("JDOHelper failed to throw JDOFatalUserException");
+	} catch (JDOFatalUserException x) {
+	    // joy, sweet joy
+	}
     }
 
     public void testNegative02_DuplicateAnonymousPersistenceUnitsInSameConfig()
-            throws IOException {
-        try {
-            URLClassLoader loader = new JDOConfigTestClassLoader(
-                    JDOCONFIG_CLASSPATH_PREFIX,
-                    getClass().getClassLoader());
-            ClasspathHelper.addFile(
-                    JDOCONFIG_CLASSPATH_PREFIX + "/Negative02", loader);
-
-            JDOHelper.getPersistenceManagerFactory(loader);
-            fail("JDOHelper failed to throw JDOFatalUserException");
-        }
-        catch (JDOFatalUserException x) {
-            // the cockles of my heart warmeth
-        }
+	    throws IOException {
+	try {
+	    URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
+		    .getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX
+		    + "/Negative02/");
+
+	    JDOHelper.getPersistenceManagerFactory(loader);
+	    fail("JDOHelper failed to throw JDOFatalUserException");
+	} catch (JDOFatalUserException x) {
+	    // the cockles of my heart warmeth
+	}
     }
 
     public void testNegative03_DuplicateNamedPersistenceUnitsInSameConfig()
-            throws IOException {
-        try {
-            URLClassLoader loader = new JDOConfigTestClassLoader(
-                    JDOCONFIG_CLASSPATH_PREFIX,
-                    getClass().getClassLoader());
-            ClasspathHelper.addFile(
-                    JDOCONFIG_CLASSPATH_PREFIX + "/Negative03", loader);
-
-            JDOHelper.getPersistenceManagerFactory(
-                    "name.negative03",
-                    loader);
-
-            fail("JDOHelper failed to throw JDOFatalUserException");
-        }
-        catch (JDOFatalUserException x) {
-            // warm fuzzies
-        }
+	    throws IOException {
+	try {
+	    URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
+		    .getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX
+		    + "/Negative03/");
+
+	    JDOHelper.getPersistenceManagerFactory("name.negative03", loader);
+
+	    fail("JDOHelper failed to throw JDOFatalUserException");
+	} catch (JDOFatalUserException x) {
+	    // warm fuzzies
+	}
     }
 
     public void testNegative04_DuplicatePUNamePropertyInAttributeAndElement()
-            throws IOException {
-        try {
-            URLClassLoader loader = new JDOConfigTestClassLoader(
-                    JDOCONFIG_CLASSPATH_PREFIX,
-                    getClass().getClassLoader());
-            ClasspathHelper.addFile(
-                    JDOCONFIG_CLASSPATH_PREFIX + "/Negative04", loader);
-
-            JDOHelper.getPersistenceManagerFactory(
-                    "name.negative04.value0",
-                    loader);
-
-            fail("JDOHelper failed to throw JDOFatalUserException");
-        }
-        catch (JDOFatalUserException x) {
-            // no cold pricklies
-        }
+	    throws IOException {
+	try {
+	    URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
+		    .getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX
+		    + "/Negative04/");
+
+	    JDOHelper.getPersistenceManagerFactory("name.negative04.value0",
+		    loader);
+
+	    fail("JDOHelper failed to throw JDOFatalUserException");
+	} catch (JDOFatalUserException x) {
+	    // no cold pricklies
+	}
     }
 
     public void testNegative05_DuplicatePropertyInAttributeAndElement()
-            throws IOException {
-        try {
-            URLClassLoader loader = new JDOConfigTestClassLoader(
-                    JDOCONFIG_CLASSPATH_PREFIX,
-                    getClass().getClassLoader());
-            ClasspathHelper.addFile(
-                    JDOCONFIG_CLASSPATH_PREFIX + "/Negative05", loader);
-
-            JDOHelper.getPersistenceManagerFactory(loader);
-
-            fail("JDOHelper failed to throw JDOFatalUserException");
-        }
-        catch (JDOFatalUserException x) {
-            // party!
-        }
+	    throws IOException {
+	try {
+	    URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
+		    .getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX
+		    + "/Negative05/");
+
+	    JDOHelper.getPersistenceManagerFactory(loader);
+
+	    fail("JDOHelper failed to throw JDOFatalUserException");
+	} catch (JDOFatalUserException x) {
+	    // party!
+	}
     }
 
     public void testNegative06_DuplicatePUInDifferentConfigFiles()
-            throws IOException {
-        try {
-            URLClassLoader loader = new JDOConfigTestClassLoader(
-                    JDOCONFIG_CLASSPATH_PREFIX,
-                    getClass().getClassLoader());
-            ClasspathHelper.addFile(
-                    JDOCONFIG_CLASSPATH_PREFIX + "/Negative06/6a", loader);
-            ClasspathHelper.addFile(
-                    JDOCONFIG_CLASSPATH_PREFIX + "/Negative06/6b", loader);
-
-            JDOHelper.getPersistenceManagerFactory(
-                    "name.negative06",
-                    loader);
-
-            fail("JDOHelper failed to throw JDOFatalUserException");
-        }
-        catch (JDOFatalUserException x) {
-            // clear blue sky
-        }
-    }
-
-    
-    public void testNegative07_EmptyServicesFile()
-            throws IOException {
-        JDOConfigTestClassLoader testLoader = new JDOConfigTestClassLoader(
-                new String[]{JDOCONFIG_CLASSPATH_PREFIX},
-                getClass().getClassLoader());
-        ClasspathHelper.addFile(
-                JDOCONFIG_CLASSPATH_PREFIX + "/Negative07", testLoader);
-        String shouldBeNull =
-               getPMFClassNameViaServiceLookup(testLoader);
-        assertNull(shouldBeNull);
+	    throws IOException {
+	try {
+	    URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
+		    .getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX
+		    + "/Negative06/6a/", JDOCONFIG_CLASSPATH_PREFIX
+		    + "/Negative06/6b/");
+
+	    JDOHelper.getPersistenceManagerFactory("name.negative06", loader);
+
+	    fail("JDOHelper failed to throw JDOFatalUserException");
+	} catch (JDOFatalUserException x) {
+	    // clear blue sky
+	}
+    }
+
+    public void testNegative07_EmptyServicesFile() throws IOException {
+	JDOConfigTestClassLoader testLoader = new JDOConfigTestClassLoader(
+		getClass().getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX
+			+ "/Negative07/");
+	String shouldBeNull = getPMFClassNameViaServiceLookup(testLoader);
+	assertNull(shouldBeNull);
     }
 
     public void testNegative08_NoResourcesFound() {
-        String resource = "" + RANDOM.nextLong();
+	String resource = "" + RANDOM.nextLong();
 
-        InputStream in =
-                getClass().getClassLoader().getResourceAsStream(resource);
-        assertNull(in);
-
-        // resource pretty much guaranteed not to exist
-        try {
-            JDOHelper.getPersistenceManagerFactory(resource);
-            fail("JDOHelper failed to throw JDOFatalUserException");
-        }
-        catch (JDOFatalUserException x) {
-            // happy path
-        }
+	InputStream in = getClass().getClassLoader().getResourceAsStream(
+		resource);
+	assertNull(in);
+
+	// resource pretty much guaranteed not to exist
+	try {
+	    JDOHelper.getPersistenceManagerFactory(resource);
+	    fail("JDOHelper failed to throw JDOFatalUserException");
+	} catch (JDOFatalUserException x) {
+	    // happy path
+	}
     }
 
     public void testNegative08_ServicesFileWithOnlyComments()
-            throws IOException {
-        JDOConfigTestClassLoader testLoader = new JDOConfigTestClassLoader(
-                new String[]{JDOCONFIG_CLASSPATH_PREFIX},
-                getClass().getClassLoader());
-        ClasspathHelper.addFile(
-                JDOCONFIG_CLASSPATH_PREFIX + "/Negative08", testLoader);
-        String shouldBeNull =
-                getPMFClassNameViaServiceLookup(testLoader);
-        assertNull(shouldBeNull);
+	    throws IOException {
+	JDOConfigTestClassLoader testLoader = new JDOConfigTestClassLoader(
+		getClass().getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX
+			+ "/Negative08/");
+	String shouldBeNull = getPMFClassNameViaServiceLookup(testLoader);
+	assertNull(shouldBeNull);
     }
-    
+
     public void testNegative09_MultipleInvalidClassesInDifferentServicesFiles()
-            throws IOException {
+	    throws IOException {
 
-        // no class name in Negative09/jdoconfig.xml
-        // 9a and 9b include services/javax.jdo.PersistenceManagerFactory
-        // with bad implementations
-        try {
-            URLClassLoader loader = new JDOConfigTestClassLoader(
-                    JDOCONFIG_CLASSPATH_PREFIX,
-                    getClass().getClassLoader());
-            ClasspathHelper.addFile(
-                    JDOCONFIG_CLASSPATH_PREFIX + "/Negative09/9a", loader);
-            ClasspathHelper.addFile(
-                    JDOCONFIG_CLASSPATH_PREFIX + "/Negative09/9b", loader);
-            ClasspathHelper.addFile(
-                    TEST_CLASSPATH, loader);
-            ClasspathHelper.addFile(
-                    API_CLASSPATH, loader);
-
-            JDOHelper.getPersistenceManagerFactory("name.negative09", loader);
-
-            fail("JDOHelper failed to throw JDOFatalUserException");
-        }
-        catch (JDOFatalException x) {
-
-            Throwable[] nestedExceptions = x.getNestedExceptions();
-            if (nestedExceptions.length != 2) {
-                appendMessage(
-                "JDOHelper.getPersistenceManagerFactory wrong number of " +
-                "nested exceptions. Expected 2, got " + nestedExceptions.length +
-                        "\n" + x);
-            }
-            for (int i = 0; i < nestedExceptions.length; ++i) {
-                Throwable exception = nestedExceptions[i];
-                if (!(exception instanceof JDOFatalException)) {
-                    appendMessage("Nested exception " + 
-                            exception.getClass().getName() + 
-                            " is not a JDOFatalException.");
-                }
-            }
-        }
-        failOnError();
-    }
-
-    private String getPMFClassNameViaServiceLookup(ClassLoader loader) {
-        try {
-            Enumeration urls = JDOHelper.getResources(loader, 
-                SERVICE_LOOKUP_PMF_RESOURCE_NAME);
-            while (urls.hasMoreElements()) {
-                // return the first one found
-                return JDOHelper.getClassNameFromURL((URL)urls.nextElement());
-            }
-        } catch (Exception ex) {
-            // ignore exceptions from i/o errors
-        }
-        return null;            
+	// no class name in Negative09/jdoconfig.xml
+	// 9a and 9b include services/javax.jdo.PersistenceManagerFactory
+	// with bad implementations
+	try {
+	    URLClassLoader loader = new JDOConfigTestClassLoader(getClass()
+		    .getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX
+		    + "/Negative09/9a/", JDOCONFIG_CLASSPATH_PREFIX
+		    + "/Negative09/9b/", TEST_CLASSPATH, API_CLASSPATH);
+
+	    JDOHelper.getPersistenceManagerFactory("name.negative09", loader);
+
+	    fail("JDOHelper failed to throw JDOFatalUserException");
+	} catch (JDOFatalException x) {
+
+	    Throwable[] nestedExceptions = x.getNestedExceptions();
+	    if (nestedExceptions.length != 2) {
+		appendMessage("JDOHelper.getPersistenceManagerFactory wrong number of "
+			+ "nested exceptions. Expected 2, got "
+			+ nestedExceptions.length + "\n" + x);
+	    }
+	    for (int i = 0; i < nestedExceptions.length; ++i) {
+		Throwable exception = nestedExceptions[i];
+		if (!(exception instanceof JDOFatalException)) {
+		    appendMessage("Nested exception "
+			    + exception.getClass().getName()
+			    + " is not a JDOFatalException.");
+		}
+	    }
+	}
+	failOnError();
     }
 }

Modified: db/jdo/trunk/api/test/java/javax/jdo/JDOHelperTest.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api/test/java/javax/jdo/JDOHelperTest.java?rev=1180967&r1=1180966&r2=1180967&view=diff
==============================================================================
--- db/jdo/trunk/api/test/java/javax/jdo/JDOHelperTest.java (original)
+++ db/jdo/trunk/api/test/java/javax/jdo/JDOHelperTest.java Mon Oct 10 13:51:00 2011
@@ -601,6 +601,14 @@ public class JDOHelperTest extends Abstr
         }
     }
 
+    public static class BadPMFGetPMFMethodThrowsJDOFatalInternalException {
+        public static PersistenceManagerFactory
+                getPersistenceManagerFactory(Map props) {
+            throw new JDOFatalInternalException(
+                    "GetPMF method throws JDOFatalInternalException");
+        }
+    }
+
     public static class BadPMFGetPMFMethodReturnsNull {
         public static PersistenceManagerFactory
                 getPersistenceManagerFactory(Map props) {



Mime
View raw message