You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by dw...@apache.org on 2010/03/01 17:08:11 UTC
svn commit: r917567 - in /openjpa/trunk/openjpa-persistence-jdbc/src/test:
java/org/apache/openjpa/persistence/jpql/expressions/TestIndex.java
resources/META-INF/persistence.xml
Author: dwoods
Date: Mon Mar 1 16:08:10 2010
New Revision: 917567
URL: http://svn.apache.org/viewvc?rev=917567&view=rev
Log:
OPENJPA-855 proper XML entity cleanup between test runs
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestIndex.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestIndex.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestIndex.java?rev=917567&r1=917566&r2=917567&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestIndex.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestIndex.java Mon Mar 1 16:08:10 2010
@@ -51,7 +51,6 @@
*/
public class TestIndex extends SingleEMFTestCase {
- private OpenJPAEntityManagerFactorySPI emf2 = null;
private Log log = null;
private enum JPQLIndexEntityClasses implements JPAEntityClassEnum {
@@ -92,6 +91,11 @@
"C_Element", "D_Element", "E_Element", "F_Element", };
@Override
+ protected String getPersistenceUnitName() {
+ return "JPQLIndex";
+ }
+
+ @Override
public void setUp() {
super.setUp(CLEAR_TABLES, TreeNode.class,
OrderedElementEntity.class, UnorderedNameEntity.class,
@@ -99,13 +103,7 @@
// XMLOrderedOneToManyEntity.class, XMLOrderedManyToManyEntity.class,
// XMLOrderedElementEntity.class, XMLUnorderedNameEntity.class);
- // create our EMF
- emf2 = (OpenJPAEntityManagerFactorySPI) OpenJPAPersistence.createEntityManagerFactory(
- "JPQLIndex",
- "org/apache/openjpa/persistence/jpql/expressions/persistence.xml");
- assertNotNull(emf2);
-
- log = emf2.getConfiguration().getLog("test");
+ log = emf.getConfiguration().getLog("test");
}
public void testO2MTreeQueryIndex() {
@@ -160,7 +158,7 @@
root.createTree(original);
assertArrayEquals(original, root.getFanOuts());
- EntityManager em = emf2.createEntityManager();
+ EntityManager em = emf.createEntityManager();
em.getTransaction().begin();
em.persist(root);
em.getTransaction().commit();
@@ -222,7 +220,7 @@
// add the entities
log.trace("Adding " + newElements.size() + " of " + elementClassName + " to " + entityClassName);
- em = emf2.createEntityManager();
+ em = emf.createEntityManager();
em.getTransaction().begin();
for (INameEntity newElement : newElements)
{
@@ -283,7 +281,7 @@
}
newEntity.setListElements(namesList);
// add the entity
- em = emf2.createEntityManager();
+ em = emf.createEntityManager();
em.getTransaction().begin();
em.persist(newEntity);
em.getTransaction().commit();
@@ -345,7 +343,7 @@
+ Arrays.toString(Element_Names));
}
- EntityManager em = emf2.createEntityManager();
+ EntityManager em = emf.createEntityManager();
em.clear();
int idx = 0;
for (String expectedEntityName : Element_Names) {
@@ -388,7 +386,7 @@
+ Arrays.toString(Element_Names));
}
- EntityManager em = emf2.createEntityManager();
+ EntityManager em = emf.createEntityManager();
em.clear();
int idx = 0;
for (String expectedEntityName : Element_Names) {
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml?rev=917567&r1=917566&r2=917567&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml Mon Mar 1 16:08:10 2010
@@ -322,6 +322,7 @@
<persistence-unit name="JPQLIndex">
<mapping-file>org/apache/openjpa/persistence/jpql/expressions/orm.xml</mapping-file>
+ <class>org.apache.openjpa.persistence.proxy.TreeNode</class>
<class>org.apache.openjpa.persistence.jpql.entities.OrderedElementEntity</class>
<class>org.apache.openjpa.persistence.jpql.entities.XMLOrderedElementEntity</class>
<class>org.apache.openjpa.persistence.jpql.entities.OrderedManyToManyEntity</class>