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/02/20 17:35:51 UTC
svn commit: r1731421 - in /sling/trunk/bundles/jcr/base: pom.xml src/test/java/org/apache/sling/jcr/base/RepositoryInitializersTest.java

Author: sseifert
Date: Sat Feb 20 16:35:51 2016
New Revision: 1731421

URL: http://svn.apache.org/viewvc?rev=1731421&view=rev
Log:
SLING-5462 update to latest mock version that fixes the service ranking problem

Modified:
    sling/trunk/bundles/jcr/base/pom.xml
    sling/trunk/bundles/jcr/base/src/test/java/org/apache/sling/jcr/base/RepositoryInitializersTest.java

Modified: sling/trunk/bundles/jcr/base/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/pom.xml?rev=1731421&r1=1731420&r2=1731421&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/base/pom.xml (original)
+++ sling/trunk/bundles/jcr/base/pom.xml Sat Feb 20 16:35:51 2016
@@ -150,13 +150,13 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.osgi-mock</artifactId>
-            <version>1.6.0</version>
+            <version>1.7.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.sling-mock</artifactId>
-            <version>1.6.0</version>
+            <version>1.6.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: sling/trunk/bundles/jcr/base/src/test/java/org/apache/sling/jcr/base/RepositoryInitializersTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/base/src/test/java/org/apache/sling/jcr/base/RepositoryInitializersTest.java?rev=1731421&r1=1731420&r2=1731421&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/base/src/test/java/org/apache/sling/jcr/base/RepositoryInitializersTest.java (original)
+++ sling/trunk/bundles/jcr/base/src/test/java/org/apache/sling/jcr/base/RepositoryInitializersTest.java Sat Feb 20 16:35:51 2016
@@ -113,10 +113,7 @@ public class RepositoryInitializersTest
         
         assertStart(true);
         
-        // TODO this should really be 1,2,3 but the Sling OSGi mocks sort 
-        // in the wrong order w.r.t service ranking, see SLING-5462,
-        // will be fixed in osgi-mock 2.0.2
-        assertTestInitializerProperty("3,2,1,");
+        assertTestInitializerProperty("1,2,3,");
         assertAdditionalRepositoryServices(1);
     }
     
@@ -128,9 +125,7 @@ public class RepositoryInitializersTest
         
         assertStart(true);
         
-        // TODO see comment in inOrderInitializers, this should really
-        // be 3,2,1, caused by SLING-5462
-        assertTestInitializerProperty("1,2,3,");
+        assertTestInitializerProperty("3,2,1,");
         assertAdditionalRepositoryServices(1);
     }