================================================================================
Merge Diffs: /ade/xiaosche_tl_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/cmp3/advanced/EntityManagerJUnitTestSuite.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/xiaosche/xiaosche_main_gf854_060901/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.47
Report generated at Fri Sep  1 13:19:22 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/xiaosche/xiaosche_main_gf854_060901/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.47	Fri Sep  1 13:09:06 2006
--- /ade/xiaosche_tl_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/cmp3/advanced/EntityManagerJUnitTestSuite.java	Fri Sep  1 13:19:22 2006
***************
*** 31,36 ****
--- 31,41 ----
  
  import java.util.List;
  import java.util.Collection;
+ import java.util.Map;
+ import java.util.HashMap;
+ import javax.persistence.*;
+ import javax.persistence.spi.*;
+ 
  
  import javax.persistence.EntityExistsException;
  import javax.persistence.EntityManager;
***************
*** 44,49 ****
--- 49,55 ----
  import javax.persistence.PersistenceException;
  import javax.persistence.OptimisticLockException;
  import javax.persistence.RollbackException;
+ import javax.persistence.spi.PersistenceUnitInfo;
  
  import junit.extensions.TestSetup;
  import junit.framework.*;
***************
*** 61,66 ****
--- 67,73 ----
  import oracle.toplink.essentials.testing.models.cmp3.advanced.AdvancedTableCreator;
  import oracle.toplink.essentials.testing.models.cmp3.advanced.Address;
  import oracle.toplink.essentials.testing.models.cmp3.advanced.Department;
+ import oracle.toplink.essentials.ejb.cmp3.persistence.SEPersistenceUnitInfo;
  import java.util.Iterator;
  
  import oracle.toplink.essentials.testing.models.cmp3.advanced.LargeProject;
***************
*** 71,76 ****
--- 78,84 ----
  import oracle.toplink.essentials.threetier.ServerSession;
  import oracle.toplink.essentials.exceptions.ValidationException;
  import oracle.toplink.essentials.tools.schemaframework.OracleSequenceDefinition;
+ import oracle.toplink.essentials.ejb.cmp3.EntityManagerFactoryProvider;
   
  public class EntityManagerJUnitTestSuite extends JUnitTestCase {
          
***************
*** 2415,2420 ****
--- 2423,2447 ----
          fail("No exception thrown when entityManager.remove(null) attempted.");        
      }
      
+     //GlassFish Bug854
+     public void testCreateEntityManagerFactory() {
+         EntityManagerFactory emf = null;
+ 
+         try{
+         	emf=Persistence.createEntityManagerFactory("default",null);
+         	emf=Persistence.createEntityManagerFactory("default");
+         } catch (NullPointerException npe ) {
+         	// un-expected behaviour
+         	npe.printStackTrace();
+             fail("EntityManagerFactoryProvider.createEntityManagerFactory(String emName, Map properties) didn't catch Null pointer exception");
+         } catch (Exception e) {
+             fail("EntityManagerFactoryProvider.createEntityManagerFactory(String emName, Map properties) threw a wrong exception: " + e.getMessage());
+         } finally{
+         	if (emf!=null) emf.close();
+         }
+     }
+     
+     
      public static void main(String[] args) {
          // Now run JUnit.
          junit.swingui.TestRunner.main(args);
================================================================================
Merge Diffs: /ade/xiaosche_tl_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/cmp3/advanced/EntityManagerJUnitTestSuite.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/xiaosche/xiaosche_main_gf854_060901/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.47
Report generated at Fri Sep  1 13:20:02 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/xiaosche/xiaosche_main_gf854_060901/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.47	Fri Sep  1 13:09:06 2006
--- /ade/xiaosche_tl_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/cmp3/advanced/EntityManagerJUnitTestSuite.java	Fri Sep  1 13:19:22 2006
***************
*** 31,36 ****
--- 31,41 ----
  
  import java.util.List;
  import java.util.Collection;
+ import java.util.Map;
+ import java.util.HashMap;
+ import javax.persistence.*;
+ import javax.persistence.spi.*;
+ 
  
  import javax.persistence.EntityExistsException;
  import javax.persistence.EntityManager;
***************
*** 44,49 ****
--- 49,55 ----
  import javax.persistence.PersistenceException;
  import javax.persistence.OptimisticLockException;
  import javax.persistence.RollbackException;
+ import javax.persistence.spi.PersistenceUnitInfo;
  
  import junit.extensions.TestSetup;
  import junit.framework.*;
***************
*** 61,66 ****
--- 67,73 ----
  import oracle.toplink.essentials.testing.models.cmp3.advanced.AdvancedTableCreator;
  import oracle.toplink.essentials.testing.models.cmp3.advanced.Address;
  import oracle.toplink.essentials.testing.models.cmp3.advanced.Department;
+ import oracle.toplink.essentials.ejb.cmp3.persistence.SEPersistenceUnitInfo;
  import java.util.Iterator;
  
  import oracle.toplink.essentials.testing.models.cmp3.advanced.LargeProject;
***************
*** 71,76 ****
--- 78,84 ----
  import oracle.toplink.essentials.threetier.ServerSession;
  import oracle.toplink.essentials.exceptions.ValidationException;
  import oracle.toplink.essentials.tools.schemaframework.OracleSequenceDefinition;
+ import oracle.toplink.essentials.ejb.cmp3.EntityManagerFactoryProvider;
   
  public class EntityManagerJUnitTestSuite extends JUnitTestCase {
          
***************
*** 2415,2420 ****
--- 2423,2447 ----
          fail("No exception thrown when entityManager.remove(null) attempted.");        
      }
      
+     //GlassFish Bug854
+     public void testCreateEntityManagerFactory() {
+         EntityManagerFactory emf = null;
+ 
+         try{
+         	emf=Persistence.createEntityManagerFactory("default",null);
+         	emf=Persistence.createEntityManagerFactory("default");
+         } catch (NullPointerException npe ) {
+         	// un-expected behaviour
+         	npe.printStackTrace();
+             fail("EntityManagerFactoryProvider.createEntityManagerFactory(String emName, Map properties) didn't catch Null pointer exception");
+         } catch (Exception e) {
+             fail("EntityManagerFactoryProvider.createEntityManagerFactory(String emName, Map properties) threw a wrong exception: " + e.getMessage());
+         } finally{
+         	if (emf!=null) emf.close();
+         }
+     }
+     
+     
      public static void main(String[] args) {
          // Now run JUnit.
          junit.swingui.TestRunner.main(args);