Attachment 150159 Details for Bug 292951 – fix test failures of advanced and fieldaccess advanced model

[patch] fix test failures of advanced and fieldaccess advanced model

bug292951.patch (text/plain), 4.74 KB, created by Yiping Zhao

on 2009-10-21 16:08:15 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Yiping Zhao

Created: 2009-10-21 16:08:15 EDT

Size: 4.74 KB

patch

obsolete

>Index: AdvancedJPAJunitTest.java
>===================================================================
>--- AdvancedJPAJunitTest.java	(revision 5605)
>+++ AdvancedJPAJunitTest.java	(working copy)
>@@ -189,7 +189,7 @@
>     public void testMetamodelMinimalSanityTest() {
>         // Run test only when the JPA 2.0 specification is enabled on the server, or we are in SE mode with JPA 2.0 capability
>         if(!this.isJPA10()) {
>-            EntityManager em = createEntityManager("default1");
>+            EntityManager em = createEntityManager();
>             // pre-clear metamodel to enable test reentry (SE only - not EE)
>             if(!this.isOnServer()) {
>                 ((EntityManagerFactoryImpl)((EntityManagerImpl)em).getEntityManagerFactory()).setMetamodel(null);
>Index: compositepk/AdvancedCompositePKJunitTest.java
>===================================================================
>--- compositepk/AdvancedCompositePKJunitTest.java	(revision 5605)
>+++ compositepk/AdvancedCompositePKJunitTest.java	(working copy)
>@@ -649,7 +649,7 @@
>         // Don't run this test in a JPA 1.0 environment.
>         if (! isJPA10()) {
>             EntityManagerFactory emf = getEntityManagerFactory();
>-            EntityManager em = emf.createEntityManager();
>+            EntityManager em = createEntityManager();
>             beginTransaction(em);
>             try{
>                 DepartmentPK pk = new DepartmentPK("DEPT B", "ROLE B", "LOCATION B");
>Index: EntityManagerJUnitTestSuite.java
>===================================================================
>--- EntityManagerJUnitTestSuite.java	(revision 5605)
>+++ EntityManagerJUnitTestSuite.java	(working copy)
>@@ -143,14 +143,6 @@
>         suite.setName("EntityManagerJUnitTestSuite");
>         
>         suite.addTest(new EntityManagerJUnitTestSuite("testSetup"));
>-        
>-        suite.addTest(new EntityManagerJUnitTestSuite("testIsLoaded"));
>-        suite.addTest(new EntityManagerJUnitTestSuite("testIsLoadedAttribute"));
>-        suite.addTest(new EntityManagerJUnitTestSuite("testGetIdentifier"));
>-        suite.addTest(new EntityManagerJUnitTestSuite("testIsLoadedWithReference"));
>-        suite.addTest(new EntityManagerJUnitTestSuite("testIsLoadedWithoutReference"));
>-        suite.addTest(new EntityManagerJUnitTestSuite("testIsLoadedWithoutReferenceAttribute"));
>-        
>         suite.addTest(new EntityManagerJUnitTestSuite("testWeaving"));
>         suite.addTest(new EntityManagerJUnitTestSuite("testClearEntityManagerWithoutPersistenceContext"));
>         suite.addTest(new EntityManagerJUnitTestSuite("testUpdateAllProjects"));
>@@ -8576,7 +8568,7 @@
>         // Don't run this test in a JPA 1.0 environment.
>         if (! isJPA10()) {
>             EntityManagerFactory emf = getEntityManagerFactory();
>-            EntityManager em = emf.createEntityManager();
>+            EntityManager em = createEntityManager();
>             beginTransaction(em);
>             try{
>                 Employee emp = new Employee();
>@@ -8610,7 +8602,7 @@
>         // Don't run this test in a JPA 1.0 environment.
>         if (! isJPA10()) {
>             EntityManagerFactory emf = getEntityManagerFactory();
>-            EntityManager em = emf.createEntityManager();
>+            EntityManager em = createEntityManager();
>             beginTransaction(em);
>             try{
>                 Employee emp = new Employee();
>@@ -8657,7 +8649,7 @@
>         // Don't run this test in a JPA 1.0 environment.
>         if (! isJPA10()) {
>             EntityManagerFactory emf = getEntityManagerFactory();
>-            EntityManager em = emf.createEntityManager();
>+            EntityManager em = createEntityManager();
>             beginTransaction(em);
>             try{
>                 Employee emp = new Employee();
>@@ -8690,8 +8682,7 @@
>     }
>     
>     public void testIsLoadedWithReference(){
>-        EntityManagerFactory emf = getEntityManagerFactory();
>-        EntityManager em = emf.createEntityManager();
>+        EntityManager em = createEntityManager();
>         beginTransaction(em);
>         try{
>             Employee emp = new Employee();
>@@ -8738,8 +8729,7 @@
>     }
>     
>     public void testIsLoadedWithoutReference(){
>-        EntityManagerFactory emf = getEntityManagerFactory();
>-        EntityManager em = emf.createEntityManager();
>+        EntityManager em = createEntityManager();
>         beginTransaction(em);
>         try{
>             Employee emp = new Employee();
>@@ -8787,8 +8777,7 @@
>     }
>     
>     public void testIsLoadedWithoutReferenceAttribute(){
>-        EntityManagerFactory emf = getEntityManagerFactory();
>-        EntityManager em = emf.createEntityManager();
>+        EntityManager em = createEntityManager();
>         beginTransaction(em);
>         try{
>             Employee emp = new Employee();

Actions: View | Diff

Attachments on bug 292951: 150156 | 150159