From 2fbc7e9335fa882d69f583267f511cf750fa701b Mon Sep 17 00:00:00 2001 From: Gregor Zurowski Date: Wed, 1 Jan 2014 21:04:55 -0500 Subject: [PATCH 1/2] CAMEL-7102: Fix authentication tests of the camel-jcr component Signed-off-by: Gregor Zurowski --- .../component/jcr/AuthTokenLoginFailureTest.java | 2 -- .../camel/component/jcr/JcrAuthTestBase.java | 15 +++++++-------- .../component/jcr/JcrAuthTokenWithLoginTest.java | 5 +++-- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/AuthTokenLoginFailureTest.java b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/AuthTokenLoginFailureTest.java index 406bf2c6b4222..73095103fd0cd 100644 --- a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/AuthTokenLoginFailureTest.java +++ b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/AuthTokenLoginFailureTest.java @@ -22,13 +22,11 @@ import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; -import org.junit.Ignore; import org.junit.Test; public class AuthTokenLoginFailureTest extends JcrAuthTestBase { @Test - @Ignore("Fails with some error") public void testCreateNodeWithAuthentication() throws Exception { Exchange exchange = createExchangeWithBody("hello!"); Exchange out = template.send("direct:a", exchange); diff --git a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java index 238945595a797..3e59ffca273dc 100644 --- a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java +++ b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTestBase.java @@ -71,20 +71,19 @@ protected Context createJndiContext() throws Exception { user = userManager.createUser("test", "quatloos"); } // set up permissions - String permissionsPath = session.getRootNode().getPath(); + String path = session.getRootNode().getPath(); AccessControlManager accessControlManager = session .getAccessControlManager(); AccessControlPolicyIterator acls = accessControlManager - .getApplicablePolicies(permissionsPath); + .getApplicablePolicies(path); + AccessControlList acl = null; if (acls.hasNext()) { - AccessControlList acl = (AccessControlList) acls.nextAccessControlPolicy(); - acl.addAccessControlEntry(user.getPrincipal(), accessControlManager - .getSupportedPrivileges(permissionsPath)); - accessControlManager.setPolicy(permissionsPath, acl); + acl = (AccessControlList) acls.nextAccessControlPolicy(); } else { - throw new Exception("could not set access control for path " - + permissionsPath); + acl = (AccessControlList) accessControlManager.getPolicies(path)[0]; } + acl.addAccessControlEntry(user.getPrincipal(), accessControlManager.getSupportedPrivileges(path)); + accessControlManager.setPolicy(path, acl); session.save(); session.logout(); diff --git a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTokenWithLoginTest.java b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTokenWithLoginTest.java index e1dee1acacc46..0d2aa77676fb3 100644 --- a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTokenWithLoginTest.java +++ b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTokenWithLoginTest.java @@ -16,21 +16,22 @@ */ package org.apache.camel.component.jcr; +import javax.jcr.LoginException; + import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; -import org.junit.Ignore; import org.junit.Test; public class JcrAuthTokenWithLoginTest extends JcrAuthTestBase { @Test - @Ignore("Fails with some error") public void testCreateNodeWithAuthentication() throws Exception { Exchange exchange = createExchangeWithBody("hello!"); Exchange out = template.send("direct:a", exchange); assertNotNull(out); String uuid = out.getOut().getBody(String.class); assertNull("Expected body to be null, found JCR node UUID", uuid); + assertTrue("Wrong exception type", out.getException() instanceof LoginException); } @Override From 71ad30423ef5d61e60e746d1d6465fc58367355c Mon Sep 17 00:00:00 2001 From: Gregor Zurowski Date: Wed, 1 Jan 2014 21:23:38 -0500 Subject: [PATCH 2/2] CAMEL-7102: Rename authentication test classes of camel-jcr component. The previous class names of the test cases were misleading as they tested the opposite of what the name suggested. Signed-off-by: Gregor Zurowski --- ...okenWithLoginTest.java => JcrAuthTokenLoginFailureTest.java} | 2 +- ...uthTokenLoginFailureTest.java => JcrAuthTokenLoginTest.java} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename components/camel-jcr/src/test/java/org/apache/camel/component/jcr/{JcrAuthTokenWithLoginTest.java => JcrAuthTokenLoginFailureTest.java} (96%) rename components/camel-jcr/src/test/java/org/apache/camel/component/jcr/{AuthTokenLoginFailureTest.java => JcrAuthTokenLoginTest.java} (97%) diff --git a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTokenWithLoginTest.java b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTokenLoginFailureTest.java similarity index 96% rename from components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTokenWithLoginTest.java rename to components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTokenLoginFailureTest.java index 0d2aa77676fb3..e830db3b7c989 100644 --- a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTokenWithLoginTest.java +++ b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTokenLoginFailureTest.java @@ -22,7 +22,7 @@ import org.apache.camel.builder.RouteBuilder; import org.junit.Test; -public class JcrAuthTokenWithLoginTest extends JcrAuthTestBase { +public class JcrAuthTokenLoginFailureTest extends JcrAuthTestBase { @Test public void testCreateNodeWithAuthentication() throws Exception { diff --git a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/AuthTokenLoginFailureTest.java b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTokenLoginTest.java similarity index 97% rename from components/camel-jcr/src/test/java/org/apache/camel/component/jcr/AuthTokenLoginFailureTest.java rename to components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTokenLoginTest.java index 73095103fd0cd..69c5647045de5 100644 --- a/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/AuthTokenLoginFailureTest.java +++ b/components/camel-jcr/src/test/java/org/apache/camel/component/jcr/JcrAuthTokenLoginTest.java @@ -24,7 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.junit.Test; -public class AuthTokenLoginFailureTest extends JcrAuthTestBase { +public class JcrAuthTokenLoginTest extends JcrAuthTestBase { @Test public void testCreateNodeWithAuthentication() throws Exception {