[sling-org-apache-sling-testing-osgi-mock] 06/09: SLING-5462 ensure service references are sorted ascending by service ranking, not descending

[ro...@apache.org]

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.7.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-osgi-mock.git

commit 8682e4ed4dc021bb02bef42b2600749fd773b106
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Thu Jan 28 16:18:27 2016 +0000

    SLING-5462 ensure service references are sorted ascending by service ranking, not descending
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/branches/testing/mocks/osgi-mock-1.x@1727395 13f79535-47bb-0310-9956-ffa450edef68
---
 .../testing/mock/osgi/MockServiceReference.java    |   9 +-
 .../testing/mock/osgi/MockBundleContextTest.java   |   2 +-
 .../mock/osgi/MockServiceReferencesSortTest.java   | 100 +++++++++++++++++++++
 3 files changed, 105 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/apache/sling/testing/mock/osgi/MockServiceReference.java b/src/main/java/org/apache/sling/testing/mock/osgi/MockServiceReference.java
index c7568be..a623550 100644
--- a/src/main/java/org/apache/sling/testing/mock/osgi/MockServiceReference.java
+++ b/src/main/java/org/apache/sling/testing/mock/osgi/MockServiceReference.java
@@ -81,14 +81,13 @@ class MockServiceReference implements ServiceReference {
         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;
diff --git a/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java b/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java
index b2c78e6..847d02d 100644
--- a/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java
+++ b/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java
@@ -84,7 +84,7 @@ public class MockBundleContextTest {
 
         String clazz3 = Integer.class.getName();
         Object service3 = new Object();
-        Dictionary properties3 = getServiceProperties(100L);
+        Dictionary properties3 = getServiceProperties(-100L);
         ServiceRegistration reg3 = bundleContext.registerService(clazz3, service3, properties3);
 
         // test get service references
diff --git a/src/test/java/org/apache/sling/testing/mock/osgi/MockServiceReferencesSortTest.java b/src/test/java/org/apache/sling/testing/mock/osgi/MockServiceReferencesSortTest.java
new file mode 100644
index 0000000..daf1268
--- /dev/null
+++ b/src/test/java/org/apache/sling/testing/mock/osgi/MockServiceReferencesSortTest.java
@@ -0,0 +1,100 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+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 {
+    
+    private BundleContext bundleContext;
+
+    @Before
+    public void setUp() {
+        bundleContext = MockOsgi.newBundleContext();
+    }
+
+    @After
+    public void tearDown() {
+        MockOsgi.shutdown(bundleContext);
+    }
+
+    @Test
+    public void testServicesOrder() {
+        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

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.