[Springframework-cvs] spring/tiger/test/org/springframework/orm/jpa AbstractContainerEntityManagerFactoryIntegrationTests.java, 1.3, 1.4 memdb.xml, 1.6, 1.7 AbstractEntityManagerFactoryIntegrationTests.java, 1.5, 1.6 weaver.xml, 1.5, NONE

[Costin L. <cos...@us...>]

Update of /cvsroot/springframework/spring/tiger/test/org/springframework/orm/jpa
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv14736/tiger/test/org/springframework/orm/jpa

Modified Files:
	AbstractContainerEntityManagerFactoryIntegrationTests.java 
	memdb.xml AbstractEntityManagerFactoryIntegrationTests.java 
Removed Files:
	weaver.xml 
Log Message:
+ openJpa test suite

Index: memdb.xml
===================================================================
RCS file: /cvsroot/springframework/spring/tiger/test/org/springframework/orm/jpa/memdb.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** memdb.xml	29 Aug 2006 16:01:28 -0000	1.6
--- memdb.xml	31 Aug 2006 14:17:06 -0000	1.7
***************
*** 4,9 ****
  <beans>
  
- 	<import resource="weaver.xml"/>
- 
  	<bean id="entityManager" class="org.springframework.orm.jpa.support.SharedEntityManagerBean">
  		<property name="entityManagerFactory" ref="entityManagerFactory"/>
--- 4,7 ----

Index: AbstractContainerEntityManagerFactoryIntegrationTests.java
===================================================================
RCS file: /cvsroot/springframework/spring/tiger/test/org/springframework/orm/jpa/AbstractContainerEntityManagerFactoryIntegrationTests.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AbstractContainerEntityManagerFactoryIntegrationTests.java	20 Jun 2006 10:41:09 -0000	1.3
--- AbstractContainerEntityManagerFactoryIntegrationTests.java	31 Aug 2006 14:17:06 -0000	1.4
***************
*** 85,89 ****
  	@ExpectedException(RuntimeException.class)
  	public void testBogusQuery() {
! 		sharedEntityManager.createQuery("It's raining toads");
  	}
  	
--- 85,89 ----
  	@ExpectedException(RuntimeException.class)
  	public void testBogusQuery() {
! 		Query query = sharedEntityManager.createQuery("It's raining toads");
  	}
  	

--- weaver.xml DELETED ---

Index: AbstractEntityManagerFactoryIntegrationTests.java
===================================================================
RCS file: /cvsroot/springframework/spring/tiger/test/org/springframework/orm/jpa/AbstractEntityManagerFactoryIntegrationTests.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AbstractEntityManagerFactoryIntegrationTests.java	26 Jun 2006 13:35:58 -0000	1.5
--- AbstractEntityManagerFactoryIntegrationTests.java	31 Aug 2006 14:17:06 -0000	1.6
***************
*** 24,50 ****
   */
  public abstract class AbstractEntityManagerFactoryIntegrationTests extends AbstractJpaTests {
! 	
  	public static final String[] TOPLINK_CONFIG_LOCATIONS = new String[] {
! 		"/org/springframework/orm/jpa/toplink/toplink-manager.xml",
! 		"/org/springframework/orm/jpa/memdb.xml",
! 		"/org/springframework/orm/jpa/inject.xml"
! 	};
  
  	public static final String[] HIBERNATE_CONFIG_LOCATIONS = new String[] {
! 		"/org/springframework/orm/jpa/hibernate/hibernate-manager.xml",
! 		"/org/springframework/orm/jpa/memdb.xml",
! 		"/org/springframework/orm/jpa/inject.xml"
! 	};
  
  
  	public static Provider getProvider() {
  		String provider = System.getProperty("org.springframework.orm.jpa.provider");
! 		if (provider != null && provider.toLowerCase().indexOf("hibernate") > -1) {
! 			return Provider.HIBERNATE;
  		}
  		return Provider.TOPLINK;
  	}
  
- 
  	@Override
  	protected String getActualOrmXmlLocation() {
--- 24,51 ----
   */
  public abstract class AbstractEntityManagerFactoryIntegrationTests extends AbstractJpaTests {
! 
  	public static final String[] TOPLINK_CONFIG_LOCATIONS = new String[] {
! 			"/org/springframework/orm/jpa/toplink/toplink-manager.xml", "/org/springframework/orm/jpa/memdb.xml",
! 			"/org/springframework/orm/jpa/inject.xml" };
  
  	public static final String[] HIBERNATE_CONFIG_LOCATIONS = new String[] {
! 			"/org/springframework/orm/jpa/hibernate/hibernate-manager.xml", "/org/springframework/orm/jpa/memdb.xml",
! 			"/org/springframework/orm/jpa/inject.xml" };
  
+ 	public static final String[] OPENJPA_CONFIG_LOCATIONS = new String[] {
+ 			"/org/springframework/orm/jpa/openjpa/openjpa-manager.xml", "/org/springframework/orm/jpa/memdb.xml",
+ 			"/org/springframework/orm/jpa/inject.xml" };
  
  	public static Provider getProvider() {
  		String provider = System.getProperty("org.springframework.orm.jpa.provider");
! 		if (provider != null) {
! 			if (provider.toLowerCase().contains("hibernate"))
! 				return Provider.HIBERNATE;
! 			if (provider.toLowerCase().contains("openjpa"))
! 				return Provider.OPENJPA;
  		}
  		return Provider.TOPLINK;
  	}
  
  	@Override
  	protected String getActualOrmXmlLocation() {
***************
*** 52,72 ****
  		return null;
  	}
! 	
  	protected String[] getConfigLocations() {
  		Provider provider = getProvider();
  		switch (provider) {
! 			case HIBERNATE:
! 				return HIBERNATE_CONFIG_LOCATIONS;
! 			case TOPLINK:
! 				return TOPLINK_CONFIG_LOCATIONS;
! 			default:
! 				throw new IllegalStateException("Unknown provider: " + provider);
  		}
  	}
  
- 
  	public enum Provider {
! 			TOPLINK,
! 			HIBERNATE
  	};
  
--- 53,73 ----
  		return null;
  	}
! 
  	protected String[] getConfigLocations() {
  		Provider provider = getProvider();
  		switch (provider) {
! 		case HIBERNATE:
! 			return HIBERNATE_CONFIG_LOCATIONS;
! 		case TOPLINK:
! 			return TOPLINK_CONFIG_LOCATIONS;
! 		case OPENJPA:
! 			return OPENJPA_CONFIG_LOCATIONS;
! 		default:
! 			throw new IllegalStateException("Unknown provider: " + provider);
  		}
  	}
  
  	public enum Provider {
! 		TOPLINK, HIBERNATE, OPENJPA
  	};