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

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Jun 10 16:28:11 EDT 2008


Author: scott.stark at jboss.org
Date: 2008-06-10 16:28:11 -0400 (Tue, 10 Jun 2008)
New Revision: 74359

Added:
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/jpa/PersistenceMD_testMultipleProperties.xml
Modified:
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jpa/PersistenceMDUnitTestCase.java
   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
Log:
Add a multiple pu properties test and make the binding config consistent with the jbossas setup.

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-06-10 16:55:05 UTC (rev 74358)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/jpa/PersistenceMDUnitTestCase.java	2008-06-10 20:28:11 UTC (rev 74359)
@@ -28,17 +28,29 @@
 import java.util.Set;
 import java.util.HashSet;
 
+import org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData;
+import org.jboss.metadata.ejb.spec.EjbJar21MetaData;
 import org.jboss.metadata.jpa.spec.PersistenceMetaData;
 import org.jboss.metadata.jpa.spec.PersistenceUnitMetaData;
 import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
+import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
+import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
 
 /**
  * Test persistence metadata.
  *
  * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ * @version $Revision:$
  */
 public class PersistenceMDUnitTestCase extends AbstractJavaEEMetaDataTest
 {
+   public static SchemaBindingResolver initResolver()
+   {
+      DefaultSchemaResolver resolver = new DefaultSchemaResolver();
+      resolver.addClassBindingForLocation("persistence_1_0.xsd", PersistenceMetaData.class);
+      return resolver;
+   }
+
    public PersistenceMDUnitTestCase(String name)
    {
       super(name);
@@ -66,10 +78,31 @@
       testPersistenceUnitMetaData(unit, "dev", "java:/MySqlDS", new HashSet<String>(Arrays.asList("dev.jar", "foobar.jar")), "hibernate", "validate");                           
    }
 
+   public void testMultipleProperties()
+      throws Exception
+   {
+      List<PersistenceUnitMetaData> units = getPersistenceUnits(1);
+      PersistenceUnitMetaData unit = units.get(0);
+      assertEquals("bookingDatabase", unit.getName());
+      assertEquals("org.hibernate.ejb.HibernatePersistence", unit.getProvider());
+      assertEquals("java:/bookingDatasource", unit.getJtaDataSource());
+      
+      Map<String, String> properties = unit.getProperties();
+      assertNotNull(properties);
+      String p0 = properties.get("hibernate.hbm2ddl.auto");
+      assertEquals("create-drop", p0);
+      String p1 = properties.get("hibernate.show_sql");
+      assertEquals("true", p1);
+      String p2 = properties.get("hibernate.cache.provider_class");
+      assertEquals("org.hibernate.cache.HashtableCacheProvider", p2);
+      String p3 = properties.get("hibernate.transaction.manager_lookup_class");
+      assertEquals("org.hibernate.transaction.JBossTransactionManagerLookup", p3);
+   }
+
    protected List<PersistenceUnitMetaData> getPersistenceUnits(int size) throws Exception
    {
       Class<PersistenceMetaData> expected = PersistenceMetaData.class;
-      PersistenceMetaData metadata = unmarshal(expected, schemaResolverForClass(expected));
+      PersistenceMetaData metadata = unmarshal(expected);
       assertEquals("1.0", metadata.getVersion());
       List<PersistenceUnitMetaData> units = metadata.getPersistenceUnits();
       assertNotNull(units);

Modified: 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_testDefaultMetaData.xml	2008-06-10 16:55:05 UTC (rev 74358)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/jpa/PersistenceMD_testDefaultMetaData.xml	2008-06-10 20:28:11 UTC (rev 74359)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<persistence version="1.0" xmlns="http://java.sun.com/xml/ns/persistence">
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
+   version="1.0">
    <persistence-unit name="manager">
       <jta-data-source>java:/DefaultDS</jta-data-source>
      <jar-file>persistence.jar</jar-file>

Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/jpa/PersistenceMD_testMultipleMetaData.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/jpa/PersistenceMD_testMultipleMetaData.xml	2008-06-10 16:55:05 UTC (rev 74358)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/jpa/PersistenceMD_testMultipleMetaData.xml	2008-06-10 20:28:11 UTC (rev 74359)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<persistence version="1.0" xmlns="http://java.sun.com/xml/ns/persistence">
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
+   version="1.0">
    <persistence-unit name="manager">
       <jta-data-source>java:/DefaultDS</jta-data-source>
       <jar-file>persistence.jar</jar-file>

Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/jpa/PersistenceMD_testMultipleProperties.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/jpa/PersistenceMD_testMultipleProperties.xml	                        (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/jpa/PersistenceMD_testMultipleProperties.xml	2008-06-10 20:28:11 UTC (rev 74359)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
+    version="1.0">
+    <persistence-unit name="bookingDatabase">
+        <provider>org.hibernate.ejb.HibernatePersistence</provider>
+        <jta-data-source>java:/bookingDatasource</jta-data-source>
+        <properties>
+            <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+            <property name="hibernate.show_sql" value="true"/>
+            <!-- These are the default for JBoss EJB3, but not for HEM: -->
+            <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
+            <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup"/>
+        </properties>
+    </persistence-unit>
+</persistence>




More information about the jboss-cvs-commits mailing list