svn commit: r897951 - /incubator/aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/PersistenceBundleLifecycleTest.java

[ti...@apache.org]

Author: timothyjward
Date: Mon Jan 11 17:10:26 2010
New Revision: 897951

URL: http://svn.apache.org/viewvc?rev=897951&view=rev
Log:
ARIES-79: Create and manage EntityManagerFactory services for persistence units

Modified:
    incubator/aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/PersistenceBundleLifecycleTest.java

Modified: incubator/aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/PersistenceBundleLifecycleTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/PersistenceBundleLifecycleTest.java?rev=897951&r1=897950&r2=897951&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/PersistenceBundleLifecycleTest.java (original)
+++ incubator/aries/trunk/jpa/jpa-container/src/test/java/org/apache/aries/jpa/container/PersistenceBundleLifecycleTest.java Mon Jan 11 17:10:26 2010
@@ -31,6 +31,7 @@
 import java.util.Hashtable;
 import java.util.Vector;
 
+import javax.persistence.EntityManagerFactory;
 import javax.persistence.spi.PersistenceProvider;
 
 import org.apache.aries.jpa.container.impl.PersistenceBundleManager;
@@ -94,26 +95,20 @@
     BundleContextMock.clear();
   }
   
-//  @Test
-//  public void testManagerStartOneExistingPersistenceBundleNoExistingProvider() throws Exception
-//  {
-//    //Check we don't register anything (the bundle was installed before we started)
-//
-//    PersistenceBundleManager mgr = new PersistenceBundleManager();
-//    
-//    BundleContext ctx = extenderBundle.getBundleContext();
-//    
-//    Skeleton.getSkeleton(ctx).setReturnValue(
-//        new MethodCall(BundleContext.class, "getBundles"),
-//        new Bundle[] {persistenceBundle});
-//    
-//    setupPersistenceBundle("unittest/resources/file4/");
-//    
-//    mgr.start(ctx);
-//    
-//    BundleContextMock.assertNoServiceExists(PersistenceUnitInfoService.class.getName());
-//    
-//  }
+  @Test
+  public void testManager_OnePreExistingPersistenceBundle_NoProvider() throws Exception
+  {
+    BundleContext ctx = extenderBundle.getBundleContext();
+
+    PersistenceBundleManager mgr = new PersistenceBundleManager(ctx);
+    
+    setupPersistenceBundle("unittest/resources/file4/");
+    
+    mgr.addingBundle(persistenceBundle, null);
+    
+    BundleContextMock.assertNoServiceExists(EntityManagerFactory.class.getName());
+    
+  }
 //
 //  @Test
 //  public void testManagerStartOneExistingPersistenceBundleOneExistingProvider() throws Exception
@@ -893,21 +888,21 @@
 //    testUnsuccessfulInstalledEvent(mgr, ctx);
 //  }
 // 
-//  private void setupPersistenceBundle(String s) throws MalformedURLException
-//  {
-//    Skeleton skel = Skeleton.getSkeleton(persistenceBundle);
-//    
-//    skel.setReturnValue(new MethodCall(Bundle.class, "getState"), Bundle.ACTIVE);
-//    
-//    URL root = new File(s).toURI().toURL();
-//    
-//    URL xml = new File(s + "META-INF/persistence.xml").toURI().toURL();
-//    
-//    skel.setReturnValue(new MethodCall(Bundle.class, "getEntry", "/"), root);
-//    skel.setReturnValue(new MethodCall(Bundle.class, "getEntry", "/META-INF/persistence.xml"), xml);
-//    skel.setReturnValue(new MethodCall(Bundle.class, "getVersion"), new Version("0.0.0"));
-//
-//  }
+  private void setupPersistenceBundle(String s) throws MalformedURLException
+  {
+    Skeleton skel = Skeleton.getSkeleton(persistenceBundle);
+    
+    skel.setReturnValue(new MethodCall(Bundle.class, "getState"), Bundle.ACTIVE);
+    
+    URL root = new File(s).toURI().toURL();
+    
+    URL xml = new File(s + "META-INF/persistence.xml").toURI().toURL();
+    
+    skel.setReturnValue(new MethodCall(Bundle.class, "getEntry", "/"), root);
+    skel.setReturnValue(new MethodCall(Bundle.class, "getEntry", "/META-INF/persistence.xml"), xml);
+    skel.setReturnValue(new MethodCall(Bundle.class, "getVersion"), new Version("0.0.0"));
+
+  }
 //  
 //  private void registerVersionedPersistenceProviders(PersistenceProvider pp100,
 //      PersistenceProvider pp101, PersistenceProvider pp110,