svn commit: r1756597 - in /aries/trunk/tx-control/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests: XAHibernate_5_0_9_Test.java XAJPATransactionTest.java XAOpenJPA_2_4_1_Test.java

Wed, 17 Aug 2016 02:18:08 -0700 

Author: timothyjward
Date: Wed Aug 17 09:17:22 2016
New Revision: 1756597

URL: http://svn.apache.org/viewvc?rev=1756597&view=rev
Log:
[tx-control] Ensure that JPA container snapshots can be reliably used in the 
tests

Modified:
    
aries/trunk/tx-control/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/XAHibernate_5_0_9_Test.java
    
aries/trunk/tx-control/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/XAJPATransactionTest.java
    
aries/trunk/tx-control/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/XAOpenJPA_2_4_1_Test.java

Modified: 
aries/trunk/tx-control/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/XAHibernate_5_0_9_Test.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/XAHibernate_5_0_9_Test.java?rev=1756597&r1=1756596&r2=1756597&view=diff
==============================================================================
--- 
aries/trunk/tx-control/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/XAHibernate_5_0_9_Test.java
 (original)
+++ 
aries/trunk/tx-control/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/XAHibernate_5_0_9_Test.java
 Wed Aug 17 09:17:22 2016
@@ -19,7 +19,9 @@
 package org.apache.aries.tx.control.itests;
 
 import static org.ops4j.pax.exam.CoreOptions.bootClasspathLibrary;
+import static org.ops4j.pax.exam.CoreOptions.composite;
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.repository;
 import static org.ops4j.pax.exam.CoreOptions.systemPackage;
 import static org.ops4j.pax.exam.CoreOptions.systemProperty;
 
@@ -28,8 +30,12 @@ import org.ops4j.pax.exam.Option;
 
 public class XAHibernate_5_0_9_Test extends XAJPATransactionTest {
 
-       protected String ariesJPAVersion() {
-               return "2.5.0-SNAPSHOT";
+       protected Option ariesJPAVersion() {
+               return composite(
+                                   
repository("https://repository.apache.org/content/repositories/snapshots/";)
+                                       
.allowSnapshots().disableReleases().id("Apache Snapshots"),
+                                   mavenBundle("org.apache.aries.jpa", 
"org.apache.aries.jpa.container", "2.5.0-SNAPSHOT")
+                               );
        }
        
        @Override

Modified: 
aries/trunk/tx-control/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/XAJPATransactionTest.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/XAJPATransactionTest.java?rev=1756597&r1=1756596&r2=1756597&view=diff
==============================================================================
--- 
aries/trunk/tx-control/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/XAJPATransactionTest.java
 (original)
+++ 
aries/trunk/tx-control/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/XAJPATransactionTest.java
 Wed Aug 17 09:17:22 2016
@@ -245,7 +245,7 @@ public abstract class XAJPATransactionTe
                                mavenBundle("com.h2database", 
"h2").versionAsInProject(),
                                mavenBundle("org.apache.aries.tx-control", 
"tx-control-provider-jpa-xa").versionAsInProject(),
                                jpaProvider(),
-                               mavenBundle("org.apache.aries.jpa", 
"org.apache.aries.jpa.container", ariesJPAVersion()),
+                               ariesJPAVersion(),
                                mavenBundle("org.apache.felix", 
"org.apache.felix.configadmin").versionAsInProject(),
                                mavenBundle("org.ops4j.pax.logging", 
"pax-logging-api").versionAsInProject(),
                                mavenBundle("org.ops4j.pax.logging", 
"pax-logging-service").versionAsInProject(),
@@ -271,8 +271,8 @@ public abstract class XAJPATransactionTe
                        .build();
        }
 
-       protected String ariesJPAVersion() {
-               return "2.3.0";
+       protected Option ariesJPAVersion() {
+               return mavenBundle("org.apache.aries.jpa", 
"org.apache.aries.jpa.container", "2.3.0");
        }
        
        protected abstract Option jpaProvider();

Modified: 
aries/trunk/tx-control/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/XAOpenJPA_2_4_1_Test.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/tx-control/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/XAOpenJPA_2_4_1_Test.java?rev=1756597&r1=1756596&r2=1756597&view=diff
==============================================================================
--- 
aries/trunk/tx-control/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/XAOpenJPA_2_4_1_Test.java
 (original)
+++ 
aries/trunk/tx-control/tx-control-jpa-itests/src/test/java/org/apache/aries/tx/control/itests/XAOpenJPA_2_4_1_Test.java
 Wed Aug 17 09:17:22 2016
@@ -32,8 +32,8 @@ import org.ops4j.pax.exam.Option;
 public class XAOpenJPA_2_4_1_Test extends XAJPATransactionTest {
 
        @Override
-       protected String ariesJPAVersion() {
-               return "2.4.0";
+       protected Option ariesJPAVersion() {
+               return mavenBundle("org.apache.aries.jpa", 
"org.apache.aries.jpa.container", "2.4.0");
        }
        
        @Override

Reply via email to