Author: rombert Date: Wed Oct 7 12:47:55 2015 New Revision: 1707281 URL: http://svn.apache.org/viewvc?rev=1707281&view=rev Log: SLING-5114 - Remove OakOnly and JackrabbitOnly annotations
- removed annotations from org.apache.sling.commons.testing - Converted JackrabbitOnly annotations to Ignore with comments Added: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/RepositoryNameTest.java - copied, changed from r1707279, sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/OakRepositoryNameTest.java Removed: sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/junit/categories/JackrabbitOnly.java sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/junit/categories/OakOnly.java sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JUnitCategoriesTest.java sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/JackrabbitRepositoryNameTest.java sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/OakRepositoryNameTest.java Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/GetAclTest.java sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletPrivilegesUpdateTest.java sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/userManager/UpdateUserTest.java Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/GetAclTest.java URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/GetAclTest.java?rev=1707281&r1=1707280&r2=1707281&view=diff ============================================================================== --- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/GetAclTest.java (original) +++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/GetAclTest.java Wed Oct 7 12:47:55 2015 @@ -36,11 +36,10 @@ import org.apache.sling.commons.json.JSO import org.apache.sling.commons.json.JSONException; import org.apache.sling.commons.json.JSONObject; import org.apache.sling.commons.testing.integration.HttpTest; -import org.apache.sling.commons.testing.junit.categories.JackrabbitOnly; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; -import org.junit.experimental.categories.Category; /** * Tests for the 'acl' and 'eacl' Sling Get Operation @@ -325,8 +324,8 @@ public class GetAclTest { /** * Test for SLING-2600, Effective ACL servlet returns incorrect information */ - @Category(JackrabbitOnly.class) // TODO: fails on Oak - @Test + @Test + @Ignore // TODO: fails on Oak public void testEffectiveAclMergeForUser_SubsetOfPrivilegesDeniedOnChild() throws IOException, JSONException { testUserId = H.createTestUser(); Copied: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/RepositoryNameTest.java (from r1707279, sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/OakRepositoryNameTest.java) URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/RepositoryNameTest.java?p2=sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/RepositoryNameTest.java&p1=sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/OakRepositoryNameTest.java&r1=1707279&r2=1707281&rev=1707281&view=diff ============================================================================== --- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/OakRepositoryNameTest.java (original) +++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/RepositoryNameTest.java Wed Oct 7 12:47:55 2015 @@ -19,20 +19,14 @@ package org.apache.sling.launchpad.webap import static org.junit.Assert.assertEquals; import org.apache.sling.commons.testing.integration.HttpTest; -import org.apache.sling.commons.testing.junit.categories.OakOnly; import org.apache.sling.launchpad.webapp.integrationtest.util.RepositoryTestUtil; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.junit.experimental.categories.Category; /** Verify the repository name when running on Oak. - * Checking that this test class was executed is a good - * way of verifying which repository implementation was - * used to run the integration tests. */ -@Category(OakOnly.class) -public class OakRepositoryNameTest { +public class RepositoryNameTest { private final HttpTest H = new HttpTest(); Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletPrivilegesUpdateTest.java URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletPrivilegesUpdateTest.java?rev=1707281&r1=1707280&r2=1707281&view=diff ============================================================================== --- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletPrivilegesUpdateTest.java (original) +++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletPrivilegesUpdateTest.java Wed Oct 7 12:47:55 2015 @@ -46,7 +46,6 @@ import org.apache.sling.commons.json.JSO import org.apache.sling.commons.json.JSONObject; import org.apache.sling.commons.testing.integration.HttpTest; import org.apache.sling.commons.testing.integration.NameValuePairList; -import org.apache.sling.commons.testing.junit.categories.JackrabbitOnly; import org.apache.sling.launchpad.webapp.integrationtest.AuthenticatedTestUtil; import org.apache.sling.servlets.post.SlingPostConstants; import org.junit.After; @@ -54,7 +53,6 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; -import org.junit.experimental.categories.Category; import org.junit.rules.TestName; public class PostServletPrivilegesUpdateTest { @@ -94,8 +92,7 @@ public class PostServletPrivilegesUpdate * of a PROPERTY_REMOVED event and a PROPERTY_ADDED event */ @Test - @Category(JackrabbitOnly.class) // TODO: fails on Oak - @Ignore // TODO fails on jackrabbit 2.6.5 + @Ignore // TODO fails on jackrabbit 2.6.5 and on Oak public void testUpdatePropertyPrivilegesAndEvents() throws IOException, JSONException, RepositoryException, InterruptedException { //1. Create user as admin (OK) // curl -F:name=myuser -Fpwd=password -FpwdConfirm=password http://admin:admin@localhost:8080/system/userManager/user.create.html Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/userManager/UpdateUserTest.java URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/userManager/UpdateUserTest.java?rev=1707281&r1=1707280&r2=1707281&view=diff ============================================================================== --- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/userManager/UpdateUserTest.java (original) +++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/userManager/UpdateUserTest.java Wed Oct 7 12:47:55 2015 @@ -33,11 +33,9 @@ import org.apache.commons.httpclient.Use import org.apache.sling.commons.json.JSONException; import org.apache.sling.commons.json.JSONObject; import org.apache.sling.commons.testing.integration.HttpTest; -import org.apache.sling.commons.testing.junit.categories.JackrabbitOnly; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.junit.experimental.categories.Category; /** * Tests for the 'updateAuthorizable' and 'changePassword' Sling Post