[hibernate-commits] Hibernate SVN: r17773 - in core/trunk/entitymanager/src/test/java/org/hibernate/ejb: test/connection and 2 other directories.

[hibernate-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2009-10-15 21:02:14 -0400 (Thu, 15 Oct 2009)
New Revision: 17773

Modified:
   core/trunk/entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/BasicCriteriaUsageTest.java
   core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/connection/PersistenceUnitInfoImpl.java
   core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/MetadataTest.java
   core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/JarVisitorTest.java
Log:
Update jpa-api to 2.0-cr-1

Modified: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/BasicCriteriaUsageTest.java
===================================================================
--- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/BasicCriteriaUsageTest.java	2009-10-16 00:50:22 UTC (rev 17772)
+++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/BasicCriteriaUsageTest.java	2009-10-16 01:02:14 UTC (rev 17773)
@@ -44,7 +44,7 @@
 	public void testSimplestCriterias() {
 		EntityManager em = getOrCreateEntityManager();
 		em.getTransaction().begin();
-		CriteriaQuery criteria = em.getQueryBuilder().createQuery();
+		CriteriaQuery criteria = em.getCriteriaBuilder().createQuery();
 		criteria.from( Wall.class );
 		em.getTransaction().commit();
 		em.close();
@@ -53,14 +53,14 @@
 	public void testParameterCollection() {
 		EntityManager em = getOrCreateEntityManager();
 		em.getTransaction().begin();
-		CriteriaQuery criteria = em.getQueryBuilder().createQuery();
+		CriteriaQuery criteria = em.getCriteriaBuilder().createQuery();
 		Root<Wall> from = criteria.from( Wall.class );
-		ParameterExpression param = em.getQueryBuilder().parameter( String.class );
+		ParameterExpression param = em.getCriteriaBuilder().parameter( String.class );
 		SingularAttribute<? super Wall,?> colorAttribute = em.getMetamodel()
 				.entity( Wall.class )
 				.getDeclaredSingularAttribute( "color" );
 		assertNotNull( "metamodel returned null singular attribute", colorAttribute );
-		Predicate predicate = em.getQueryBuilder().equal( from.get( colorAttribute ), param );
+		Predicate predicate = em.getCriteriaBuilder().equal( from.get( colorAttribute ), param );
 		criteria.where( predicate );
 		assertEquals( 1, criteria.getParameters().size() );
 		em.getTransaction().commit();

Modified: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/connection/PersistenceUnitInfoImpl.java
===================================================================
--- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/connection/PersistenceUnitInfoImpl.java	2009-10-16 00:50:22 UTC (rev 17772)
+++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/connection/PersistenceUnitInfoImpl.java	2009-10-16 01:02:14 UTC (rev 17773)
@@ -8,7 +8,7 @@
 import javax.persistence.spi.ClassTransformer;
 import javax.persistence.spi.PersistenceUnitInfo;
 import javax.persistence.spi.PersistenceUnitTransactionType;
-import javax.persistence.Caching;
+import javax.persistence.SharedCacheMode;
 import javax.persistence.ValidationMode;
 import javax.sql.DataSource;
 
@@ -73,7 +73,7 @@
 		return properties;
 	}
 
-	public String PersistenceXMLSchemaVersion() {
+	public String getPersistenceXMLSchemaVersion() {
 		return null;  //To change body of implemented methods use File | Settings | File Templates.
 	}
 
@@ -93,7 +93,7 @@
 		return true;
 	}
 
-	public Caching getCaching() {
+	public SharedCacheMode getSharedCacheMode() {
 		//FIXME
 		return null;  //To change body of implemented methods use File | Settings | File Templates.
 	}

Modified: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/MetadataTest.java
===================================================================
--- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/MetadataTest.java	2009-10-16 00:50:22 UTC (rev 17772)
+++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/metadata/MetadataTest.java	2009-10-16 01:02:14 UTC (rev 17773)
@@ -131,7 +131,7 @@
 		assertEquals( Bindable.BindableType.PLURAL_ATTRIBUTE, rooms.getBindableType() );
 		assertEquals( Set.class, rooms.getJavaType() );
 		assertEquals( PluralAttribute.CollectionType.SET, rooms.getCollectionType() );
-		assertEquals( 3, entityType.getDeclaredCollections().size() );
+		assertEquals( 3, entityType.getDeclaredPluralAttributes().size() );
 		assertEquals( Type.PersistenceType.EMBEDDABLE, rooms.getElementType().getPersistenceType() );
 
 		final MapAttribute<House,String,Room> roomsByName = entityType.getDeclaredMap(

Modified: core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/JarVisitorTest.java
===================================================================
--- core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/JarVisitorTest.java	2009-10-16 00:50:22 UTC (rev 17772)
+++ core/trunk/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/JarVisitorTest.java	2009-10-16 01:02:14 UTC (rev 17773)
@@ -175,7 +175,7 @@
 	}
 
 	/**
-	 * @see EJB-230
+	 * EJB-230
 	 */
 	public void testDuplicateFilterExplodedJarExpected() throws Exception {