You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pd...@apache.org on 2013/10/14 21:35:04 UTC
svn commit: r1532034 - in /felix/trunk/dependencymanager:
test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/
test/src/test/java/org/apache/felix/dm/test/annotation/
test2/src/main/java/org/apache/felix/dependencymanager/test2/comp...
Author: pderop
Date: Mon Oct 14 19:35:03 2013
New Revision: 1532034
URL: http://svn.apache.org/r1532034
Log:
pax-exam 3.0.0 migration ...
Added:
felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AdapterServiceTestWithPublisher.java
- copied, changed from r1531934, felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/AdapterServiceTestWithPublisher.java
felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/BundleAdapterServiceTestWithPublisher.java
- copied, changed from r1531934, felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/BundleAdapterServiceTestWithPublisher.java
felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryConfigurationAdapterServiceTestWithPublisher.java
- copied, changed from r1531934, felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/FactoryConfigurationAdapterServiceTestWithPublisher.java
felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryServiceTestWthPublisher.java
- copied, changed from r1531934, felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/FactoryServiceTestWthPublisher.java
felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ResourceAdapterServiceTestWithPublisher.java
- copied, changed from r1531934, felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/ResourceAdapterServiceTestWithPublisher.java
felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ServiceTestWthPublisher.java
- copied, changed from r1531934, felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/ServiceTestWthPublisher.java
felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/Utils.java
- copied, changed from r1531934, felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/Utils.java
felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/PublisherAnnotationTest.java
- copied, changed from r1531934, felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/PublisherAnnotationTest.java
Removed:
felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/AdapterServiceTestWithPublisher.java
felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/BundleAdapterServiceTestWithPublisher.java
felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/FactoryConfigurationAdapterServiceTestWithPublisher.java
felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/FactoryServiceTestWthPublisher.java
felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/ResourceAdapterServiceTestWithPublisher.java
felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/ServiceTestWthPublisher.java
felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/Utils.java
felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/PublisherAnnotationTest.java
Modified:
felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraAdapterServiceProperties.java
felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraAspectServiceProperties.java
felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraFactoryServiceProperties.java
felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraServiceProperties.java
felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ExtraServicePropertiesTest.java
Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AdapterServiceTestWithPublisher.java (from r1531934, felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/AdapterServiceTestWithPublisher.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AdapterServiceTestWithPublisher.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AdapterServiceTestWithPublisher.java&p1=felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/AdapterServiceTestWithPublisher.java&r1=1531934&r2=1532034&rev=1532034&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/AdapterServiceTestWithPublisher.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AdapterServiceTestWithPublisher.java Mon Oct 14 19:35:03 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dm.test.bundle.annotation.publisher;
+package org.apache.felix.dependencymanager.test2.components;
import java.util.HashMap;
import java.util.Map;
@@ -28,99 +28,93 @@ import org.apache.felix.dm.annotation.ap
import org.apache.felix.dm.annotation.api.Property;
import org.apache.felix.dm.annotation.api.ServiceDependency;
import org.apache.felix.dm.annotation.api.Start;
-import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
/**
* Test an AdapterService which provides its interface using a @ServiceLifecycle.
*/
-public class AdapterServiceTestWithPublisher
-{
- public interface Provider
- {
+public class AdapterServiceTestWithPublisher {
+ public static final String ENSURE = "AdapterServiceTestWithPublisher";
+
+ public interface Provider {
}
- public interface Provider2
- {
+ public interface Provider2 {
}
@Component
- public static class Consumer
- {
- @ServiceDependency(filter="(name=AdapterServiceTestWithPublisher)")
- Sequencer m_sequencer;
-
- @ServiceDependency(required=false, removed = "unbind")
- void bind(Map properties, Provider2 provider)
- {
+ public static class Consumer {
+ @ServiceDependency(filter = "(name=" + ENSURE + ")")
+ volatile Ensure m_sequencer;
+
+ @ServiceDependency(required = false, removed = "unbind")
+ void bind(Map properties, Provider2 provider) {
m_sequencer.step(1);
// check ProviderImpl properties
- if ("bar".equals(properties.get("foo")))
- {
+ if ("bar".equals(properties.get("foo"))) {
m_sequencer.step(2);
}
// check extra ProviderImpl properties (returned by start method)
- if ("bar2".equals(properties.get("foo2")))
- {
+ if ("bar2".equals(properties.get("foo2"))) {
m_sequencer.step(3);
}
// check Provider2Impl properties
- if ("bar3".equals(properties.get("foo3")))
- {
+ if ("bar3".equals(properties.get("foo3"))) {
m_sequencer.step(4);
}
// check extra Provider2Impl properties (returned by start method)
- if ("bar4".equals(properties.get("foo4")))
- {
+ if ("bar4".equals(properties.get("foo4"))) {
m_sequencer.step(5);
}
}
- void unbind(Provider2 provider)
- {
+ void unbind(Provider2 provider) {
m_sequencer.step(6);
}
}
-
- @Component(properties={@Property(name="foo", value="bar")})
- public static class ProviderImpl implements Provider
- {
+
+ @Component(properties = {@Property(name = "foo", value = "bar")})
+ public static class ProviderImpl implements Provider {
@Start
- Map start()
- {
+ Map start() {
// Add some extra service properties ... they will be appended to the one we have defined
// in the @Service annotation.
- return new HashMap() {{ put("foo2", "bar2"); }};
+ return new HashMap() {
+ {
+ put("foo2", "bar2");
+ }
+ };
}
}
- @AdapterService(properties={@Property(name="foo3", value="bar3")}, adapteeService=Provider.class)
- public static class Provider2Impl implements Provider2
- {
+ @AdapterService(properties = {@Property(name = "foo3", value = "bar3")}, adapteeService = Provider.class)
+ public static class Provider2Impl implements Provider2 {
@LifecycleController
- Runnable m_publisher; // injected and used to register our service
-
- @LifecycleController(start=false)
- Runnable m_unpublisher; // injected and used to unregister our service
-
- @ServiceDependency(filter="(name=AdapterServiceTestWithPublisher)")
- Sequencer m_sequencer;
+ volatile Runnable m_publisher; // injected and used to register our service
+
+ @LifecycleController(start = false)
+ volatile Runnable m_unpublisher; // injected and used to unregister our service
+
+ @ServiceDependency(filter = "(name=" + ENSURE + ")")
+ volatile Ensure m_sequencer;
@Init
- void init()
- {
+ void init() {
// register service in 1 second
Utils.schedule(m_publisher, 1000);
// unregister the service in 2 seconds
Utils.schedule(m_unpublisher, 2000);
}
-
+
@Start
- Map start()
- {
+ Map start() {
// Add some extra service properties ... they will be appended to the one we have defined
// in the @Service annotation.
- return new HashMap() {{ put("foo4", "bar4"); }};
+ return new HashMap() {
+ {
+ put("foo4", "bar4");
+ }
+ };
}
}
}
Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/BundleAdapterServiceTestWithPublisher.java (from r1531934, felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/BundleAdapterServiceTestWithPublisher.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/BundleAdapterServiceTestWithPublisher.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/BundleAdapterServiceTestWithPublisher.java&p1=felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/BundleAdapterServiceTestWithPublisher.java&r1=1531934&r2=1532034&rev=1532034&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/BundleAdapterServiceTestWithPublisher.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/BundleAdapterServiceTestWithPublisher.java Mon Oct 14 19:35:03 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dm.test.bundle.annotation.publisher;
+package org.apache.felix.dependencymanager.test2.components;
import java.util.HashMap;
import java.util.Map;
@@ -28,41 +28,35 @@ import org.apache.felix.dm.annotation.ap
import org.apache.felix.dm.annotation.api.Property;
import org.apache.felix.dm.annotation.api.ServiceDependency;
import org.apache.felix.dm.annotation.api.Start;
-import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
import org.osgi.framework.Bundle;
/**
* Test a BundleAdapterService which provides its interface using a @ServiceLifecycle.
*/
-public class BundleAdapterServiceTestWithPublisher
-{
- public interface Provider
- {
+public class BundleAdapterServiceTestWithPublisher {
+ public static final String ENSURE = "BundleAdapterServiceTestWithPublisher";
+
+ public interface Provider {
}
@Component
- public static class Consumer
- {
- @ServiceDependency(filter="(name=BundleAdapterServiceTestWithPublisher)")
- Sequencer m_sequencer;
-
- @ServiceDependency(required=false, removed = "unbind")
- void bind(Map properties, Provider provider)
- {
+ public static class Consumer {
+ @ServiceDependency(filter = "(name=" + ENSURE + ")")
+ volatile Ensure m_sequencer;
+
+ @ServiceDependency(required = false, removed = "unbind")
+ void bind(Map properties, Provider provider) {
m_sequencer.step(1);
// check ProviderImpl properties
- if ("bar".equals(properties.get("foo")))
- {
+ if ("bar".equals(properties.get("foo"))) {
m_sequencer.step(2);
}
// check extra ProviderImpl properties (returned by start method)
- if ("bar2".equals(properties.get("foo2")))
- {
+ if ("bar2".equals(properties.get("foo2"))) {
m_sequencer.step(3);
}
// check properties propagated from bundle
- if ("org.apache.felix.dependencymanager".equals(properties.get("Bundle-SymbolicName")))
- {
+ if ("org.apache.felix.dependencymanager".equals(properties.get("Bundle-SymbolicName"))) {
m_sequencer.step(4);
} else {
Thread.dumpStack();
@@ -70,42 +64,40 @@ public class BundleAdapterServiceTestWit
}
}
- void unbind(Provider provider)
- {
+ void unbind(Provider provider) {
m_sequencer.step(5);
}
}
-
- @BundleAdapterService(properties={@Property(name="foo", value="bar")},
- filter = "(Bundle-SymbolicName=org.apache.felix.dependencymanager)",
- stateMask = Bundle.INSTALLED | Bundle.RESOLVED | Bundle.ACTIVE,
- propagate = true)
- public static class ProviderImpl implements Provider
- {
+
+ @BundleAdapterService(properties = {@Property(name = "foo", value = "bar")}, filter = "(Bundle-SymbolicName=org.apache.felix.dependencymanager)", stateMask = Bundle.INSTALLED
+ | Bundle.RESOLVED | Bundle.ACTIVE, propagate = true)
+ public static class ProviderImpl implements Provider {
@LifecycleController
- Runnable m_publisher; // injected and used to register our service
-
- @LifecycleController(start=false)
- Runnable m_unpublisher; // injected and used to unregister our service
-
- @ServiceDependency(filter="(name=BundleAdapterServiceTestWithPublisher)")
- Sequencer m_sequencer;
+ volatile Runnable m_publisher; // injected and used to register our service
+
+ @LifecycleController(start = false)
+ volatile Runnable m_unpublisher; // injected and used to unregister our service
+
+ @ServiceDependency(filter = "(name=" + ENSURE + ")")
+ volatile Ensure m_sequencer;
@Init
- void init()
- {
+ void init() {
// register service in 1 second
Utils.schedule(m_publisher, 1000);
// unregister the service in 2 seconds
Utils.schedule(m_unpublisher, 2000);
}
-
+
@Start
- Map start()
- {
+ Map start() {
// Add some extra service properties ... they will be appended to the one we have defined
// in the @Service annotation.
- return new HashMap() {{ put("foo2", "bar2"); }};
+ return new HashMap() {
+ {
+ put("foo2", "bar2");
+ }
+ };
}
}
}
Modified: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraAdapterServiceProperties.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraAdapterServiceProperties.java?rev=1532034&r1=1532033&r2=1532034&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraAdapterServiceProperties.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraAdapterServiceProperties.java Mon Oct 14 19:35:03 2013
@@ -32,6 +32,8 @@ import org.apache.felix.dm.annotation.ap
* from it's start callback
*/
public class ExtraAdapterServiceProperties {
+ public final static String ENSURE = "ExtraAdapterServiceProperties";
+
public interface Provider {
}
@@ -58,7 +60,7 @@ public class ExtraAdapterServiceProperti
@Component
public static class Consumer {
- @ServiceDependency(filter = "(name=testExtraAdapterServiceProperties)")
+ @ServiceDependency(filter = "(name=" + ENSURE + ")")
volatile Ensure m_sequencer;
private volatile Map m_properties;
Modified: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraAspectServiceProperties.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraAspectServiceProperties.java?rev=1532034&r1=1532033&r2=1532034&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraAspectServiceProperties.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraAspectServiceProperties.java Mon Oct 14 19:35:03 2013
@@ -32,6 +32,8 @@ import org.apache.felix.dm.annotation.ap
* from it's start callback
*/
public class ExtraAspectServiceProperties {
+ public final static String ENSURE = "ExtraAspectServiceProperties";
+
public interface Provider {
}
@@ -53,7 +55,7 @@ public class ExtraAspectServicePropertie
@Component
public static class Consumer {
- @ServiceDependency(filter = "(name=testExtraAspectServiceProperties)")
+ @ServiceDependency(filter = "(name=" + ENSURE + ")")
volatile Ensure m_sequencer;
private volatile Map m_properties;
Modified: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraFactoryServiceProperties.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraFactoryServiceProperties.java?rev=1532034&r1=1532033&r2=1532034&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraFactoryServiceProperties.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraFactoryServiceProperties.java Mon Oct 14 19:35:03 2013
@@ -30,10 +30,13 @@ import org.apache.felix.dm.annotation.ap
import org.apache.felix.dm.annotation.api.Start;
public class ExtraFactoryServiceProperties {
+ public final static String FACTORYSET = "ExtraFactoryServiceProperties.FACTORYSET";
+ public final static String ENSURE = "ExtraFactoryServiceProperties";
+
public interface Provider {
}
- @Component(properties = {@Property(name = "foo", value = "bar")}, factorySet = "MyFactory")
+ @Component(properties = {@Property(name = "foo", value = "bar")}, factorySet = FACTORYSET)
public static class ProviderImpl implements Provider {
@Start
Map<String, String> start() {
@@ -47,7 +50,7 @@ public class ExtraFactoryServiceProperti
@Component
public static class ProviderImplFactory {
- @ServiceDependency
+ @ServiceDependency(filter = "(" + Component.FACTORY_NAME + "=" + FACTORYSET + ")")
volatile Set<Dictionary> m_factory;
@Start
@@ -62,7 +65,7 @@ public class ExtraFactoryServiceProperti
@Component
public static class Consumer {
- @ServiceDependency(filter = "(name=testExtraFactoryServiceProperties)")
+ @ServiceDependency(filter = "(name=" + ENSURE + ")")
volatile Ensure m_sequencer;
private volatile Map m_properties;
Modified: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraServiceProperties.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraServiceProperties.java?rev=1532034&r1=1532033&r2=1532034&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraServiceProperties.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraServiceProperties.java Mon Oct 14 19:35:03 2013
@@ -31,6 +31,8 @@ import org.apache.felix.dm.annotation.ap
* from it's start callback
*/
public class ExtraServiceProperties {
+ public final static String ENSURE = "ExtraServiceProperties";
+
public interface Provider {
}
@@ -48,7 +50,7 @@ public class ExtraServiceProperties {
@Component
public static class Consumer {
- @ServiceDependency(filter = "(name=testExtraServiceProperties)")
+ @ServiceDependency(filter = "(name=" + ENSURE + ")")
volatile Ensure m_sequencer;
private volatile Map m_properties;
Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryConfigurationAdapterServiceTestWithPublisher.java (from r1531934, felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/FactoryConfigurationAdapterServiceTestWithPublisher.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryConfigurationAdapterServiceTestWithPublisher.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryConfigurationAdapterServiceTestWithPublisher.java&p1=felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/FactoryConfigurationAdapterServiceTestWithPublisher.java&r1=1531934&r2=1532034&rev=1532034&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/FactoryConfigurationAdapterServiceTestWithPublisher.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryConfigurationAdapterServiceTestWithPublisher.java Mon Oct 14 19:35:03 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dm.test.bundle.annotation.publisher;
+package org.apache.felix.dependencymanager.test2.components;
import java.io.IOException;
import java.util.Dictionary;
@@ -31,93 +31,90 @@ import org.apache.felix.dm.annotation.ap
import org.apache.felix.dm.annotation.api.Property;
import org.apache.felix.dm.annotation.api.ServiceDependency;
import org.apache.felix.dm.annotation.api.Start;
-import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
/**
* Test a FactoryConfigurationAdapterService which provides its interface using a @ServiceLifecycle.
*/
-public class FactoryConfigurationAdapterServiceTestWithPublisher
-{
- public interface Provider
- {
+public class FactoryConfigurationAdapterServiceTestWithPublisher {
+ public final static String PID="FactoryConfigurationAdapterServiceTestWithPublisher.PID";
+ public final static String ENSURE = "FactoryConfigurationAdapterServiceTestWithPublisher";
+
+ public interface Provider {
}
@Component
- public static class Consumer
- {
- @ServiceDependency(filter="(name=FactoryConfigurationAdapterServiceTestWithPublisher)")
- Sequencer m_sequencer;
-
- @ServiceDependency(required=false, removed = "unbind")
- void bind(Map properties, Provider provider)
- {
+ public static class Consumer {
+ @ServiceDependency(filter = "(name=" + ENSURE + ")")
+ volatile Ensure m_sequencer;
+
+ @ServiceDependency(required = false, removed = "unbind")
+ void bind(Map properties, Provider provider) {
m_sequencer.step(1);
// check ProviderImpl properties
- if ("bar".equals(properties.get("foo")))
- {
+ if ("bar".equals(properties.get("foo"))) {
m_sequencer.step(2);
}
// check extra ProviderImpl properties (returned by start method)
- if ("bar2".equals(properties.get("foo2")))
- {
+ if ("bar2".equals(properties.get("foo2"))) {
m_sequencer.step(3);
}
// check Factory Configuration properties
- if ("bar3".equals(properties.get("foo3")))
- {
+ if ("bar3".equals(properties.get("foo3"))) {
m_sequencer.step(4);
}
}
- void unbind(Provider provider)
- {
+ void unbind(Provider provider) {
m_sequencer.step(5);
}
}
-
+
@Component
- public static class Configurator
- {
+ public static class Configurator {
@ServiceDependency
- void bind(ConfigurationAdmin cm) throws IOException
- {
- Configuration cf = cm.createFactoryConfiguration("MyPid", null);
- cf.update(new Hashtable() {{ put("foo3", "bar3"); }});
+ void bind(ConfigurationAdmin cm) throws IOException {
+ Configuration cf = cm.createFactoryConfiguration(PID, null);
+ cf.update(new Hashtable() {
+ {
+ put("foo3", "bar3");
+ }
+ });
}
}
-
- @FactoryConfigurationAdapterService(propagate=true, properties={@Property(name="foo", value="bar")}, factoryPid="MyPid", updated="updated")
- public static class ProviderImpl implements Provider
- {
+
+ @FactoryConfigurationAdapterService(propagate = true, properties = {@Property(name = "foo", value = "bar")}, factoryPid = PID, updated = "updated")
+ public static class ProviderImpl implements Provider {
@LifecycleController
- Runnable m_publisher; // injected and used to register our service
-
- @LifecycleController(start=false)
- Runnable m_unpublisher; // injected and used to unregister our service
-
- @ServiceDependency(filter="(name=FactoryConfigurationAdapterServiceTestWithPublisher)")
- Sequencer m_sequencer;
+ volatile Runnable m_publisher; // injected and used to register our service
+
+ @LifecycleController(start = false)
+ volatile Runnable m_unpublisher; // injected and used to unregister our service
+
+ @ServiceDependency(filter = "(name=" + ENSURE + ")")
+ volatile Ensure m_sequencer;
void updated(Dictionary conf) {
}
-
+
@Init
- void init()
- {
+ void init() {
// register service in 1 second
Utils.schedule(m_publisher, 1000);
// unregister the service in 2 seconds
Utils.schedule(m_unpublisher, 2000);
}
-
+
@Start
- Map start()
- {
+ Map start() {
// Add some extra service properties ... they will be appended to the one we have defined
// in the @Service annotation.
- return new HashMap() {{ put("foo2", "bar2"); }};
+ return new HashMap() {
+ {
+ put("foo2", "bar2");
+ }
+ };
}
}
Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryServiceTestWthPublisher.java (from r1531934, felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/FactoryServiceTestWthPublisher.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryServiceTestWthPublisher.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryServiceTestWthPublisher.java&p1=felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/FactoryServiceTestWthPublisher.java&r1=1531934&r2=1532034&rev=1532034&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/FactoryServiceTestWthPublisher.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryServiceTestWthPublisher.java Mon Oct 14 19:35:03 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dm.test.bundle.annotation.publisher;
+package org.apache.felix.dependencymanager.test2.components;
import java.util.Dictionary;
import java.util.HashMap;
@@ -30,85 +30,83 @@ import org.apache.felix.dm.annotation.ap
import org.apache.felix.dm.annotation.api.Property;
import org.apache.felix.dm.annotation.api.ServiceDependency;
import org.apache.felix.dm.annotation.api.Start;
-import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
/**
* A Service instantiated from a FactorySet, and which registers/unregisters its service,
* using the @ServiceLifecycle annotation.
*/
-public class FactoryServiceTestWthPublisher
-{
- public interface Provider
- {
+public class FactoryServiceTestWthPublisher {
+ public final static String FACTORY_SET = "FactoryServiceTestWthPublisher.FACTORYSET";
+ public final static String ENSURE = "FactoryServiceTestWthPublisher";
+
+ public interface Provider {
}
@Component
- public static class Consumer
- {
- @ServiceDependency(filter="(name=FactoryServiceTestWthPublisher)")
- Sequencer m_sequencer;
-
- @ServiceDependency(required=false, removed = "unbind")
- void bind(Map properties, Provider provider)
- {
+ public static class Consumer {
+ @ServiceDependency(filter = "(name=" + ENSURE + ")")
+ volatile Ensure m_sequencer;
+
+ @ServiceDependency(required = false, removed = "unbind")
+ void bind(Map properties, Provider provider) {
+ System.out.println("BIND: " + provider + ", map=" + properties);
m_sequencer.step(1);
- if ("bar".equals(properties.get("foo")))
- {
+ if ("bar".equals(properties.get("foo"))) {
m_sequencer.step(2);
}
- if ("bar2".equals(properties.get("foo2")))
- {
+ if ("bar2".equals(properties.get("foo2"))) {
m_sequencer.step(3);
}
- if ("bar3".equals(properties.get("foo3")))
- {
+ if ("bar3".equals(properties.get("foo3"))) {
m_sequencer.step(4);
}
}
- void unbind(Provider provider)
- {
+ void unbind(Provider provider) {
m_sequencer.step(5);
}
}
-
- @Component(factorySet="MyFactory", properties={@Property(name="foo", value="bar")})
- public static class ProviderImpl implements Provider
- {
+
+ @Component(factorySet = FACTORY_SET, properties = {@Property(name = "foo", value = "bar")})
+ public static class ProviderImpl implements Provider {
@LifecycleController
- Runnable m_publisher; // injected and used to register our service
-
- @LifecycleController(start=false)
- Runnable m_unpublisher; // injected and used to unregister our service
-
- @ServiceDependency(filter="(name=FactoryServiceTestWthPublisher)")
- Sequencer m_sequencer;
-
+ volatile Runnable m_publisher; // injected and used to register our service
+
+ @LifecycleController(start = false)
+ volatile Runnable m_unpublisher; // injected and used to unregister our service
+
+ @ServiceDependency(filter = "(name=" + ENSURE + ")")
+ volatile Ensure m_sequencer;
+
@Init
- void init()
- {
+ void init() {
// register service in 1 second
Utils.schedule(m_publisher, 1000);
// unregister the service in 2 seconds
Utils.schedule(m_unpublisher, 2000);
}
-
+
@Start
- Map start()
- {
+ Map start() {
// At this point, our service properties are the one specified in our @Service annotation + the one specified by our Factory.
// We also append an extra service property here:
- return new HashMap() {{ put("foo3", "bar3"); }};
+ return new HashMap() {
+ {
+ put("foo3", "bar3");
+ }
+ };
}
}
-
+
@Component
- public static class ProviderImplFactory
- {
- @ServiceDependency(filter="(" + Component.FACTORY_NAME + "=MyFactory)")
- void bind(Set<Dictionary> m_providerImplFactory)
- {
- m_providerImplFactory.add(new Hashtable() {{ put("foo2", "bar2"); }});
+ public static class ProviderImplFactory {
+ @ServiceDependency(filter = "(" + Component.FACTORY_NAME + "=" + FACTORY_SET + ")")
+ void bind(Set<Dictionary> m_providerImplFactory) {
+ m_providerImplFactory.add(new Hashtable() {
+ {
+ put("foo2", "bar2");
+ }
+ });
}
}
}
Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ResourceAdapterServiceTestWithPublisher.java (from r1531934, felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/ResourceAdapterServiceTestWithPublisher.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ResourceAdapterServiceTestWithPublisher.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ResourceAdapterServiceTestWithPublisher.java&p1=felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/ResourceAdapterServiceTestWithPublisher.java&r1=1531934&r2=1532034&rev=1532034&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/ResourceAdapterServiceTestWithPublisher.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ResourceAdapterServiceTestWithPublisher.java Mon Oct 14 19:35:03 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dm.test.bundle.annotation.publisher;
+package org.apache.felix.dependencymanager.test2.components;
import java.net.URL;
import java.util.HashMap;
@@ -36,7 +36,6 @@ import org.apache.felix.dm.annotation.ap
import org.apache.felix.dm.annotation.api.ResourceAdapterService;
import org.apache.felix.dm.annotation.api.ServiceDependency;
import org.apache.felix.dm.annotation.api.Start;
-import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Filter;
import org.osgi.framework.InvalidSyntaxException;
@@ -44,94 +43,76 @@ import org.osgi.framework.InvalidSyntaxE
/**
* Test a ResourceAdapterService which provides its interface using a @ServiceLifecycle.
*/
-public class ResourceAdapterServiceTestWithPublisher
-{
- public interface Provider
- {
+public class ResourceAdapterServiceTestWithPublisher {
+ public static final String ENSURE = "ResourceAdapterServiceTestWithPublisher";
+
+ public interface Provider {
}
@Component
- public static class Consumer
- {
- @ServiceDependency(filter="(name=ResourceAdapterServiceTestWithPublisher)")
- Sequencer m_sequencer;
-
- @ServiceDependency(required=false, removed = "unbind")
- void bind(Map properties, Provider provider)
- {
+ public static class Consumer {
+ @ServiceDependency(filter = "(name=" + ENSURE + ")")
+ volatile Ensure m_sequencer;
+
+ @ServiceDependency(required = false, removed = "unbind")
+ void bind(Map properties, Provider provider) {
m_sequencer.step(1);
// check ProviderImpl properties
- if ("bar".equals(properties.get("foo")))
- {
+ if ("bar".equals(properties.get("foo"))) {
m_sequencer.step(2);
}
// check extra ProviderImpl properties (returned by start method)
- if ("bar2".equals(properties.get("foo2")))
- {
+ if ("bar2".equals(properties.get("foo2"))) {
m_sequencer.step(3);
}
// check properties propagated by the resource adapter
- if ("/path/to/test1.txt".equals(properties.get(ResourceHandler.PATH)))
- {
+ if ("/path/to/test1.txt".equals(properties.get(ResourceHandler.PATH))) {
m_sequencer.step(4);
}
- if ("localhost".equals(properties.get(ResourceHandler.HOST)))
- {
+ if ("localhost".equals(properties.get(ResourceHandler.HOST))) {
m_sequencer.step(5);
}
}
- void unbind(Provider provider)
- {
+ void unbind(Provider provider) {
m_sequencer.step(6);
}
}
-
+
@Component
- public static class ResourceProvider
- {
+ public static class ResourceProvider {
@Inject
private volatile BundleContext m_context;
private final Map m_handlers = new HashMap();
private URL[] m_resources;
-
+
public ResourceProvider() throws Exception {
- m_resources = new URL[] {
- new URL("file://localhost/path/to/test1.txt"),
- new URL("file://localhost/path/to/test2.txt"),
- new URL("file://localhost/path/to/README.doc")
- };
+ m_resources = new URL[]{new URL("file://localhost/path/to/test1.txt"),
+ new URL("file://localhost/path/to/test2.txt"), new URL("file://localhost/path/to/README.doc")};
}
-
+
/**
* Handles a new Resource consumer
* @param serviceProperties
* @param handler
*/
- @ServiceDependency(removed = "remove", required=false)
- public void add(Map serviceProperties, ResourceHandler handler)
- {
+ @ServiceDependency(removed = "remove", required = false)
+ public void add(Map serviceProperties, ResourceHandler handler) {
String filterString = (String) serviceProperties.get("filter");
Filter filter = null;
if (filterString != null) {
- try
- {
+ try {
filter = m_context.createFilter(filterString);
- }
- catch (InvalidSyntaxException e)
- {
+ } catch (InvalidSyntaxException e) {
Assert.fail("Could not create filter for resource handler: " + e);
return;
}
}
- synchronized (m_handlers)
- {
+ synchronized (m_handlers) {
m_handlers.put(handler, filter);
}
- for (int i = 0; i < m_resources.length; i++)
- {
- if (filter == null || filter.match(ResourceUtil.createProperties(m_resources[i])))
- {
+ for (int i = 0; i < m_resources.length; i++) {
+ if (filter == null || filter.match(ResourceUtil.createProperties(m_resources[i]))) {
handler.added(m_resources[i]);
}
}
@@ -141,22 +122,17 @@ public class ResourceAdapterServiceTestW
* Remove a Resource consumer.bar
* @param handler
*/
- public void remove(ResourceHandler handler)
- {
+ public void remove(ResourceHandler handler) {
Filter filter;
- synchronized (m_handlers)
- {
+ synchronized (m_handlers) {
filter = (Filter) m_handlers.remove(handler);
}
removeResources(handler, filter);
}
- private void removeResources(ResourceHandler handler, Filter filter)
- {
- for (int i = 0; i < m_resources.length; i++)
- {
- if (filter == null || filter.match(ResourceUtil.createProperties(m_resources[i])))
- {
+ private void removeResources(ResourceHandler handler, Filter filter) {
+ for (int i = 0; i < m_resources.length; i++) {
+ if (filter == null || filter.match(ResourceUtil.createProperties(m_resources[i]))) {
handler.removed(m_resources[i]);
}
}
@@ -167,52 +143,48 @@ public class ResourceAdapterServiceTestW
* provide our Resources anymore.
*/
@Destroy
- public void destroy()
- {
+ public void destroy() {
Entry[] handlers;
- synchronized (m_handlers)
- {
+ synchronized (m_handlers) {
handlers = (Entry[]) m_handlers.entrySet().toArray(new Entry[m_handlers.size()]);
}
- for (int i = 0; i < handlers.length; i++)
- {
+ for (int i = 0; i < handlers.length; i++) {
removeResources((ResourceHandler) handlers[i].getKey(), (Filter) handlers[i].getValue());
}
}
}
-
- @ResourceAdapterService(filter = "(&(path=/path/to/test1.txt)(host=localhost))",
- properties = {@Property(name="foo", value="bar")},
- propagate = true)
- public static class ProviderImpl implements Provider
- {
+
+ @ResourceAdapterService(filter = "(&(path=/path/to/test1.txt)(host=localhost))", properties = {@Property(name = "foo", value = "bar")}, propagate = true)
+ public static class ProviderImpl implements Provider {
@LifecycleController
- Runnable m_publisher; // injected and used to register our service
-
- @LifecycleController(start=false)
- Runnable m_unpublisher; // injected and used to unregister our service
-
- @ServiceDependency(filter="(name=ResourceAdapterServiceTestWithPublisher)")
- Sequencer m_sequencer;
-
+ volatile Runnable m_publisher; // injected and used to register our service
+
+ @LifecycleController(start = false)
+ volatile Runnable m_unpublisher; // injected and used to unregister our service
+
+ @ServiceDependency(filter = "(name=" + ENSURE + ")")
+ volatile Ensure m_sequencer;
+
// Injected by reflection
- URL m_resource;
+ volatile URL m_resource;
@Init
- void init()
- {
+ void init() {
// register service in 1 second
Utils.schedule(m_publisher, 1000);
// unregister the service in 2 seconds
Utils.schedule(m_unpublisher, 2000);
}
-
+
@Start
- Map start()
- {
+ Map start() {
// Add some extra service properties ... they will be appended to the one we have defined
// in the @Service annotation.
- return new HashMap() {{ put("foo2", "bar2"); }};
+ return new HashMap() {
+ {
+ put("foo2", "bar2");
+ }
+ };
}
}
}
Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ServiceTestWthPublisher.java (from r1531934, felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/ServiceTestWthPublisher.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ServiceTestWthPublisher.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ServiceTestWthPublisher.java&p1=felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/ServiceTestWthPublisher.java&r1=1531934&r2=1532034&rev=1532034&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/ServiceTestWthPublisher.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ServiceTestWthPublisher.java Mon Oct 14 19:35:03 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dm.test.bundle.annotation.publisher;
+package org.apache.felix.dependencymanager.test2.components;
import java.util.HashMap;
import java.util.Map;
@@ -27,70 +27,65 @@ import org.apache.felix.dm.annotation.ap
import org.apache.felix.dm.annotation.api.Property;
import org.apache.felix.dm.annotation.api.ServiceDependency;
import org.apache.felix.dm.annotation.api.Start;
-import org.apache.felix.dm.test.bundle.annotation.sequencer.Sequencer;
/**
* A Service that just registers/unregisters its service, using the @ServiceLifecycle annotation.
*/
-public class ServiceTestWthPublisher
-{
- public interface Provider
- {
+public class ServiceTestWthPublisher {
+ public final static String ENSURE = "ServiceTestWthPublisher";
+
+ public interface Provider {
}
@Component
- public static class Consumer
- {
- @ServiceDependency(filter="(name=ServiceTestWthPublisher)")
- Sequencer m_sequencer;
-
- @ServiceDependency(required=false, removed = "unbind")
- void bind(Map properties, Provider provider)
- {
+ public static class Consumer {
+ @ServiceDependency(filter = "(name=" + ENSURE + ")")
+ volatile Ensure m_sequencer;
+
+ @ServiceDependency(required = false, removed = "unbind")
+ void bind(Map properties, Provider provider) {
m_sequencer.step(1);
- if ("bar".equals(properties.get("foo")))
- {
+ if ("bar".equals(properties.get("foo"))) {
m_sequencer.step(2);
}
- if ("bar2".equals(properties.get("foo2")))
- {
+ if ("bar2".equals(properties.get("foo2"))) {
m_sequencer.step(3);
}
}
- void unbind(Provider provider)
- {
+ void unbind(Provider provider) {
m_sequencer.step(4);
}
}
-
- @Component(properties={@Property(name="foo", value="bar")})
- public static class ProviderImpl implements Provider
- {
+
+ @Component(properties = {@Property(name = "foo", value = "bar")})
+ public static class ProviderImpl implements Provider {
@LifecycleController
- Runnable m_publisher; // injected and used to register our service
-
- @LifecycleController(start=false)
- Runnable m_unpublisher; // injected and used to unregister our service
-
- @ServiceDependency(filter="(name=ServiceTestWthPublisher)")
- Sequencer m_sequencer;
+ volatile Runnable m_publisher; // injected and used to register our service
+
+ @LifecycleController(start = false)
+ volatile Runnable m_unpublisher; // injected and used to unregister our service
+
+ @ServiceDependency(filter = "(name=" + ENSURE + ")")
+ volatile Ensure m_sequencer;
@Init
- void init()
- {
+ void init() {
// register service in 1 second
Utils.schedule(m_publisher, 1000);
// unregister the service in 2 seconds
Utils.schedule(m_unpublisher, 2000);
}
-
+
@Start
- Map start()
- {
+ Map start() {
// Add some extra service properties ... they will be appended to the one we have defined
// in the @Service annotation.
- return new HashMap() {{ put("foo2", "bar2"); }};
+ return new HashMap() {
+ {
+ put("foo2", "bar2");
+ }
+ };
}
}
}
Copied: felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/Utils.java (from r1531934, felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/Utils.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/Utils.java?p2=felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/Utils.java&p1=felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/Utils.java&r1=1531934&r2=1532034&rev=1532034&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/main/java/org/apache/felix/dm/test/bundle/annotation/publisher/Utils.java (original)
+++ felix/trunk/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/Utils.java Mon Oct 14 19:35:03 2013
@@ -16,21 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dm.test.bundle.annotation.publisher;
+package org.apache.felix.dependencymanager.test2.components;
-public class Utils
-{
- public static void schedule(final Runnable task, final long n)
- {
+public class Utils {
+ public static void schedule(final Runnable task, final long n) {
Thread t = new Thread() {
- public void run()
- {
- try
- {
+ public void run() {
+ try {
sleep(n);
- }
- catch (InterruptedException e)
- {
+ } catch (InterruptedException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
Modified: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ExtraServicePropertiesTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ExtraServicePropertiesTest.java?rev=1532034&r1=1532033&r2=1532034&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ExtraServicePropertiesTest.java (original)
+++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ExtraServicePropertiesTest.java Mon Oct 14 19:35:03 2013
@@ -19,6 +19,10 @@
package org.apache.felix.dependencymanager.test2.integration.annotations;
import org.apache.felix.dependencymanager.test2.components.Ensure;
+import org.apache.felix.dependencymanager.test2.components.ExtraAdapterServiceProperties;
+import org.apache.felix.dependencymanager.test2.components.ExtraAspectServiceProperties;
+import org.apache.felix.dependencymanager.test2.components.ExtraFactoryServiceProperties;
+import org.apache.felix.dependencymanager.test2.components.ExtraServiceProperties;
import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -36,7 +40,7 @@ public class ExtraServicePropertiesTest
@Test
public void testExtraServiceProperties() {
Ensure e = new Ensure();
- ServiceRegistration sr = register(e, "testExtraServiceProperties");
+ ServiceRegistration sr = register(e, ExtraServiceProperties.ENSURE);
e.waitForStep(2, 10000);
sr.unregister();
}
@@ -47,7 +51,7 @@ public class ExtraServicePropertiesTest
@Test
public void testExtraFactoryServiceProperties() {
Ensure e = new Ensure();
- ServiceRegistration sr = register(e, "testExtraFactoryServiceProperties");
+ ServiceRegistration sr = register(e, ExtraFactoryServiceProperties.ENSURE);
e.waitForStep(3, 10000);
sr.unregister();
}
@@ -58,7 +62,7 @@ public class ExtraServicePropertiesTest
@Test
public void testExtraAdapterServiceProperties() {
Ensure e = new Ensure();
- ServiceRegistration sr = register(e, "testExtraAdapterServiceProperties");
+ ServiceRegistration sr = register(e, ExtraAdapterServiceProperties.ENSURE);
e.waitForStep(3, 10000);
sr.unregister();
}
@@ -69,7 +73,7 @@ public class ExtraServicePropertiesTest
@Test
public void testExtraAspectServiceProperties() {
Ensure e = new Ensure();
- ServiceRegistration sr = register(e, "testExtraAspectServiceProperties");
+ ServiceRegistration sr = register(e, ExtraAspectServiceProperties.ENSURE);
e.waitForStep(3, 10000);
sr.unregister();
}
Copied: felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/PublisherAnnotationTest.java (from r1531934, felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/PublisherAnnotationTest.java)
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/PublisherAnnotationTest.java?p2=felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/PublisherAnnotationTest.java&p1=felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/PublisherAnnotationTest.java&r1=1531934&r2=1532034&rev=1532034&view=diff
==============================================================================
--- felix/trunk/dependencymanager/test/src/test/java/org/apache/felix/dm/test/annotation/PublisherAnnotationTest.java (original)
+++ felix/trunk/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/PublisherAnnotationTest.java Mon Oct 14 19:35:03 2013
@@ -16,114 +16,87 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.dm.test.annotation;
+package org.apache.felix.dependencymanager.test2.integration.annotations;
-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.systemProperty;
-
-import org.apache.felix.dm.DependencyManager;
-import org.apache.felix.dm.test.Base;
-import org.apache.felix.dm.test.BundleGenerator;
+import org.apache.felix.dependencymanager.test2.components.AdapterServiceTestWithPublisher;
+import org.apache.felix.dependencymanager.test2.components.BundleAdapterServiceTestWithPublisher;
+import org.apache.felix.dependencymanager.test2.components.Ensure;
+import org.apache.felix.dependencymanager.test2.components.FactoryConfigurationAdapterServiceTestWithPublisher;
+import org.apache.felix.dependencymanager.test2.components.FactoryServiceTestWthPublisher;
+import org.apache.felix.dependencymanager.test2.components.ResourceAdapterServiceTestWithPublisher;
+import org.apache.felix.dependencymanager.test2.components.ServiceTestWthPublisher;
+import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.Configuration;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.osgi.framework.ServiceRegistration;
-/**
- * Use case: Verify the @ServiceLifecycle annotation, which allows a component to activate/deactivate itself programatically.
- */
-@RunWith(JUnit4TestRunner.class)
-public class PublisherAnnotationTest extends AnnotationBase
-{
- @Configuration
- public static Option[] configuration()
- {
- return options(
- systemProperty(DMLOG_PROPERTY).value( "true" ),
- provision(
- mavenBundle().groupId("org.osgi").artifactId("org.osgi.compendium").version(Base.OSGI_SPEC_VERSION),
- mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.dependencymanager").versionAsInProject(),
- mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.configadmin").version("1.2.4"),
- mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.dependencymanager.runtime").versionAsInProject()),
- provision(
- new BundleGenerator()
- .set(Constants.BUNDLE_SYMBOLICNAME, "PublisherAnnotationsTest")
- .set("Export-Package", "org.apache.felix.dm.test.bundle.annotation.sequencer")
- .set("Private-Package", "org.apache.felix.dm.test.bundle.annotation.publisher")
- .set("Import-Package", "*")
- .set("-plugin", "org.apache.felix.dm.annotation.plugin.bnd.AnnotationPlugin")
- .build()));
- }
-
+@RunWith(PaxExam.class)
+public class PublisherAnnotationTest extends TestBase {
/**
* A Service that just registers/unregisters its service, using the @ServiceLifecycle annotation.
*/
@Test
- public void testServiceWithPublisher(BundleContext context)
- {
- DependencyManager m = new DependencyManager(context);
- m.add(makeSequencer(m, "ServiceTestWthPublisher"));
- m_ensure.waitForStep(4, 10000);
+ public void testServiceWithPublisher() {
+ Ensure e = new Ensure();
+ ServiceRegistration sr = register(e, ServiceTestWthPublisher.ENSURE);
+ e.waitForStep(4, 10000);
+ sr.unregister();
}
-
+
/**
* A Service instantiated from a FactorySet, and which registers/unregisters its service,
* using the @ServiceLifecycle annotation.
*/
@Test
- public void testFactoryServiceWithPublisher(BundleContext context)
- {
- DependencyManager m = new DependencyManager(context);
- m.add(makeSequencer(m, "FactoryServiceTestWthPublisher"));
- m_ensure.waitForStep(5, 10000);
+ public void testFactoryServiceWithPublisher() {
+ Ensure e = new Ensure();
+ ServiceRegistration sr = register(e, FactoryServiceTestWthPublisher.ENSURE);
+ e.waitForStep(5, 10000);
+ sr.unregister();
}
/**
* Test an AdapterService which provides its interface using a @ServiceLifecycle.
*/
@Test
- public void testAdapterServiceWithPublisher(BundleContext context)
- {
- DependencyManager m = new DependencyManager(context);
- m.add(makeSequencer(m, "AdapterServiceTestWithPublisher"));
- m_ensure.waitForStep(6, 10000);
+ public void testAdapterServiceWithPublisher() {
+ Ensure e = new Ensure();
+ ServiceRegistration sr = register(e, AdapterServiceTestWithPublisher.ENSURE);
+ e.waitForStep(6, 10000);
+ sr.unregister();
}
/**
* Test a BundleAdapterService which provides its interface using a @ServiceLifecycle.
*/
@Test
- public void testBundleAdapterServiceWithPublisher(BundleContext context)
- {
- DependencyManager m = new DependencyManager(context);
- m.add(makeSequencer(m, "BundleAdapterServiceTestWithPublisher"));
- m_ensure.waitForStep(5, 10000);
+ public void testBundleAdapterServiceWithPublisher() {
+ Ensure e = new Ensure();
+ ServiceRegistration sr = register(e, BundleAdapterServiceTestWithPublisher.ENSURE);
+ e.waitForStep(5, 10000);
+ sr.unregister();
}
/**
* Test a ResourceAdapterService which provides its interface using a @ServiceLifecycle.
*/
@Test
- public void TestResourceAdapterServiceWithPublisher(BundleContext context)
- {
- DependencyManager m = new DependencyManager(context);
- m.add(makeSequencer(m, "ResourceAdapterServiceTestWithPublisher"));
- m_ensure.waitForStep(5, 10000);
+ public void TestResourceAdapterServiceWithPublisher() {
+ Ensure e = new Ensure();
+ ServiceRegistration sr = register(e, ResourceAdapterServiceTestWithPublisher.ENSURE);
+ e.waitForStep(5, 10000);
+ sr.unregister();
}
/**
* Test a FactoryConfigurationAdapterService which provides its interface using a @ServiceLifecycle.
*/
@Test
- public void testFactoryAdapterServiceWithPublisher(BundleContext context)
- {
- DependencyManager m = new DependencyManager(context);
- m.add(makeSequencer(m, "FactoryConfigurationAdapterServiceTestWithPublisher"));
- m_ensure.waitForStep(5, 10000);
+ public void testFactoryAdapterServiceWithPublisher() {
+ Ensure e = new Ensure();
+ ServiceRegistration sr = register(e, FactoryConfigurationAdapterServiceTestWithPublisher.ENSURE);
+ e.waitForStep(5, 10000);
+ sr.unregister();
}
}