svn commit: r916951 - in /incubator/aries/trunk/jpa/jpa-blueprint-itest: pom.xml src/test/java/org/apache/aries/jpa/blueprint/itest/JPAContainerTest.java src/test/java/org/apache/aries/jpa/blueprint/itest/JPAInjectionTest.java

[ti...@apache.org]

Author: timothyjward
Date: Sat Feb 27 13:22:01 2010
New Revision: 916951

URL: http://svn.apache.org/viewvc?rev=916951&view=rev
Log:
ARIES-202 : Separate the JPA blueprint integration from managed persistence contexts

Added:
    incubator/aries/trunk/jpa/jpa-blueprint-itest/src/test/java/org/apache/aries/jpa/blueprint/itest/JPAInjectionTest.java
      - copied, changed from r916848, incubator/aries/trunk/jpa/jpa-blueprint-itest/src/test/java/org/apache/aries/jpa/blueprint/itest/JPAContainerTest.java
Removed:
    incubator/aries/trunk/jpa/jpa-blueprint-itest/src/test/java/org/apache/aries/jpa/blueprint/itest/JPAContainerTest.java
Modified:
    incubator/aries/trunk/jpa/jpa-blueprint-itest/pom.xml

Modified: incubator/aries/trunk/jpa/jpa-blueprint-itest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-blueprint-itest/pom.xml?rev=916951&r1=916950&r2=916951&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-blueprint-itest/pom.xml (original)
+++ incubator/aries/trunk/jpa/jpa-blueprint-itest/pom.xml Sat Feb 27 13:22:01 2010
@@ -174,7 +174,6 @@
       <groupId>org.apache.aries.jpa</groupId>
       <artifactId>org.apache.aries.jpa.blueprint.itest.bundle</artifactId>
       <version>1.0.0-incubating-SNAPSHOT</version>
-      <scope>test</scope>
     </dependency>
   </dependencies>
   

Copied: incubator/aries/trunk/jpa/jpa-blueprint-itest/src/test/java/org/apache/aries/jpa/blueprint/itest/JPAInjectionTest.java (from r916848, incubator/aries/trunk/jpa/jpa-blueprint-itest/src/test/java/org/apache/aries/jpa/blueprint/itest/JPAContainerTest.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/jpa/jpa-blueprint-itest/src/test/java/org/apache/aries/jpa/blueprint/itest/JPAInjectionTest.java?p2=incubator/aries/trunk/jpa/jpa-blueprint-itest/src/test/java/org/apache/aries/jpa/blueprint/itest/JPAInjectionTest.java&p1=incubator/aries/trunk/jpa/jpa-blueprint-itest/src/test/java/org/apache/aries/jpa/blueprint/itest/JPAContainerTest.java&r1=916848&r2=916951&rev=916951&view=diff
==============================================================================
--- incubator/aries/trunk/jpa/jpa-blueprint-itest/src/test/java/org/apache/aries/jpa/blueprint/itest/JPAContainerTest.java (original)
+++ incubator/aries/trunk/jpa/jpa-blueprint-itest/src/test/java/org/apache/aries/jpa/blueprint/itest/JPAInjectionTest.java Sat Feb 27 13:22:01 2010
@@ -15,16 +15,13 @@
  */
 package org.apache.aries.jpa.blueprint.itest;
 
+import static org.junit.Assert.assertTrue;
 import static org.ops4j.pax.exam.CoreOptions.equinox;
 import static org.ops4j.pax.exam.CoreOptions.options;
 import static org.ops4j.pax.exam.CoreOptions.systemProperty;
 import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
 import static org.ops4j.pax.exam.OptionUtils.combine;
 
-import java.util.Hashtable;
-
-import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.CoreOptions;
@@ -40,12 +37,11 @@
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.Version;
-import org.osgi.service.packageadmin.PackageAdmin;
+import org.osgi.service.blueprint.container.BlueprintContainer;
 import org.osgi.util.tracker.ServiceTracker;
-import org.osgi.service.blueprint.BlueprintContainer;
 
 @RunWith(JUnit4TestRunner.class)
-public class JPAContainerTest {
+public class JPAInjectionTest {
   public static final long DEFAULT_TIMEOUT = 30000;
 
   @Inject
@@ -53,7 +49,12 @@
  
   @Test
   public void findResources() throws Exception {
-    BlueprintContainer bc = getOsgiService(BlueprintContainer.class, "(&(osgi.unit.name=test-unit)(" + PersistenceUnitConstants.CONTAINER_MANAGED_PERSISTENCE_UNIT + "=true))", DEFAULT_TIMEOUT);
+    BlueprintContainer bc = getOsgiService(BlueprintContainer.class, 
+        "(osgi.blueprint.container.symbolicname=org.apache.aries.jpa.blueprint.itest.bundle)", DEFAULT_TIMEOUT);
+    
+    JPATestBean bean = (JPATestBean) bc.getComponentInstance("test");
+    assertTrue("No persistence unit injection", bean.isPUnit());
+    assertTrue("No persistence context injection", bean.isPContext());
   }
 
   @org.ops4j.pax.exam.junit.Configuration