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

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

Author: alesj
Date: 2008-04-25 10:10:44 -0400 (Fri, 25 Apr 2008)
New Revision: 72726

Added:
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/jpa/PersistenceMD_testMultipleMetaData.xml
Modified:
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jpa/PersistenceMDUnitTestCase.java
Log:
Additional PMD tests.

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jpa/PersistenceMDUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jpa/PersistenceMDUnitTestCase.java	2008-04-25 14:01:56 UTC (rev 72725)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jpa/PersistenceMDUnitTestCase.java	2008-04-25 14:10:44 UTC (rev 72726)
@@ -21,9 +21,12 @@
 */
 package org.jboss.test.metadata.jpa;
 
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.HashSet;
 
 import org.jboss.metadata.jpa.spec.PersistenceMetaData;
 import org.jboss.metadata.jpa.spec.PersistenceUnitMetaData;
@@ -49,22 +52,44 @@
 
    public void testDefaultMetaData() throws Throwable
    {
+      List<PersistenceUnitMetaData> units = getPersistenceUnits(1);
+      PersistenceUnitMetaData unit = units.get(0);
+      testPersistenceUnitMetaData(unit, "manager", "java:/DefaultDS", Collections.singleton("persistence.jar"), "hibernate", "create-drop");
+   }
+
+   public void testMultipleMetaData() throws Exception
+   {
+      List<PersistenceUnitMetaData> units = getPersistenceUnits(2);
+      PersistenceUnitMetaData unit = units.get(0);
+      testPersistenceUnitMetaData(unit, "manager", "java:/DefaultDS", Collections.singleton("persistence.jar"), "hibernate", "create-drop");
+      unit = units.get(1);
+      testPersistenceUnitMetaData(unit, "dev", "java:/MySqlDS", new HashSet<String>(Arrays.asList("dev.jar", "foobar.jar")), "hibernate", "validate");                           
+   }
+
+   protected List<PersistenceUnitMetaData> getPersistenceUnits(int size) throws Exception
+   {
       Class<PersistenceMetaData> expected = PersistenceMetaData.class;
       PersistenceMetaData metadata = unmarshal(expected, schemaResolverForClass(expected));
       assertEquals("1.0", metadata.getVersion());
       List<PersistenceUnitMetaData> units = metadata.getPersistenceUnits();
       assertNotNull(units);
-      assertEquals(1, units.size());
-      PersistenceUnitMetaData unit = units.get(0);
-      assertEquals("manager", unit.getName());
-      assertEquals("java:/DefaultDS", unit.getJtaDataSource());
-      Set<String> jars = unit.getJarFiles();
-      assertNotNull(jars);
-      assertEquals(1, jars.size());
-      String jar = jars.iterator().next();
-      assertEquals("persistence.jar", jar);
+      assertEquals(size, units.size());
+      return units;
+   }
+
+   protected void testPersistenceUnitMetaData(
+         PersistenceUnitMetaData unit,
+         String name,
+         String ds,
+         Set<String> jars,
+         String propertyKey,
+         String propertyValue)
+   {
+      assertEquals(name, unit.getName());
+      assertEquals(ds, unit.getJtaDataSource());
+      assertEquals(jars, unit.getJarFiles());
       Map<String, String> properties = unit.getProperties();
       assertNotNull(properties);
-      assertEquals("create-drop", properties.get("hibernate"));
+      assertEquals(propertyValue, properties.get(propertyKey));
    }
 }

Copied: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/jpa/PersistenceMD_testMultipleMetaData.xml (from rev 72712, projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/jpa/PersistenceMD_testDefaultMetaData.xml)
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/jpa/PersistenceMD_testMultipleMetaData.xml	                        (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/jpa/PersistenceMD_testMultipleMetaData.xml	2008-04-25 14:10:44 UTC (rev 72726)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence version="1.0" xmlns="http://java.sun.com/xml/ns/persistence">
+   <persistence-unit name="manager">
+      <jta-data-source>java:/DefaultDS</jta-data-source>
+      <jar-file>persistence.jar</jar-file>
+      <properties>
+         <property name="hibernate" value="create-drop"/>
+      </properties>
+   </persistence-unit>
+   <persistence-unit name="dev">
+      <jta-data-source>java:/MySqlDS</jta-data-source>
+      <jar-file>dev.jar</jar-file>
+      <jar-file>foobar.jar</jar-file>
+      <properties>
+         <property name="hibernate" value="validate"/>
+      </properties>
+   </persistence-unit>
+</persistence>