You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2015/05/27 15:24:29 UTC
svn commit: r1682011 - in /sling/trunk/testing/mocks/osgi-mock/src:
main/java/org/apache/sling/testing/mock/osgi/MockServiceRegistration.java
test/java/org/apache/sling/testing/mock/osgi/MockServiceReferenceTest.java
Author: rombert
Date: Wed May 27 13:24:29 2015
New Revision: 1682011
URL: http://svn.apache.org/r1682011
Log:
SLING-4756 - ServiceListener notifications are not filtered
Service registration now sets the mandatory objectClass
property
Modified:
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockServiceRegistration.java
sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockServiceReferenceTest.java
Modified: sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockServiceRegistration.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockServiceRegistration.java?rev=1682011&r1=1682010&r2=1682011&view=diff
==============================================================================
--- sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockServiceRegistration.java (original)
+++ sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockServiceRegistration.java Wed May 27 13:24:29 2015
@@ -53,6 +53,7 @@ class MockServiceRegistration implements
this.service = service;
this.properties = properties != null ? properties : new Hashtable<String,Object>();
this.properties.put(Constants.SERVICE_ID, this.serviceId);
+ this.properties.put(Constants.OBJECTCLASS, clazzes);
this.serviceReference = new MockServiceReference(bundle, this);
this.bundleContext = bundleContext;
readOsgiMetadata();
Modified: sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockServiceReferenceTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockServiceReferenceTest.java?rev=1682011&r1=1682010&r2=1682011&view=diff
==============================================================================
--- sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockServiceReferenceTest.java (original)
+++ sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockServiceReferenceTest.java Wed May 27 13:24:29 2015
@@ -18,6 +18,7 @@
*/
package org.apache.sling.testing.mock.osgi;
+import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
@@ -63,8 +64,11 @@ public class MockServiceReferenceTest {
@Test
public void testProperties() {
- assertEquals(2, this.serviceReference.getPropertyKeys().length);
+ assertEquals(3, this.serviceReference.getPropertyKeys().length);
assertEquals("value1", this.serviceReference.getProperty("customProp1"));
+ // mandatory properties set by the container
+ assertNotNull(this.serviceReference.getProperty(Constants.SERVICE_ID));
+ assertArrayEquals((String[]) this.serviceReference.getProperty(Constants.OBJECTCLASS), new String[] { String.class.getName() });
}
@Test