You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2016/01/28 16:55:06 UTC
svn commit: r1727389 - in /sling/trunk/testing/mocks/osgi-mock: ./
src/main/java/org/apache/sling/testing/mock/osgi/
src/test/java/org/apache/sling/testing/mock/osgi/
Author: sseifert
Date: Thu Jan 28 15:55:06 2016
New Revision: 1727389
URL: http://svn.apache.org/viewvc?rev=1727389&view=rev
Log:
SLING-5462 ensure service references are sorted ascending by service ranking, not descending
Removed:
sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/RealServiceReferencesSortTest.java
sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/ServiceReferencesUtil.java
Modified:
sling/trunk/testing/mocks/osgi-mock/pom.xml
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockServiceReference.java
sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java
sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockServiceReferencesSortTest.java
Modified: sling/trunk/testing/mocks/osgi-mock/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/pom.xml?rev=1727389&r1=1727388&r2=1727389&view=diff
==============================================================================
--- sling/trunk/testing/mocks/osgi-mock/pom.xml (original)
+++ sling/trunk/testing/mocks/osgi-mock/pom.xml Thu Jan 28 15:55:06 2016
@@ -34,11 +34,6 @@
<name>Apache Sling Testing OSGi Mock</name>
<description>Mock implementation of selected OSGi APIs.</description>
- <properties>
- <pax-exam.version>4.6.0</pax-exam.version>
- <pax-link.version>2.4.3</pax-link.version>
- </properties>
-
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/mocks/osgi-mock</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/osgi-mock</developerConnection>
@@ -126,61 +121,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-container-forked</artifactId>
- <version>${pax-exam.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-junit4</artifactId>
- <version>${pax-exam.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-link-mvn</artifactId>
- <version>${pax-exam.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-aether</artifactId>
- <version>${pax-link.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-wrap</artifactId>
- <version>${pax-link.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.base</groupId>
- <artifactId>ops4j-base-lang</artifactId>
- <version>1.2.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.base</groupId>
- <artifactId>ops4j-base-net</artifactId>
- <version>1.2.3</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.tinybundles</groupId>
- <artifactId>tinybundles</artifactId>
- <version>1.0.0</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
<build>
Modified: sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockServiceReference.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockServiceReference.java?rev=1727389&r1=1727388&r2=1727389&view=diff
==============================================================================
--- sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockServiceReference.java (original)
+++ sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockServiceReference.java Thu Jan 28 15:55:06 2016
@@ -81,14 +81,13 @@ class MockServiceReference<T> implements
if (!(obj instanceof MockServiceReference)) {
return 0;
}
- // sort by decreasing by service ranking, and secondary increasing by
- // service id
+ // sort by ascending by service ranking, and secondary ascending by service id
Integer serviceRanking = getServiceRanking();
- Integer otherServiceRanking = ((MockServiceReference) obj).getServiceRanking();
- int serviceRankingCompare = otherServiceRanking.compareTo(serviceRanking);
+ Integer otherServiceRanking = ((MockServiceReference)obj).getServiceRanking();
+ int serviceRankingCompare = serviceRanking.compareTo(otherServiceRanking);
if (serviceRankingCompare == 0) {
Long serviceId = getServiceId();
- Long otherServiceId = ((MockServiceReference) obj).getServiceId();
+ Long otherServiceId = ((MockServiceReference)obj).getServiceId();
return serviceId.compareTo(otherServiceId);
} else {
return serviceRankingCompare;
Modified: sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java?rev=1727389&r1=1727388&r2=1727389&view=diff
==============================================================================
--- sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java (original)
+++ sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java Thu Jan 28 15:55:06 2016
@@ -85,7 +85,7 @@ public class MockBundleContextTest {
String clazz3 = Integer.class.getName();
Object service3 = new Object();
- Dictionary<String, Object> properties3 = getServiceProperties(100L);
+ Dictionary<String, Object> properties3 = getServiceProperties(-100L);
ServiceRegistration reg3 = bundleContext.registerService(clazz3, service3, properties3);
// test get service references
Modified: sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockServiceReferencesSortTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockServiceReferencesSortTest.java?rev=1727389&r1=1727388&r2=1727389&view=diff
==============================================================================
--- sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockServiceReferencesSortTest.java (original)
+++ sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockServiceReferencesSortTest.java Thu Jan 28 15:55:06 2016
@@ -19,11 +19,22 @@
package org.apache.sling.testing.mock.osgi;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Hashtable;
+import java.util.List;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.ServiceRegistration;
/** Test the service-ranking based sorting of mock service references */
public class MockServiceReferencesSortTest {
@@ -39,10 +50,51 @@ public class MockServiceReferencesSortTe
public void tearDown() {
MockOsgi.shutdown(bundleContext);
}
-
+
@Test
public void testServicesOrder() {
- // TODO this should return the same result as in RealServiceReferencesSortTest
- assertEquals("54321", ServiceReferencesUtil.getSortedServicesString(bundleContext));
+ assertEquals("12345", getSortedServicesString(bundleContext));
+ }
+
+ private static ServiceRegistration<?> registerStringService(BundleContext ctx, int index) {
+ final Hashtable<String, Object> props = new Hashtable<String, Object>();
+ props.put(Constants.SERVICE_RANKING, new Integer(index));
+ return ctx.registerService(String.class.getName(), String.valueOf(index), props);
+ }
+
+ /** Register services with a specific ranking, sort their references and
+ * return their concatenated toString() values.
+ * Use to test service references sorting.
+ */
+ private static String getSortedServicesString(BundleContext ctx) {
+ final List<ServiceRegistration<?>> toCleanup = new ArrayList<ServiceRegistration<?>>();
+
+ toCleanup.add(registerStringService(ctx, 3));
+ toCleanup.add(registerStringService(ctx, 5));
+ toCleanup.add(registerStringService(ctx, 4));
+ toCleanup.add(registerStringService(ctx, 1));
+ toCleanup.add(registerStringService(ctx, 2));
+
+ ServiceReference<?> [] refs = null;
+ try {
+ refs = ctx.getServiceReferences(String.class.getName(), null);
+ } catch(InvalidSyntaxException ise) {
+ fail("Unexpected InvalidSyntaxException");
+ }
+ assertNotNull("Expecting our service references", refs);
+ Arrays.sort(refs);
+
+ final StringBuilder sb = new StringBuilder();
+ for(ServiceReference<?> ref : refs) {
+ sb.append(ctx.getService(ref).toString());
+ ctx.ungetService(ref);
+ }
+
+ for(ServiceRegistration<?> reg : toCleanup) {
+ reg.unregister();
+ }
+
+ return sb.toString();
}
+
}
\ No newline at end of file