Author: gnodet
Date: Fri Dec 14 16:40:08 2012
New Revision: 1421970
URL: http://svn.apache.org/viewvc?rev=1421970&view=rev
Log:
[FELIX-3808] Upgrade ConfigAdmin to pax-exam 2
Removed:
felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/helper/MyTinyBundle.java
Modified:
felix/trunk/configadmin/pom.xml
felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationAdminUpdateStressTest.java
felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationTestBase.java
felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/helper/ManagedServiceFactoryTestActivator.java
felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/helper/ManagedServiceTestActivator.java
Modified: felix/trunk/configadmin/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/configadmin/pom.xml?rev=1421970&r1=1421969&r2=1421970&view=diff
==============================================================================
--- felix/trunk/configadmin/pom.xml (original)
+++ felix/trunk/configadmin/pom.xml Fri Dec 14 16:40:08 2012
@@ -121,28 +121,52 @@
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam</artifactId>
- <version>0.6.0</version>
+ <artifactId>pax-exam-junit4</artifactId>
+ <version>2.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-junit</artifactId>
- <version>0.6.0</version>
+ <artifactId>pax-exam-container-native</artifactId>
+ <version>2.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-container-default</artifactId>
- <version>0.6.0</version>
+ <artifactId>pax-exam-link-mvn</artifactId>
+ <version>2.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.ops4j.pax.swissbox</groupId>
- <artifactId>pax-swissbox-tinybundles</artifactId>
+ <groupId>org.ops4j.pax.url</groupId>
+ <artifactId>pax-url-aether</artifactId>
+ <version>1.5.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.tinybundles</groupId>
+ <artifactId>tinybundles</artifactId>
<version>1.0.0</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <version>1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.7.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>4.0.3</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified:
felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationAdminUpdateStressTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationAdminUpdateStressTest.java?rev=1421970&r1=1421969&r2=1421970&view=diff
==============================================================================
---
felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationAdminUpdateStressTest.java
(original)
+++
felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationAdminUpdateStressTest.java
Fri Dec 14 16:40:08 2012
@@ -70,10 +70,10 @@ public class ConfigurationAdminUpdateStr
// ----------------------- Initialization
-------------------------------------------
@Before
- public void startup( BundleContext context )
+ public void startup()
{
- context.registerService( LogService.class.getName(), this, null );
- _tracker = new ServiceTracker( context,
ConfigurationAdmin.class.getName(), null );
+ bundleContext.registerService( LogService.class.getName(), this, null
);
+ _tracker = new ServiceTracker( bundleContext,
ConfigurationAdmin.class.getName(), null );
_tracker.open();
}
@@ -84,7 +84,7 @@ public class ConfigurationAdminUpdateStr
*/
@After
- public void tearDown( BundleContext context )
+ public void tearDown()
{
_tracker.close();
}
@@ -143,12 +143,12 @@ public class ConfigurationAdminUpdateStr
// --------------------------- CM Update stress test
-------------------------------------
@Test
- public void testCMUpdateStress( BundleContext context )
+ public void testCMUpdateStress()
{
_testLatch = new CountDownLatch( 1 );
try
{
- CreateUpdateStress stress = new CreateUpdateStress( context );
+ CreateUpdateStress stress = new CreateUpdateStress( bundleContext
);
stress.start();
if ( !_testLatch.await( 15, TimeUnit.SECONDS ) )
@@ -312,4 +312,4 @@ public class ConfigurationAdminUpdateStr
_testLatch.countDown(); // Notify that our test is done
}
}
-}
\ No newline at end of file
+}
Modified:
felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationTestBase.java
URL:
http://svn.apache.org/viewvc/felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationTestBase.java?rev=1421970&r1=1421969&r2=1421970&view=diff
==============================================================================
---
felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationTestBase.java
(original)
+++
felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/ConfigurationTestBase.java
Fri Dec 14 16:40:08 2012
@@ -19,10 +19,6 @@
package org.apache.felix.cm.integration;
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.CoreOptions.options;
-import static org.ops4j.pax.exam.CoreOptions.provision;
-import static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartup;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -38,16 +34,18 @@ import junit.framework.TestCase;
import org.apache.felix.cm.integration.helper.BaseTestActivator;
import org.apache.felix.cm.integration.helper.ManagedServiceTestActivator;
-import org.apache.felix.cm.integration.helper.MyTinyBundle;
import org.apache.felix.cm.integration.helper.UpdateThreadSignalTask;
import org.junit.After;
import org.junit.Before;
+
+import javax.inject.Inject;
+
import org.ops4j.pax.exam.CoreOptions;
-import org.ops4j.pax.exam.Inject;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.OptionUtils;
-import org.ops4j.pax.exam.container.def.PaxRunnerOptions;
-import org.ops4j.pax.swissbox.tinybundles.core.TinyBundles;
+import org.ops4j.pax.exam.TestProbeBuilder;
+import org.ops4j.pax.exam.junit.ProbeBuilder;
+import org.ops4j.pax.tinybundles.core.TinyBundles;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
@@ -58,6 +56,8 @@ import org.osgi.service.cm.Configuration
import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.util.tracker.ServiceTracker;
+import static org.ops4j.pax.exam.CoreOptions.*;
+
public abstract class ConfigurationTestBase
{
@@ -107,15 +107,14 @@ public abstract class ConfigurationTestB
}
final Option[] base = options(
- /* CoreOptions.allFrameworks(), */
- provision(
- CoreOptions.bundle( bundleFile.toURI().toString() ),
- mavenBundle( "org.ops4j.pax.swissbox",
"pax-swissbox-tinybundles", "1.0.0" )
- ),
- waitForFrameworkStartup()
+ workingDirectory("target/paxexam/"),
+ cleanCaches(true),
+ junitBundles(),
+ mavenBundle("org.ops4j.pax.tinybundles", "tinybundles",
"1.0.0"),
+ bundle(bundleFile.toURI().toString())
);
- final Option vmOption = ( paxRunnerVmOption != null ) ?
PaxRunnerOptions.vmOption( paxRunnerVmOption ) : null;
- return OptionUtils.combine( base, vmOption );
+ final Option option = ( paxRunnerVmOption != null ) ? vmOption(
paxRunnerVmOption ) : null;
+ return OptionUtils.combine( base, option );
}
@@ -157,19 +156,22 @@ public abstract class ConfigurationTestB
}
+ @ProbeBuilder
+ public TestProbeBuilder buildProbe( TestProbeBuilder builder ) {
+ return builder.setHeader(Constants.EXPORT_PACKAGE,
"org.apache.felix.cm.integration.helper");
+ }
+
protected Bundle installBundle( final String pid, final Class<?>
activatorClass, final String location )
throws BundleException
{
final String activatorClassName = activatorClass.getName();
- final InputStream bundleStream = new MyTinyBundle()
- .prepare(
- TinyBundles.withBnd()
- .set( Constants.BUNDLE_SYMBOLICNAME, activatorClassName )
+ final InputStream bundleStream = TinyBundles.bundle()
+ .set(Constants.BUNDLE_SYMBOLICNAME, activatorClassName)
.set( Constants.BUNDLE_VERSION, "0.0.11" )
.set( Constants.IMPORT_PACKAGE,
"org.apache.felix.cm.integration.helper" )
.set( Constants.BUNDLE_ACTIVATOR, activatorClassName )
.set( BaseTestActivator.HEADER_PID, pid )
- ).build( TinyBundles.asStream() );
+ .build( TinyBundles.withBnd() );
try
{
Modified:
felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/helper/ManagedServiceFactoryTestActivator.java
URL:
http://svn.apache.org/viewvc/felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/helper/ManagedServiceFactoryTestActivator.java?rev=1421970&r1=1421969&r2=1421970&view=diff
==============================================================================
---
felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/helper/ManagedServiceFactoryTestActivator.java
(original)
+++
felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/helper/ManagedServiceFactoryTestActivator.java
Fri Dec 14 16:40:08 2012
@@ -21,8 +21,8 @@ package org.apache.felix.cm.integration.
import java.util.Dictionary;
-import org.ops4j.pax.swissbox.tinybundles.dp.Constants;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.cm.ManagedServiceFactory;
Modified:
felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/helper/ManagedServiceTestActivator.java
URL:
http://svn.apache.org/viewvc/felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/helper/ManagedServiceTestActivator.java?rev=1421970&r1=1421969&r2=1421970&view=diff
==============================================================================
---
felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/helper/ManagedServiceTestActivator.java
(original)
+++
felix/trunk/configadmin/src/test/java/org/apache/felix/cm/integration/helper/ManagedServiceTestActivator.java
Fri Dec 14 16:40:08 2012
@@ -21,8 +21,8 @@ package org.apache.felix.cm.integration.
import java.util.Dictionary;
-import org.ops4j.pax.swissbox.tinybundles.dp.Constants;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.cm.ManagedService;
