-
Notifications
You must be signed in to change notification settings - Fork 57
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[resolves #985] Compatibility for DS based components
- Loading branch information
Thomas Diesler
committed
Nov 19, 2015
1 parent
326c585
commit e5cef1a
Showing
11 changed files
with
348 additions
and
48 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
132 changes: 132 additions & 0 deletions
132
...tests/common/src/main/java/org/wildfly/camel/test/compatibility/ServiceComponentTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| /* | ||
| * #%L | ||
| * Gravia :: Integration Tests :: Common | ||
| * %% | ||
| * Copyright (C) 2010 - 2014 JBoss by Red Hat | ||
| * %% | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * #L% | ||
| */ | ||
| package org.wildfly.camel.test.compatibility; | ||
|
|
||
| import java.io.InputStream; | ||
| import java.util.Arrays; | ||
| import java.util.List; | ||
| import java.util.concurrent.CountDownLatch; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| import org.jboss.arquillian.container.test.api.Deployment; | ||
| import org.jboss.arquillian.junit.Arquillian; | ||
| import org.jboss.arquillian.osgi.StartLevelAware; | ||
| import org.jboss.gravia.Constants; | ||
| import org.jboss.gravia.resource.Resource; | ||
| import org.jboss.gravia.runtime.Module; | ||
| import org.jboss.gravia.runtime.ModuleContext; | ||
| import org.jboss.gravia.runtime.Runtime; | ||
| import org.jboss.gravia.runtime.RuntimeLocator; | ||
| import org.jboss.gravia.runtime.RuntimeType; | ||
| import org.jboss.gravia.runtime.ServiceEvent; | ||
| import org.jboss.gravia.runtime.ServiceListener; | ||
| import org.jboss.gravia.runtime.ServiceReference; | ||
| import org.jboss.osgi.metadata.OSGiManifestBuilder; | ||
| import org.jboss.shrinkwrap.api.Archive; | ||
| import org.jboss.shrinkwrap.api.ShrinkWrap; | ||
| import org.jboss.shrinkwrap.api.asset.Asset; | ||
| import org.jboss.shrinkwrap.api.spec.JavaArchive; | ||
| import org.junit.Assert; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.osgi.service.component.ComponentContext; | ||
| import org.wildfly.camel.test.compatibility.subA.ServiceA; | ||
| import org.wildfly.camel.test.compatibility.subA.ServiceA1; | ||
|
|
||
| /** | ||
| * Test basic SCR Component | ||
| * | ||
| * @author thomas.diesler@jboss.com | ||
| * @since 04-Oct-2013 | ||
| */ | ||
| @RunWith(Arquillian.class) | ||
| public class ServiceComponentTest { | ||
|
|
||
| @Deployment | ||
| @StartLevelAware(autostart = true) | ||
| public static Archive<?> deployment() { | ||
| final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "scr-test.jar"); | ||
| archive.addClasses(ServiceA.class, ServiceA1.class); | ||
| archive.addAsResource("OSGI-INF/org.wildfly.camel.test.compatibility.subA.ServiceA.xml"); | ||
| archive.addAsResource("OSGI-INF/org.wildfly.camel.test.compatibility.subA.ServiceA1.xml"); | ||
| archive.setManifest(new Asset() { | ||
| @Override | ||
| public InputStream openStream() { | ||
| OSGiManifestBuilder builder = OSGiManifestBuilder.newInstance(); | ||
| builder.addBundleManifestVersion(2); | ||
| builder.addBundleSymbolicName(archive.getName()); | ||
| builder.addBundleVersion("1.0.0"); | ||
| builder.addImportPackages(RuntimeLocator.class, ComponentContext.class, Resource.class); | ||
| builder.addManifestHeader("Service-Component", "OSGI-INF/org.wildfly.camel.test.compatibility.subA.ServiceA.xml,OSGI-INF/org.wildfly.camel.test.compatibility.subA.ServiceA1.xml"); | ||
| return builder.openStream(); | ||
| } | ||
| }); | ||
| return archive; | ||
| } | ||
|
|
||
| @Test | ||
| public void testServiceAvailability() throws Exception { | ||
|
|
||
| Runtime runtime = RuntimeLocator.getRequiredRuntime(); | ||
| Module modA = runtime.getModule(getClass().getClassLoader()); | ||
|
|
||
| if (RuntimeType.getRuntimeType(runtime) == RuntimeType.WILDFLY) { | ||
| System.out.println(Module.class.getClassLoader().loadClass(ComponentContext.class.getName()).getClassLoader()); | ||
| System.out.println(ComponentContext.class.getClassLoader()); | ||
| } | ||
|
|
||
| ModuleContext ctxA = modA.getModuleContext(); | ||
| ServiceReference<ServiceA> srefA = ctxA.getServiceReference(ServiceA.class); | ||
| Assert.assertNotNull("ServiceReference not null", srefA); | ||
|
|
||
| ServiceA srvA = ctxA.getService(srefA); | ||
| Assert.assertEquals("ServiceA#1:ServiceA1#1:Hello", srvA.doStuff("Hello")); | ||
|
|
||
| assertDisableComponent(ctxA, srvA); | ||
| } | ||
|
|
||
| private void assertDisableComponent(final ModuleContext ctxA, ServiceA srvA) throws InterruptedException { | ||
|
|
||
| final CountDownLatch latch = new CountDownLatch(1); | ||
| ServiceListener listener = new ServiceListener() { | ||
| @Override | ||
| public void serviceChanged(ServiceEvent event) { | ||
| int type = event.getType(); | ||
| ServiceReference<?> sref = event.getServiceReference(); | ||
| List<String> clazzes = Arrays.asList(((String[]) sref.getProperty(Constants.OBJECTCLASS))); | ||
| if (type == ServiceEvent.UNREGISTERING && clazzes.contains(ServiceA1.class.getName())) { | ||
| ctxA.removeServiceListener(this); | ||
| latch.countDown(); | ||
| } | ||
| } | ||
| }; | ||
| ctxA.addServiceListener(listener); | ||
|
|
||
| ComponentContext ccA1 = srvA.getServiceA1().getComponentContext(); | ||
| ccA1.disableComponent(ServiceA1.class.getName()); | ||
|
|
||
| Assert.assertTrue(latch.await(2, TimeUnit.SECONDS)); | ||
|
|
||
| ServiceReference<ServiceA> srefA = ctxA.getServiceReference(ServiceA.class); | ||
| Assert.assertNull("ServiceReference null", srefA); | ||
| ServiceReference<ServiceA1> srefA1 = ctxA.getServiceReference(ServiceA1.class); | ||
| Assert.assertNull("ServiceReference null", srefA1); | ||
| } | ||
| } |
76 changes: 76 additions & 0 deletions
76
...ility/itests/common/src/main/java/org/wildfly/camel/test/compatibility/subA/ServiceA.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| /* | ||
| * #%L | ||
| * Gravia :: Integration Tests :: Common | ||
| * %% | ||
| * Copyright (C) 2010 - 2014 JBoss by Red Hat | ||
| * %% | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * #L% | ||
| */ | ||
| package org.wildfly.camel.test.compatibility.subA; | ||
|
|
||
| import java.util.concurrent.atomic.AtomicInteger; | ||
| import java.util.concurrent.atomic.AtomicReference; | ||
|
|
||
| import org.osgi.service.component.ComponentContext; | ||
| import org.osgi.service.component.annotations.Activate; | ||
| import org.osgi.service.component.annotations.Component; | ||
| import org.osgi.service.component.annotations.Deactivate; | ||
| import org.osgi.service.component.annotations.Reference; | ||
|
|
||
| @Component(service = { ServiceA.class }, immediate = true) | ||
| public class ServiceA { | ||
|
|
||
| static AtomicInteger INSTANCE_COUNT = new AtomicInteger(); | ||
| final String name = getClass().getSimpleName() + "#" + INSTANCE_COUNT.incrementAndGet(); | ||
|
|
||
| final AtomicReference<ServiceA1> ref = new AtomicReference<ServiceA1>(); | ||
|
|
||
| private ComponentContext context; | ||
|
|
||
| @Activate | ||
| void activate(ComponentContext context) { | ||
| this.context = context; | ||
| } | ||
|
|
||
| @Deactivate | ||
| void deactivate() { | ||
| } | ||
|
|
||
| public ComponentContext getComponentContext() { | ||
| return context; | ||
| } | ||
|
|
||
| @Reference | ||
| void bindServiceA1(ServiceA1 service) { | ||
| ref.set(service); | ||
| } | ||
|
|
||
| void unbindServiceA1(ServiceA1 service) { | ||
| ref.compareAndSet(service, null); | ||
| } | ||
|
|
||
| public ServiceA1 getServiceA1() { | ||
| return ref.get(); | ||
| } | ||
|
|
||
| public String doStuff(String msg) { | ||
| ServiceA1 srv = ref.get(); | ||
| return name + ":" + srv.doStuff(msg); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return name; | ||
| } | ||
| } |
58 changes: 58 additions & 0 deletions
58
...lity/itests/common/src/main/java/org/wildfly/camel/test/compatibility/subA/ServiceA1.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /* | ||
| * #%L | ||
| * Gravia :: Integration Tests :: Common | ||
| * %% | ||
| * Copyright (C) 2010 - 2014 JBoss by Red Hat | ||
| * %% | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * #L% | ||
| */ | ||
| package org.wildfly.camel.test.compatibility.subA; | ||
|
|
||
| import java.util.concurrent.atomic.AtomicInteger; | ||
|
|
||
| import org.osgi.service.component.ComponentContext; | ||
| import org.osgi.service.component.annotations.Activate; | ||
| import org.osgi.service.component.annotations.Component; | ||
| import org.osgi.service.component.annotations.Deactivate; | ||
|
|
||
| @Component(service = { ServiceA1.class }) | ||
| public class ServiceA1 { | ||
|
|
||
| static AtomicInteger INSTANCE_COUNT = new AtomicInteger(); | ||
| final String name = getClass().getSimpleName() + "#" + INSTANCE_COUNT.incrementAndGet(); | ||
|
|
||
| private ComponentContext context; | ||
|
|
||
| @Activate | ||
| void activate(ComponentContext context) { | ||
| this.context = context; | ||
| } | ||
|
|
||
| @Deactivate | ||
| void deactivate() { | ||
| } | ||
|
|
||
| public ComponentContext getComponentContext() { | ||
| return context; | ||
| } | ||
|
|
||
| public String doStuff(String msg) { | ||
| return name + ":" + msg; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return name; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.