svn commit: r1764469 - /sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java

[bdelacretaz]

Author: bdelacretaz
Date: Wed Oct 12 13:47:16 2016
New Revision: 1764469

URL: http://svn.apache.org/viewvc?rev=1764469&view=rev
Log:
SLING-6139 - the tests pass, my workspace was out of sync

Modified:
    
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java

Modified: 
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java?rev=1764469&r1=1764468&r2=1764469&view=diff
==============================================================================
--- 
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java
 (original)
+++ 
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java
 Wed Oct 12 13:47:16 2016
@@ -1104,7 +1104,6 @@ public class ResourceResolverTest {
         }
     }
 
-    @Ignore("SLING-6139 - broken by recent MapEntries changes?")
     @Test public void testResolveResourceAliasWithUpdate() throws Exception {
         // define an alias for the rootPath
         String [] alias = {"testAlias","testAliasToUpdate"};
@@ -1357,7 +1356,6 @@ public class ResourceResolverTest {
 
     }
 
-    @Ignore("SLING-6139 - broken by recent MapEntries changes?")
     @Test public void testResolveResourceAliasJcrContentWithUpdate() throws 
Exception {
         // define an alias for the rootPath in the jcr:content child node
         String [] alias = {"testAlias","testAliasToUpdate"};