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.9.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git
commit 6ad490ebf9ce7302fe7086e9cbf8d5a8c97acc36 Author: Stefan Seifert <[email protected]> AuthorDate: Fri Dec 2 16:55:22 2016 +0000 SLING-6358 osgi-mock: OsgiContext.getServices should return correctly typed array when empty git-svn-id: https://svn.apache.org/repos/asf/sling/branches/testing/mocks/osgi-mock-1.x@1772374 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/sling/testing/mock/osgi/context/OsgiContextImpl.java | 3 +-- .../apache/sling/testing/mock/osgi/context/OsgiContextImplTest.java | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/apache/sling/testing/mock/osgi/context/OsgiContextImpl.java b/src/main/java/org/apache/sling/testing/mock/osgi/context/OsgiContextImpl.java index ab160ac..2e659ec 100644 --- a/src/main/java/org/apache/sling/testing/mock/osgi/context/OsgiContextImpl.java +++ b/src/main/java/org/apache/sling/testing/mock/osgi/context/OsgiContextImpl.java @@ -23,7 +23,6 @@ import java.util.Dictionary; import java.util.Hashtable; import java.util.Map; -import org.apache.commons.lang3.ArrayUtils; import org.apache.sling.testing.mock.osgi.MapUtil; import org.apache.sling.testing.mock.osgi.MockEventAdmin; import org.apache.sling.testing.mock.osgi.MockOsgi; @@ -209,7 +208,7 @@ public class OsgiContextImpl { } return services; } else { - return (ServiceType[])ArrayUtils.EMPTY_OBJECT_ARRAY; + return (ServiceType[])Array.newInstance(serviceType, 0); } } catch (InvalidSyntaxException ex) { throw new RuntimeException("Invalid filter syntax: " + filter, ex); 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 2ab6bd8..52d49d8 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 @@ -94,13 +94,17 @@ public class OsgiContextImplTest { @Test public void testRegisterMultipleServices() { + Set[] serviceResults = context.getServices(Set.class, null); + assertEquals(0, serviceResults.length); + Set<String> myService1 = new HashSet<String>(); context.registerService(Set.class, myService1); Set<String> myService2 = new HashSet<String>(); context.registerService(Set.class, myService2); // expected: descending order because ordering descending by service id - Set[] serviceResults = context.getServices(Set.class, null); + serviceResults = context.getServices(Set.class, null); + assertEquals(2, serviceResults.length); assertSame(myService1, serviceResults[1]); assertSame(myService2, serviceResults[0]); } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
