| commit | 51d6eeb3c3e2373aa2a7faab581fa11e0f686df2 | [log] [tgz] |
|---|---|---|
| author | Bertrand Delacretaz <bdelacretaz@apache.org> | Wed Oct 12 13:47:16 2016 +0000 |
| committer | Bertrand Delacretaz <bdelacretaz@apache.org> | Wed Oct 12 13:47:16 2016 +0000 |
| tree | dd842cd4ab477020a83f361af5dd724e0a3dc976 | |
| parent | 73a76d37283d6340b1717f04721d293ff5b38ed0 [diff] |
SLING-6139 - the tests pass, my workspace was out of sync git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1764469 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java b/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java index 5fb38c0..6aa4848 100644 --- a/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java +++ b/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java
@@ -1104,7 +1104,6 @@ } } - @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 @@ } - @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"};