Modified: aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java?rev=1144949&r1=1144948&r2=1144949&view=diff ============================================================================== --- aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java (original) +++ aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/AbstractIntegrationTest.java Sun Jul 10 20:05:08 2011 @@ -20,69 +20,22 @@ package org.apache.aries.transaction.ite import static org.ops4j.pax.exam.CoreOptions.bootDelegationPackages; 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 static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption; -import org.ops4j.pax.exam.container.def.PaxRunnerOptions; -import org.ops4j.pax.exam.container.def.options.VMOption; -import org.ops4j.pax.exam.options.TimeoutOption; - - -import java.util.ArrayList; -import java.util.List; +import static org.apache.aries.itest.ExtraOptions.*; -import org.junit.After; -import org.junit.Before; +import org.ops4j.pax.exam.container.def.PaxRunnerOptions; import org.junit.runner.RunWith; -import org.ops4j.pax.exam.CoreOptions; -import org.ops4j.pax.exam.Inject; import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.JUnit4TestRunner; -import org.ops4j.pax.exam.options.MavenArtifactProvisionOption; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.Constants; -import org.osgi.framework.Filter; -import org.osgi.framework.FrameworkUtil; -import org.osgi.framework.InvalidSyntaxException; -import org.osgi.framework.Version; -import org.osgi.util.tracker.ServiceTracker; @RunWith(JUnit4TestRunner.class) -public abstract class AbstractIntegrationTest { - - public static final long DEFAULT_TIMEOUT = 60000; -// public static final long DEFAULT_TIMEOUT = 0; - - private List<ServiceTracker> srs; - - @Before - public void setUp() { - srs = new ArrayList<ServiceTracker>(); - } - - @After - public void tearDown() throws Exception { - closeServiceTrackers(); - } - - private void closeServiceTrackers() { - for (ServiceTracker st : srs) { - if (st != null) { - st.close(); - } - } - } - - @Inject - protected BundleContext bundleContext; +public abstract class AbstractIntegrationTest extends org.apache.aries.itest.AbstractIntegrationTest { @org.ops4j.pax.exam.junit.Configuration public static Option[] configuration() { - Option[] options = options( + return testOptions( bootDelegationPackages("javax.transaction", "javax.transaction.*"), vmOption("-Dorg.osgi.framework.system.packages=javax.accessibility,javax.activation,javax.activity,javax.annotation,javax.annotation.processing,javax.crypto,javax.crypto.interfaces,javax.crypto.spec,javax.imageio,javax.imageio.event,javax.imageio.metadata,javax.imageio.plugins.bmp,javax.imageio.plugins.jpeg,javax.imageio.spi,javax.imageio.stream,javax.jws,javax.jws.soap,javax.lang.model,javax.lang.model.element,javax.lang.model.type,javax.lang.model.util,javax.management,javax.management.loading,javax.management.modelmbean,javax.management.monitor,javax.management.openmbean,javax.management.relation,javax.management.remote,javax.management.remote.rmi,javax.management.timer,javax.naming,javax.naming.directory,javax.naming.event,javax.naming.ldap,javax.naming.spi,javax.net,javax.net.ssl,javax.print,javax.print.attribute,javax.print.attribute.standard,javax.print.event,javax.rmi,javax.rmi.CORBA,javax.rmi.ssl,javax.script,javax.security.auth,javax.security.auth.c allback,javax.security.auth.kerberos,javax.security.auth.login,javax.security.auth.spi,javax.security.auth.x500,javax.security.cert,javax.security.sasl,javax.sound.midi,javax.sound.midi.spi,javax.sound.sampled,javax.sound.sampled.spi,javax.sql,javax.sql.rowset,javax.sql.rowset.serial,javax.sql.rowset.spi,javax.swing,javax.swing.border,javax.swing.colorchooser,javax.swing.event,javax.swing.filechooser,javax.swing.plaf,javax.swing.plaf.basic,javax.swing.plaf.metal,javax.swing.plaf.multi,javax.swing.plaf.synth,javax.swing.table,javax.swing.text,javax.swing.text.html,javax.swing.text.html.parser,javax.swing.text.rtf,javax.swing.tree,javax.swing.undo,javax.tools,javax.xml,javax.xml.bind,javax.xml.bind.annotation,javax.xml.bind.annotation.adapters,javax.xml.bind.attachment,javax.xml.bind.helpers,javax.xml.bind.util,javax.xml.crypto,javax.xml.crypto.dom,javax.xml.crypto.dsig,javax.xml.crypto.dsig.dom,javax.xml.crypto.dsig.keyinfo,javax.xml.crypto.dsig.spec,javax.xml.datatype,javax. xml.namespace,javax.xml.parsers,javax.xml.soap,javax.xml.stream,javax.xml.stream.events,javax.xml.stream.util,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.sax,javax.xml.transform.stax,javax.xml.transform.stream,javax.xml.validation,javax.xml.ws,javax.xml.ws.handler,javax.xml.ws.handler.soap,javax.xml.ws.http,javax.xml.ws.soap,javax.xml.ws.spi,javax.xml.xpath,org.ietf.jgss,org.omg.CORBA,org.omg.CORBA.DynAnyPackage,org.omg.CORBA.ORBPackage,org.omg.CORBA.TypeCodePackage,org.omg.CORBA.portable,org.omg.CORBA_2_3,org.omg.CORBA_2_3.portable,org.omg.CosNaming,org.omg.CosNaming.NamingContextExtPackage,org.omg.CosNaming.NamingContextPackage,org.omg.Dynamic,org.omg.DynamicAny,org.omg.DynamicAny.DynAnyFactoryPackage,org.omg.DynamicAny.DynAnyPackage,org.omg.IOP,org.omg.IOP.CodecFactoryPackage,org.omg.IOP.CodecPackage,org.omg.Messaging,org.omg.PortableInterceptor,org.omg.PortableInterceptor.ORBInitInfoPackage,org.omg.PortableServer,org.omg.PortableServer.CurrentPackage, org.omg.PortableServer.POAManagerPackage,org.omg.PortableServer.POAPackage,org.omg.PortableServer.ServantLocatorPackage,org.omg.PortableServer.portable,org.omg.SendingContext,org.omg.stub.java.rmi,org.w3c.dom,org.w3c.dom.bootstrap,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.html,org.w3c.dom.ls,org.w3c.dom.ranges,org.w3c.dom.stylesheets,org.w3c.dom.traversal,org.w3c.dom.views,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers,javax.transaction;partial=true;mandatory:=partial,javax.transaction.xa;partial=true;mandatory:=partial"), @@ -114,95 +67,5 @@ public abstract class AbstractIntegratio equinox().version("3.5.0"), equinox().version("3.7.0.v20110304")); - options = updateOptions(options); - return options; } - - protected static MavenArtifactProvisionOption mavenBundle(String groupId, String artifactId) { - return CoreOptions.mavenBundle().groupId(groupId).artifactId(artifactId) - .versionAsInProject(); - } - - protected Bundle getBundle(String symbolicName) { - return getBundle(symbolicName, null); - } - - protected Bundle getBundle(String bundleSymbolicName, String version) { - Bundle result = null; - for (Bundle b : bundleContext.getBundles()) { - if (b.getSymbolicName().equals(bundleSymbolicName)) { - if (version == null - || b.getVersion().equals(Version.parseVersion(version))) { - result = b; - break; - } - } - } - return result; - } - - protected static Option[] updateOptions(Option[] options) { - // We need to add pax-exam-junit here when running with the ibm - // jdk to avoid the following exception during the test run: - // ClassNotFoundException: org.ops4j.pax.exam.junit.Configuration - if ("IBM Corporation".equals(System.getProperty("java.vendor"))) { - Option[] ibmOptions = options(wrappedBundle(mavenBundle( - "org.ops4j.pax.exam", "pax-exam-junit"))); - options = combine(ibmOptions, options); - } - - return options; - } - - protected <T> T getOsgiService(Class<T> type, long timeout) { - return getOsgiService(type, null, timeout); - } - - protected <T> T getOsgiService(Class<T> type) { - return getOsgiService(type, null, DEFAULT_TIMEOUT); - } - - protected <T> T getOsgiService(Class<T> type, String filter, long timeout) { - return getOsgiService(null, type, filter, timeout); - } - - protected <T> T getOsgiService(BundleContext bc, Class<T> type, - String filter, long timeout) { - // close out all service trackers - closeServiceTrackers(); - - ServiceTracker tracker = null; - try { - String flt; - if (filter != null) { - if (filter.startsWith("(")) { - flt = "(&(" + Constants.OBJECTCLASS + "=" + type.getName() - + ")" + filter + ")"; - } else { - flt = "(&(" + Constants.OBJECTCLASS + "=" + type.getName() - + ")(" + filter + "))"; - } - } else { - flt = "(" + Constants.OBJECTCLASS + "=" + type.getName() + ")"; - } - Filter osgiFilter = FrameworkUtil.createFilter(flt); - tracker = new ServiceTracker(bc == null ? bundleContext : bc, - osgiFilter, null); - tracker.open(); - - // add tracker to the list of trackers we close at tear down - srs.add(tracker); - - Object svc = type.cast(tracker.waitForService(timeout)); - if (svc == null) { - throw new RuntimeException("Gave up waiting for service " + flt); - } - return type.cast(svc); - } catch (InvalidSyntaxException e) { - throw new IllegalArgumentException("Invalid filter", e); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } - } - } \ No newline at end of file
Modified: aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/InvalidTranAttributeTest.java URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/InvalidTranAttributeTest.java?rev=1144949&r1=1144948&r2=1144949&view=diff ============================================================================== --- aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/InvalidTranAttributeTest.java (original) +++ aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/InvalidTranAttributeTest.java Sun Jul 10 20:05:08 2011 @@ -24,7 +24,7 @@ public class InvalidTranAttributeTest ex @Test public void testInvalid() throws Exception { - TestBean bean = getOsgiService(TestBean.class, "(tranAttribute=Invalid)", DEFAULT_TIMEOUT); + TestBean bean = context().getService(TestBean.class, "(tranAttribute=Invalid)"); //Test without client transaction - an exception is thrown because the bean is not //configured correctly, i.e. multiple transaction elements match to the same method Modified: aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/MandatoryTranAttributeTest.java URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/MandatoryTranAttributeTest.java?rev=1144949&r1=1144948&r2=1144949&view=diff ============================================================================== --- aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/MandatoryTranAttributeTest.java (original) +++ aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/MandatoryTranAttributeTest.java Sun Jul 10 20:05:08 2011 @@ -30,8 +30,8 @@ public class MandatoryTranAttributeTest @Test public void testMandatory() throws Exception { - TestBean bean = getOsgiService(TestBean.class, "(tranAttribute=Mandatory)", DEFAULT_TIMEOUT); - UserTransaction tran = getOsgiService(UserTransaction.class); + TestBean bean = context().getService(TestBean.class, "(tranAttribute=Mandatory)"); + UserTransaction tran = context().getService(UserTransaction.class); //Test with client transaction - the user transaction is used to insert a row int initialRows = bean.countRows(); Modified: aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/NeverTranAttributeTest.java URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/NeverTranAttributeTest.java?rev=1144949&r1=1144948&r2=1144949&view=diff ============================================================================== --- aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/NeverTranAttributeTest.java (original) +++ aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/NeverTranAttributeTest.java Sun Jul 10 20:05:08 2011 @@ -27,8 +27,8 @@ public class NeverTranAttributeTest exte @Test public void testNever() throws Exception { - TestBean bean = getOsgiService(TestBean.class, "(tranAttribute=Never)", DEFAULT_TIMEOUT); - UserTransaction tran = getOsgiService(UserTransaction.class); + TestBean bean = context().getService(TestBean.class, "(tranAttribute=Never)"); + UserTransaction tran = context().getService(UserTransaction.class); //Test with client transaction - an exception is thrown because transactions are not allowed int initialRows = bean.countRows(); Modified: aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/NotSupportedTranAttributeTest.java URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/NotSupportedTranAttributeTest.java?rev=1144949&r1=1144948&r2=1144949&view=diff ============================================================================== --- aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/NotSupportedTranAttributeTest.java (original) +++ aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/NotSupportedTranAttributeTest.java Sun Jul 10 20:05:08 2011 @@ -29,9 +29,9 @@ public class NotSupportedTranAttributeTe @Test public void testNotSupported() throws Exception { - TestBean nsBean = getOsgiService(TestBean.class, "(tranAttribute=NotSupported)", DEFAULT_TIMEOUT); - TestBean rBean = getOsgiService(TestBean.class, "(tranAttribute=Required)", DEFAULT_TIMEOUT); - UserTransaction tran = getOsgiService(UserTransaction.class); + TestBean nsBean = context().getService(TestBean.class, "(tranAttribute=NotSupported)"); + TestBean rBean = context().getService(TestBean.class, "(tranAttribute=Required)"); + UserTransaction tran = context().getService(UserTransaction.class); //Test with client transaction - the insert fails because the bean delegates to another //bean with a transaction strategy of Mandatory, and no transaction is available, i.e. Modified: aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/RequiredTranAttributeTest.java URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/RequiredTranAttributeTest.java?rev=1144949&r1=1144948&r2=1144949&view=diff ============================================================================== --- aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/RequiredTranAttributeTest.java (original) +++ aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/RequiredTranAttributeTest.java Sun Jul 10 20:05:08 2011 @@ -30,8 +30,8 @@ public class RequiredTranAttributeTest e @Test public void testRequired() throws Exception { - TestBean bean = getOsgiService(TestBean.class, "(tranAttribute=Required)", DEFAULT_TIMEOUT); - UserTransaction tran = getOsgiService(UserTransaction.class); + TestBean bean = context().getService(TestBean.class, "(tranAttribute=Required)"); + UserTransaction tran = context().getService(UserTransaction.class); //Test with client transaction - the user transaction is used to insert a row int initialRows = bean.countRows(); Modified: aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/RequiresNewTranAttributeTest.java URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/RequiresNewTranAttributeTest.java?rev=1144949&r1=1144948&r2=1144949&view=diff ============================================================================== --- aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/RequiresNewTranAttributeTest.java (original) +++ aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/RequiresNewTranAttributeTest.java Sun Jul 10 20:05:08 2011 @@ -28,9 +28,9 @@ public class RequiresNewTranAttributeTes @Test public void testRequiresNew() throws Exception { - TestBean rnBean = getOsgiService(TestBean.class, "(tranAttribute=RequiresNew)", DEFAULT_TIMEOUT); - TestBean rBean = getOsgiService(TestBean.class, "(tranAttribute=Required)", DEFAULT_TIMEOUT); - UserTransaction tran = getOsgiService(UserTransaction.class); + TestBean rnBean = context().getService(TestBean.class, "(tranAttribute=RequiresNew)"); + TestBean rBean = context().getService(TestBean.class, "(tranAttribute=Required)"); + UserTransaction tran = context().getService(UserTransaction.class); //Test with client transaction - a container transaction is used to insert the row int initialRows = rnBean.countRows(); Modified: aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/SupportsTranAttributeTest.java URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/SupportsTranAttributeTest.java?rev=1144949&r1=1144948&r2=1144949&view=diff ============================================================================== --- aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/SupportsTranAttributeTest.java (original) +++ aries/trunk/transaction/transaction-itests/src/test/java/org/apache/aries/transaction/itests/SupportsTranAttributeTest.java Sun Jul 10 20:05:08 2011 @@ -30,8 +30,8 @@ public class SupportsTranAttributeTest e @Test public void testSupports() throws Exception { - TestBean bean = getOsgiService(TestBean.class, "(tranAttribute=Supports)", DEFAULT_TIMEOUT); - UserTransaction tran = getOsgiService(UserTransaction.class); + TestBean bean = context().getService(TestBean.class, "(tranAttribute=Supports)"); + UserTransaction tran = context().getService(UserTransaction.class); //Test with client transaction - the insert succeeds because the bean delegates to //another bean with a transaction strategy of Mandatory, and the user transaction
