sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sseif...@apache.org
Subject svn commit: r1727395 - in /sling/branches/testing/mocks/osgi-mock-1.x/src: main/java/org/apache/sling/testing/mock/osgi/ test/java/org/apache/sling/testing/mock/osgi/
Date Thu, 28 Jan 2016 16:18:27 GMT
Author: sseifert
Date: Thu Jan 28 16:18:27 2016
New Revision: 1727395

URL: http://svn.apache.org/viewvc?rev=1727395&view=rev
Log:
SLING-5462 ensure service references are sorted ascending by service ranking, not descending

Added:
    sling/branches/testing/mocks/osgi-mock-1.x/src/test/java/org/apache/sling/testing/mock/osgi/MockServiceReferencesSortTest.java
  (with props)
Modified:
    sling/branches/testing/mocks/osgi-mock-1.x/src/main/java/org/apache/sling/testing/mock/osgi/MockServiceReference.java
    sling/branches/testing/mocks/osgi-mock-1.x/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java

Modified: sling/branches/testing/mocks/osgi-mock-1.x/src/main/java/org/apache/sling/testing/mock/osgi/MockServiceReference.java
URL: http://svn.apache.org/viewvc/sling/branches/testing/mocks/osgi-mock-1.x/src/main/java/org/apache/sling/testing/mock/osgi/MockServiceReference.java?rev=1727395&r1=1727394&r2=1727395&view=diff
==============================================================================
--- sling/branches/testing/mocks/osgi-mock-1.x/src/main/java/org/apache/sling/testing/mock/osgi/MockServiceReference.java
(original)
+++ sling/branches/testing/mocks/osgi-mock-1.x/src/main/java/org/apache/sling/testing/mock/osgi/MockServiceReference.java
Thu Jan 28 16:18:27 2016
@@ -81,14 +81,13 @@ class MockServiceReference implements Se
         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/branches/testing/mocks/osgi-mock-1.x/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java
URL: http://svn.apache.org/viewvc/sling/branches/testing/mocks/osgi-mock-1.x/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java?rev=1727395&r1=1727394&r2=1727395&view=diff
==============================================================================
--- sling/branches/testing/mocks/osgi-mock-1.x/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java
(original)
+++ sling/branches/testing/mocks/osgi-mock-1.x/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java
Thu Jan 28 16:18:27 2016
@@ -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

Added: sling/branches/testing/mocks/osgi-mock-1.x/src/test/java/org/apache/sling/testing/mock/osgi/MockServiceReferencesSortTest.java
URL: http://svn.apache.org/viewvc/sling/branches/testing/mocks/osgi-mock-1.x/src/test/java/org/apache/sling/testing/mock/osgi/MockServiceReferencesSortTest.java?rev=1727395&view=auto
==============================================================================
--- sling/branches/testing/mocks/osgi-mock-1.x/src/test/java/org/apache/sling/testing/mock/osgi/MockServiceReferencesSortTest.java
(added)
+++ sling/branches/testing/mocks/osgi-mock-1.x/src/test/java/org/apache/sling/testing/mock/osgi/MockServiceReferencesSortTest.java
Thu Jan 28 16:18:27 2016
@@ -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

Propchange: sling/branches/testing/mocks/osgi-mock-1.x/src/test/java/org/apache/sling/testing/mock/osgi/MockServiceReferencesSortTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sling/branches/testing/mocks/osgi-mock-1.x/src/test/java/org/apache/sling/testing/mock/osgi/MockServiceReferencesSortTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Thu Jan 28 16:18:27 2016
@@ -0,0 +1 @@
+LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Author

Propchange: sling/branches/testing/mocks/osgi-mock-1.x/src/test/java/org/apache/sling/testing/mock/osgi/MockServiceReferencesSortTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message