This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.testing.osgi-mock-1.2.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git
commit b910746382701553540a7f7fafa1faa39e6f06e4 Author: Stefan Seifert <[email protected]> AuthorDate: Thu Feb 19 09:31:49 2015 +0000 rename package-private class ReflectinServiceUtil to OsgiServiceUtil because it does not any longer use reflection to do it's job (no functional change) git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/osgi-mock@1660817 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/sling/testing/mock/osgi/MockOsgi.java | 16 +++++------ ...ectionServiceUtil.java => OsgiServiceUtil.java} | 6 ++-- .../testing/mock/osgi/OsgiMetadataUtilTest.java | 10 +++---- ... => OsgiServiceUtilActivateDeactivateTest.java} | 2 +- ...rviceUtilTest.java => OsgiServiceUtilTest.java} | 2 +- .../mock/osgi/context/OsgiContextImplTest.java | 10 +++---- ....osgi.OsgiServiceUtilActivateDeactivateTest.xml | 21 ++++++++++++++ ...sling.testing.mock.osgi.OsgiServiceUtilTest.xml | 32 ++++++++++++++++++++++ ...ReflectionServiceUtilActivateDeactivateTest.xml | 21 -------------- ...testing.mock.osgi.ReflectionServiceUtilTest.xml | 32 ---------------------- 10 files changed, 76 insertions(+), 76 deletions(-) diff --git a/src/main/java/org/apache/sling/testing/mock/osgi/MockOsgi.java b/src/main/java/org/apache/sling/testing/mock/osgi/MockOsgi.java index 82448e4..9cbcf8d 100644 --- a/src/main/java/org/apache/sling/testing/mock/osgi/MockOsgi.java +++ b/src/main/java/org/apache/sling/testing/mock/osgi/MockOsgi.java @@ -111,7 +111,7 @@ public final class MockOsgi { * @return true if all dependencies could be injected, false if the service has no dependencies. */ public static boolean injectServices(Object target, BundleContext bundleContext) { - return ReflectionServiceUtil.injectServices(target, bundleContext); + return OsgiServiceUtil.injectServices(target, bundleContext); } /** @@ -121,7 +121,7 @@ public final class MockOsgi { */ public static boolean activate(Object target) { ComponentContext componentContext = newComponentContext(); - return ReflectionServiceUtil.activateDeactivate(target, componentContext, true); + return OsgiServiceUtil.activateDeactivate(target, componentContext, true); } /** @@ -132,7 +132,7 @@ public final class MockOsgi { */ public static boolean activate(Object target, Dictionary<String, Object> properties) { ComponentContext componentContext = newComponentContext(properties); - return ReflectionServiceUtil.activateDeactivate(target, componentContext, true); + return OsgiServiceUtil.activateDeactivate(target, componentContext, true); } /** @@ -154,7 +154,7 @@ public final class MockOsgi { */ public static boolean activate(Object target, BundleContext bundleContext, Dictionary<String, Object> properties) { ComponentContext componentContext = newComponentContext(bundleContext, properties); - return ReflectionServiceUtil.activateDeactivate(target, componentContext, true); + return OsgiServiceUtil.activateDeactivate(target, componentContext, true); } /** @@ -175,7 +175,7 @@ public final class MockOsgi { */ public static boolean deactivate(Object target) { ComponentContext componentContext = newComponentContext(); - return ReflectionServiceUtil.activateDeactivate(target, componentContext, false); + return OsgiServiceUtil.activateDeactivate(target, componentContext, false); } /** @@ -186,7 +186,7 @@ public final class MockOsgi { */ public static boolean deactivate(Object target, Dictionary<String, Object> properties) { ComponentContext componentContext = newComponentContext(properties); - return ReflectionServiceUtil.activateDeactivate(target, componentContext, false); + return OsgiServiceUtil.activateDeactivate(target, componentContext, false); } /** @@ -208,7 +208,7 @@ public final class MockOsgi { */ public static boolean deactivate(Object target, BundleContext bundleContext, Dictionary<String, Object> properties) { ComponentContext componentContext = newComponentContext(bundleContext, properties); - return ReflectionServiceUtil.activateDeactivate(target, componentContext, false); + return OsgiServiceUtil.activateDeactivate(target, componentContext, false); } /** @@ -241,7 +241,7 @@ public final class MockOsgi { * @return true if modified method was called. False if no modified method is defined. */ public static boolean modified(Object target, BundleContext bundleContext, Map<String, Object> properties) { - return ReflectionServiceUtil.modified(target, bundleContext, properties); + return OsgiServiceUtil.modified(target, bundleContext, properties); } } diff --git a/src/main/java/org/apache/sling/testing/mock/osgi/ReflectionServiceUtil.java b/src/main/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtil.java similarity index 99% rename from src/main/java/org/apache/sling/testing/mock/osgi/ReflectionServiceUtil.java rename to src/main/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtil.java index 77d5e08..7606d65 100644 --- a/src/main/java/org/apache/sling/testing/mock/osgi/ReflectionServiceUtil.java +++ b/src/main/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtil.java @@ -37,11 +37,11 @@ import org.osgi.service.component.ComponentContext; import org.w3c.dom.Document; /** - * Helper methods to inject dependencies and activate services via reflection. + * Helper methods to inject dependencies and activate services. */ -final class ReflectionServiceUtil { +final class OsgiServiceUtil { - private ReflectionServiceUtil() { + private OsgiServiceUtil() { // static methods only } diff --git a/src/test/java/org/apache/sling/testing/mock/osgi/OsgiMetadataUtilTest.java b/src/test/java/org/apache/sling/testing/mock/osgi/OsgiMetadataUtilTest.java index 52f9011..280f955 100644 --- a/src/test/java/org/apache/sling/testing/mock/osgi/OsgiMetadataUtilTest.java +++ b/src/test/java/org/apache/sling/testing/mock/osgi/OsgiMetadataUtilTest.java @@ -63,13 +63,13 @@ public class OsgiMetadataUtilTest { @Test public void testReferences() { - Document doc = OsgiMetadataUtil.getMetadata(ReflectionServiceUtilTest.Service3.class); - List<Reference> references = OsgiMetadataUtil.getReferences(ReflectionServiceUtilTest.Service3.class, doc); + Document doc = OsgiMetadataUtil.getMetadata(OsgiServiceUtilTest.Service3.class); + List<Reference> references = OsgiMetadataUtil.getReferences(OsgiServiceUtilTest.Service3.class, doc); assertEquals(3, references.size()); Reference ref1 = references.get(0); assertEquals("reference2", ref1.getName()); - assertEquals("org.apache.sling.testing.mock.osgi.ReflectionServiceUtilTest$ServiceInterface2", ref1.getInterfaceType()); + assertEquals("org.apache.sling.testing.mock.osgi.OsgiServiceUtilTest$ServiceInterface2", ref1.getInterfaceType()); assertEquals(ReferenceCardinality.MANDATORY_MULTIPLE, ref1.getCardinality()); assertEquals("bindReference2", ref1.getBind()); assertEquals("unbindReference2", ref1.getUnbind()); @@ -77,8 +77,8 @@ public class OsgiMetadataUtilTest { @Test public void testActivateMethodName() { - Document doc = OsgiMetadataUtil.getMetadata(ReflectionServiceUtilTest.Service3.class); - String methodName = OsgiMetadataUtil.getActivateMethodName(ReflectionServiceUtilTest.Service3.class, doc); + Document doc = OsgiMetadataUtil.getMetadata(OsgiServiceUtilTest.Service3.class); + String methodName = OsgiMetadataUtil.getActivateMethodName(OsgiServiceUtilTest.Service3.class, doc); assertEquals("activate", methodName); } diff --git a/src/test/java/org/apache/sling/testing/mock/osgi/ReflectionServiceUtilActivateDeactivateTest.java b/src/test/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtilActivateDeactivateTest.java similarity index 99% rename from src/test/java/org/apache/sling/testing/mock/osgi/ReflectionServiceUtilActivateDeactivateTest.java rename to src/test/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtilActivateDeactivateTest.java index 36cf88e..d848fe2 100644 --- a/src/test/java/org/apache/sling/testing/mock/osgi/ReflectionServiceUtilActivateDeactivateTest.java +++ b/src/test/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtilActivateDeactivateTest.java @@ -37,7 +37,7 @@ import com.google.common.collect.ImmutableMap; /** * Test different variants of activate/deactivate methods with varying signatures. */ -public class ReflectionServiceUtilActivateDeactivateTest { +public class OsgiServiceUtilActivateDeactivateTest { private Map<String,Object> map = ImmutableMap.<String, Object>of("prop1", "value1"); private BundleContext bundleContext = MockOsgi.newBundleContext(); diff --git a/src/test/java/org/apache/sling/testing/mock/osgi/ReflectionServiceUtilTest.java b/src/test/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtilTest.java similarity index 99% rename from src/test/java/org/apache/sling/testing/mock/osgi/ReflectionServiceUtilTest.java rename to src/test/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtilTest.java index b8b8cea..f71ed38 100644 --- a/src/test/java/org/apache/sling/testing/mock/osgi/ReflectionServiceUtilTest.java +++ b/src/test/java/org/apache/sling/testing/mock/osgi/OsgiServiceUtilTest.java @@ -49,7 +49,7 @@ import org.osgi.service.component.annotations.Modified; import com.google.common.collect.ImmutableMap; -public class ReflectionServiceUtilTest { +public class OsgiServiceUtilTest { private BundleContext bundleContext = MockOsgi.newBundleContext(); private Service1 service1; diff --git a/src/test/java/org/apache/sling/testing/mock/osgi/context/OsgiContextImplTest.java b/src/test/java/org/apache/sling/testing/mock/osgi/context/OsgiContextImplTest.java index 35eecbb..60d5b0b 100644 --- a/src/test/java/org/apache/sling/testing/mock/osgi/context/OsgiContextImplTest.java +++ b/src/test/java/org/apache/sling/testing/mock/osgi/context/OsgiContextImplTest.java @@ -29,9 +29,9 @@ import java.util.Map; import java.util.Set; import org.apache.sling.testing.mock.osgi.NoScrMetadataException; -import org.apache.sling.testing.mock.osgi.ReflectionServiceUtilTest; -import org.apache.sling.testing.mock.osgi.ReflectionServiceUtilTest.ServiceInterface1; -import org.apache.sling.testing.mock.osgi.ReflectionServiceUtilTest.ServiceInterface2; +import org.apache.sling.testing.mock.osgi.OsgiServiceUtilTest; +import org.apache.sling.testing.mock.osgi.OsgiServiceUtilTest.ServiceInterface1; +import org.apache.sling.testing.mock.osgi.OsgiServiceUtilTest.ServiceInterface2; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -97,12 +97,12 @@ public class OsgiContextImplTest { public void testRegisterInjectActivate() { context.registerService(ServiceInterface1.class, mock(ServiceInterface1.class)); context.registerService(ServiceInterface2.class, mock(ServiceInterface2.class)); - context.registerInjectActivateService(new ReflectionServiceUtilTest.Service3()); + context.registerInjectActivateService(new OsgiServiceUtilTest.Service3()); } @Test(expected=RuntimeException.class) public void testRegisterInjectActivate_RefrenceMissing() { - context.registerInjectActivateService(new ReflectionServiceUtilTest.Service3()); + context.registerInjectActivateService(new OsgiServiceUtilTest.Service3()); } @Test(expected=NoScrMetadataException.class) diff --git a/src/test/resources/OSGI-INF/org.apache.sling.testing.mock.osgi.OsgiServiceUtilActivateDeactivateTest.xml b/src/test/resources/OSGI-INF/org.apache.sling.testing.mock.osgi.OsgiServiceUtilActivateDeactivateTest.xml new file mode 100644 index 0000000..f0fccc9 --- /dev/null +++ b/src/test/resources/OSGI-INF/org.apache.sling.testing.mock.osgi.OsgiServiceUtilActivateDeactivateTest.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<components xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0";> + <scr:component name="org.apache.sling.testing.mock.osgi.OsgiServiceUtilActivateDeactivateTest$Service1" activate="activate" deactivate="deactivate"> + <implementation class="org.apache.sling.testing.mock.osgi.OsgiServiceUtilActivateDeactivateTest$Service1"/> + </scr:component> + <scr:component name="org.apache.sling.testing.mock.osgi.OsgiServiceUtilActivateDeactivateTest$Service2" activate="activate" deactivate="deactivate"> + <implementation class="org.apache.sling.testing.mock.osgi.OsgiServiceUtilActivateDeactivateTest$Service2"/> + </scr:component> + <scr:component name="org.apache.sling.testing.mock.osgi.OsgiServiceUtilActivateDeactivateTest$Service3" activate="activate" deactivate="deactivate"> + <implementation class="org.apache.sling.testing.mock.osgi.OsgiServiceUtilActivateDeactivateTest$Service3"/> + </scr:component> + <scr:component name="org.apache.sling.testing.mock.osgi.OsgiServiceUtilActivateDeactivateTest$Service4" activate="activate" deactivate="deactivate"> + <implementation class="org.apache.sling.testing.mock.osgi.OsgiServiceUtilActivateDeactivateTest$Service4"/> + </scr:component> + <scr:component name="org.apache.sling.testing.mock.osgi.OsgiServiceUtilActivateDeactivateTest$Service5" activate="activate" deactivate="deactivate"> + <implementation class="org.apache.sling.testing.mock.osgi.OsgiServiceUtilActivateDeactivateTest$Service5"/> + </scr:component> + <scr:component name="org.apache.sling.testing.mock.osgi.OsgiServiceUtilActivateDeactivateTest$Service6" activate="activate" deactivate="deactivate"> + <implementation class="org.apache.sling.testing.mock.osgi.OsgiServiceUtilActivateDeactivateTest$Service6"/> + </scr:component> +</components> diff --git a/src/test/resources/OSGI-INF/org.apache.sling.testing.mock.osgi.OsgiServiceUtilTest.xml b/src/test/resources/OSGI-INF/org.apache.sling.testing.mock.osgi.OsgiServiceUtilTest.xml new file mode 100644 index 0000000..d678f77 --- /dev/null +++ b/src/test/resources/OSGI-INF/org.apache.sling.testing.mock.osgi.OsgiServiceUtilTest.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<components xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0";> + <scr:component name="org.apache.sling.testing.mock.osgi.OsgiServiceUtilTest$Service1"> + <implementation class="org.apache.sling.testing.mock.osgi.OsgiServiceUtilTest$Service1"/> + <service servicefactory="false"> + <provide interface="org.apache.sling.testing.mock.osgi.OsgiServiceUtilTest$ServiceInterface1"/> + </service> + <property name="service.ranking" type="Integer" value="100"/> + <property name="service.pid" value="org.apache.sling.testing.mock.osgi.OsgiServiceUtilTest$Service1"/> + </scr:component> + <scr:component name="org.apache.sling.testing.mock.osgi.OsgiServiceUtilTest$Service2"> + <implementation class="org.apache.sling.testing.mock.osgi.OsgiServiceUtilTest$Service2"/> + <service servicefactory="false"> + <provide interface="org.apache.sling.testing.mock.osgi.OsgiServiceUtilTest$ServiceInterface2"/> + <provide interface="org.apache.sling.testing.mock.osgi.OsgiServiceUtilTest$ServiceInterface3"/> + </service> + <property name="service.ranking" type="Integer" value="200"/> + <property name="service.pid" value="org.apache.sling.testing.mock.osgi.OsgiServiceUtilTest$Service2"/> + </scr:component> + <scr:component name="org.apache.sling.testing.mock.osgi.OsgiServiceUtilTest$Service3" activate="activate" deactivate="deactivate" modified="modified"> + <implementation class="org.apache.sling.testing.mock.osgi.OsgiServiceUtilTest$Service3"/> + <property name="service.pid" value="org.apache.sling.testing.mock.osgi.OsgiServiceUtilTest$Service3"/> + <reference name="reference2" interface="org.apache.sling.testing.mock.osgi.OsgiServiceUtilTest$ServiceInterface2" cardinality="1..n" policy="static" bind="bindReference2" unbind="unbindReference2"/> + <reference name="reference1" interface="org.apache.sling.testing.mock.osgi.OsgiServiceUtilTest$ServiceInterface1" cardinality="1..1" policy="static" bind="bindReference1" unbind="unbindReference1"/> + <reference name="reference3" interface="org.apache.sling.testing.mock.osgi.OsgiServiceUtilTest$ServiceInterface3" cardinality="0..n" policy="static" bind="bindReference3" unbind="unbindReference3"/> + </scr:component> + <scr:component name="org.apache.sling.testing.mock.osgi.OsgiServiceUtilTest$Service4"> + <implementation class="org.apache.sling.testing.mock.osgi.OsgiServiceUtilTest$Service4"/> + <property name="service.pid" value="org.apache.sling.testing.mock.osgi.OsgiServiceUtilTest$Service4"/> + <reference name="customName" interface="org.apache.sling.testing.mock.osgi.OsgiServiceUtilTest$ServiceInterface1" cardinality="1..1" policy="static" bind="customBind" unbind="customUnbind"/> + </scr:component> +</components> diff --git a/src/test/resources/OSGI-INF/org.apache.sling.testing.mock.osgi.ReflectionServiceUtilActivateDeactivateTest.xml b/src/test/resources/OSGI-INF/org.apache.sling.testing.mock.osgi.ReflectionServiceUtilActivateDeactivateTest.xml deleted file mode 100644 index 23c4585..0000000 --- a/src/test/resources/OSGI-INF/org.apache.sling.testing.mock.osgi.ReflectionServiceUtilActivateDeactivateTest.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<components xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0";> - <scr:component name="org.apache.sling.testing.mock.osgi.ReflectionServiceUtilActivateDeactivateTest$Service1" activate="activate" deactivate="deactivate"> - <implementation class="org.apache.sling.testing.mock.osgi.ReflectionServiceUtilActivateDeactivateTest$Service1"/> - </scr:component> - <scr:component name="org.apache.sling.testing.mock.osgi.ReflectionServiceUtilActivateDeactivateTest$Service2" activate="activate" deactivate="deactivate"> - <implementation class="org.apache.sling.testing.mock.osgi.ReflectionServiceUtilActivateDeactivateTest$Service2"/> - </scr:component> - <scr:component name="org.apache.sling.testing.mock.osgi.ReflectionServiceUtilActivateDeactivateTest$Service3" activate="activate" deactivate="deactivate"> - <implementation class="org.apache.sling.testing.mock.osgi.ReflectionServiceUtilActivateDeactivateTest$Service3"/> - </scr:component> - <scr:component name="org.apache.sling.testing.mock.osgi.ReflectionServiceUtilActivateDeactivateTest$Service4" activate="activate" deactivate="deactivate"> - <implementation class="org.apache.sling.testing.mock.osgi.ReflectionServiceUtilActivateDeactivateTest$Service4"/> - </scr:component> - <scr:component name="org.apache.sling.testing.mock.osgi.ReflectionServiceUtilActivateDeactivateTest$Service5" activate="activate" deactivate="deactivate"> - <implementation class="org.apache.sling.testing.mock.osgi.ReflectionServiceUtilActivateDeactivateTest$Service5"/> - </scr:component> - <scr:component name="org.apache.sling.testing.mock.osgi.ReflectionServiceUtilActivateDeactivateTest$Service6" activate="activate" deactivate="deactivate"> - <implementation class="org.apache.sling.testing.mock.osgi.ReflectionServiceUtilActivateDeactivateTest$Service6"/> - </scr:component> -</components> diff --git a/src/test/resources/OSGI-INF/org.apache.sling.testing.mock.osgi.ReflectionServiceUtilTest.xml b/src/test/resources/OSGI-INF/org.apache.sling.testing.mock.osgi.ReflectionServiceUtilTest.xml deleted file mode 100644 index 202dc40..0000000 --- a/src/test/resources/OSGI-INF/org.apache.sling.testing.mock.osgi.ReflectionServiceUtilTest.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<components xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0";> - <scr:component name="org.apache.sling.testing.mock.osgi.ReflectionServiceUtilTest$Service1"> - <implementation class="org.apache.sling.testing.mock.osgi.ReflectionServiceUtilTest$Service1"/> - <service servicefactory="false"> - <provide interface="org.apache.sling.testing.mock.osgi.ReflectionServiceUtilTest$ServiceInterface1"/> - </service> - <property name="service.ranking" type="Integer" value="100"/> - <property name="service.pid" value="org.apache.sling.testing.mock.osgi.ReflectionServiceUtilTest$Service1"/> - </scr:component> - <scr:component name="org.apache.sling.testing.mock.osgi.ReflectionServiceUtilTest$Service2"> - <implementation class="org.apache.sling.testing.mock.osgi.ReflectionServiceUtilTest$Service2"/> - <service servicefactory="false"> - <provide interface="org.apache.sling.testing.mock.osgi.ReflectionServiceUtilTest$ServiceInterface2"/> - <provide interface="org.apache.sling.testing.mock.osgi.ReflectionServiceUtilTest$ServiceInterface3"/> - </service> - <property name="service.ranking" type="Integer" value="200"/> - <property name="service.pid" value="org.apache.sling.testing.mock.osgi.ReflectionServiceUtilTest$Service2"/> - </scr:component> - <scr:component name="org.apache.sling.testing.mock.osgi.ReflectionServiceUtilTest$Service3" activate="activate" deactivate="deactivate" modified="modified"> - <implementation class="org.apache.sling.testing.mock.osgi.ReflectionServiceUtilTest$Service3"/> - <property name="service.pid" value="org.apache.sling.testing.mock.osgi.ReflectionServiceUtilTest$Service3"/> - <reference name="reference2" interface="org.apache.sling.testing.mock.osgi.ReflectionServiceUtilTest$ServiceInterface2" cardinality="1..n" policy="static" bind="bindReference2" unbind="unbindReference2"/> - <reference name="reference1" interface="org.apache.sling.testing.mock.osgi.ReflectionServiceUtilTest$ServiceInterface1" cardinality="1..1" policy="static" bind="bindReference1" unbind="unbindReference1"/> - <reference name="reference3" interface="org.apache.sling.testing.mock.osgi.ReflectionServiceUtilTest$ServiceInterface3" cardinality="0..n" policy="static" bind="bindReference3" unbind="unbindReference3"/> - </scr:component> - <scr:component name="org.apache.sling.testing.mock.osgi.ReflectionServiceUtilTest$Service4"> - <implementation class="org.apache.sling.testing.mock.osgi.ReflectionServiceUtilTest$Service4"/> - <property name="service.pid" value="org.apache.sling.testing.mock.osgi.ReflectionServiceUtilTest$Service4"/> - <reference name="customName" interface="org.apache.sling.testing.mock.osgi.ReflectionServiceUtilTest$ServiceInterface1" cardinality="1..1" policy="static" bind="customBind" unbind="customUnbind"/> - </scr:component> -</components> -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
