You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2017/05/31 17:39:08 UTC
svn commit: r1797086 - in
/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal:
InternalSecurityProviderTest.java PreconditionsTest.java
Author: angela
Date: Wed May 31 17:39:07 2017
New Revision: 1797086
URL: http://svn.apache.org/viewvc?rev=1797086&view=rev
Log:
OAK-5882 : Improve coverage for oak.security code in oak-core (wip)
Added:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/InternalSecurityProviderTest.java
- copied, changed from r1796981, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/SecurityProviderImplTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/PreconditionsTest.java (with props)
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/InternalSecurityProviderTest.java (from r1796981, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/SecurityProviderImplTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/InternalSecurityProviderTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/InternalSecurityProviderTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/SecurityProviderImplTest.java&r1=1796981&r2=1797086&rev=1797086&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/SecurityProviderImplTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/InternalSecurityProviderTest.java Wed May 31 17:39:07 2017
@@ -14,72 +14,83 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.security;
+package org.apache.jackrabbit.oak.security.internal;
+import com.google.common.collect.Iterables;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
import org.apache.jackrabbit.oak.spi.security.SecurityConfiguration;
import org.apache.jackrabbit.oak.spi.security.authentication.AuthenticationConfiguration;
-import org.apache.jackrabbit.oak.spi.security.principal.CompositePrincipalConfiguration;
+import org.apache.jackrabbit.oak.spi.security.authentication.token.TokenConfiguration;
+import org.apache.jackrabbit.oak.spi.security.authorization.AuthorizationConfiguration;
import org.apache.jackrabbit.oak.spi.security.principal.PrincipalConfiguration;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConfiguration;
import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration;
+import org.apache.jackrabbit.oak.spi.whiteboard.DefaultWhiteboard;
+import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
import org.junit.Test;
import org.mockito.Mockito;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import static org.mockito.Mockito.when;
-public class SecurityProviderImplTest {
+public class InternalSecurityProviderTest {
- private SecurityProviderImpl securityProvider = new SecurityProviderImpl();
+ private static final ConfigurationParameters PARAMS = ConfigurationParameters.of("a", "value");
+
+ private InternalSecurityProvider securityProvider = new InternalSecurityProvider();
@Test
- public void testBindPrincipalConfiguration() {
- PrincipalConfiguration defaultConfig = securityProvider.getConfiguration(PrincipalConfiguration.class);
- assertTrue(defaultConfig instanceof CompositePrincipalConfiguration);
- CompositePrincipalConfiguration cpc = (CompositePrincipalConfiguration) defaultConfig;
+ public void testDefaultWhiteboard() {
+ assertNull(securityProvider.getWhiteboard());
+ }
+
+ @Test
+ public void testSetWhiteboard() {
+ Whiteboard wb = new DefaultWhiteboard();
+ securityProvider.setWhiteboard(wb);
+ assertSame(wb, securityProvider.getWhiteboard());
+ }
+ @Test
+ public void testDefaultPrincipalConfiguration() {
+ PrincipalConfiguration defaultConfig = securityProvider.getConfiguration(PrincipalConfiguration.class);
+ assertNull(defaultConfig);
+ }
+
+ @Test
+ public void testSetPrincipalConfiguration() {
PrincipalConfiguration pc = Mockito.mock(PrincipalConfiguration.class);
- when(pc.getParameters()).thenReturn(ConfigurationParameters.EMPTY);
+ when(pc.getParameters()).thenReturn(PARAMS);
- securityProvider.bindPrincipalConfiguration(pc);
+ securityProvider.setPrincipalConfiguration(pc);
- assertNotSame(pc, securityProvider.getConfiguration(PrincipalConfiguration.class));
- assertSame(defaultConfig, securityProvider.getConfiguration(PrincipalConfiguration.class));
+ assertSame(pc, securityProvider.getConfiguration(PrincipalConfiguration.class));
for (SecurityConfiguration sc : securityProvider.getConfigurations()) {
if (sc instanceof PrincipalConfiguration) {
- assertSame(defaultConfig, sc);
+ assertSame(pc, sc);
}
}
- assertTrue(cpc.getConfigurations().contains(pc));
+ assertTrue(Iterables.contains(securityProvider.getConfigurations(), pc));
+
+ assertEquals(PARAMS, securityProvider.getParameters(PrincipalConfiguration.NAME));
}
@Test
- public void testUnbinPrincipalConfiguration() {
- CompositePrincipalConfiguration cpc = (CompositePrincipalConfiguration) securityProvider.getConfiguration(PrincipalConfiguration.class);
-
- PrincipalConfiguration pc = Mockito.mock(PrincipalConfiguration.class);
- when(pc.getParameters()).thenReturn(ConfigurationParameters.EMPTY);
-
- securityProvider.bindPrincipalConfiguration(pc);
- assertTrue(cpc.getConfigurations().contains(pc));
-
- securityProvider.unbindPrincipalConfiguration(pc);
- assertFalse(cpc.getConfigurations().contains(pc));
+ public void testDefaultUserConfiguration() {
+ assertNull(securityProvider.getConfiguration(UserConfiguration.class));
}
-
@Test
- public void testBindUserConfiguration() {
+ public void testSetUserConfiguration() {
UserConfiguration uc = Mockito.mock(UserConfiguration.class);
- securityProvider.bindUserConfiguration(uc);
+ when(uc.getParameters()).thenReturn(PARAMS);
+
+ securityProvider.setUserConfiguration(uc);
assertSame(uc, securityProvider.getConfiguration(UserConfiguration.class));
for (SecurityConfiguration sc : securityProvider.getConfigurations()) {
@@ -87,26 +98,20 @@ public class SecurityProviderImplTest {
assertSame(uc, sc);
}
}
+ assertEquals(PARAMS, securityProvider.getParameters(UserConfiguration.NAME));
}
@Test
- public void testUnBindUserConfiguration() {
- UserConfiguration uc = Mockito.mock(UserConfiguration.class);
- securityProvider.bindUserConfiguration(uc);
- securityProvider.unbindUserConfiguration(uc);
-
- assertNull(securityProvider.getConfiguration(UserConfiguration.class));
- for (SecurityConfiguration sc : securityProvider.getConfigurations()) {
- if (sc instanceof UserConfiguration) {
- fail();
- }
- }
+ public void testDefaultAuthenticationConfiguration() {
+ assertNull(securityProvider.getConfiguration(AuthenticationConfiguration.class));
}
@Test
- public void testBindAuthenticationConfiguration() {
+ public void testSetAuthenticationConfiguration() {
AuthenticationConfiguration ac = Mockito.mock(AuthenticationConfiguration.class);
- securityProvider.bindAuthenticationConfiguration(ac);
+ when(ac.getParameters()).thenReturn(PARAMS);
+
+ securityProvider.setAuthenticationConfiguration(ac);
assertSame(ac, securityProvider.getConfiguration(AuthenticationConfiguration.class));
for (SecurityConfiguration sc : securityProvider.getConfigurations()) {
@@ -114,26 +119,41 @@ public class SecurityProviderImplTest {
assertSame(ac, sc);
}
}
+
+ assertEquals(PARAMS, securityProvider.getParameters(AuthenticationConfiguration.NAME));
}
@Test
- public void testUnBindAuthenticationConfiguration() {
- AuthenticationConfiguration ac = Mockito.mock(AuthenticationConfiguration.class);
- securityProvider.bindAuthenticationConfiguration(ac);
- securityProvider.unbindAuthenticationConfiguration(ac);
+ public void testDefaultAuthorizationConfiguration() {
+ assertNull(securityProvider.getConfiguration(AuthorizationConfiguration.class));
+ }
- assertNull(securityProvider.getConfiguration(AuthenticationConfiguration.class));
+ @Test
+ public void testSetAuthorizationConfiguration() {
+ AuthorizationConfiguration ac = Mockito.mock(AuthorizationConfiguration.class);
+ when(ac.getParameters()).thenReturn(PARAMS);
+ securityProvider.setAuthorizationConfiguration(ac);
+
+ assertSame(ac, securityProvider.getConfiguration(AuthorizationConfiguration.class));
for (SecurityConfiguration sc : securityProvider.getConfigurations()) {
- if (sc instanceof AuthenticationConfiguration) {
- fail();
+ if (sc instanceof AuthorizationConfiguration) {
+ assertSame(ac, sc);
}
}
+
+ assertEquals(PARAMS, securityProvider.getParameters(AuthorizationConfiguration.NAME));
}
@Test
- public void testBindPrivilegeConfiguration() {
+ public void testDefaultPrivilegeConfiguration() {
+ assertNull(securityProvider.getConfiguration(PrivilegeConfiguration.class));
+ }
+
+ @Test
+ public void testSetPrivilegeConfiguration() {
PrivilegeConfiguration pc = Mockito.mock(PrivilegeConfiguration.class);
- securityProvider.bindPrivilegeConfiguration(pc);
+ when(pc.getParameters()).thenReturn(PARAMS);
+ securityProvider.setPrivilegeConfiguration(pc);
assertSame(pc, securityProvider.getConfiguration(PrivilegeConfiguration.class));
for (SecurityConfiguration sc : securityProvider.getConfigurations()) {
@@ -141,19 +161,42 @@ public class SecurityProviderImplTest {
assertSame(pc, sc);
}
}
+
+ assertEquals(PARAMS, securityProvider.getParameters(PrivilegeConfiguration.NAME));
}
@Test
- public void testUnBindPrivilegeConfiguration() {
- PrivilegeConfiguration pc = Mockito.mock(PrivilegeConfiguration.class);
- securityProvider.bindPrivilegeConfiguration(pc);
- securityProvider.unbindPrivilegeConfiguration(pc);
+ public void testDefaultTokenConfiguration() {
+ assertNull(securityProvider.getConfiguration(TokenConfiguration.class));
+ }
- assertNull(securityProvider.getConfiguration(PrivilegeConfiguration.class));
+ @Test
+ public void testSetTokenConfiguration() {
+ TokenConfiguration tc = Mockito.mock(TokenConfiguration.class);
+ when(tc.getParameters()).thenReturn(PARAMS);
+ securityProvider.setTokenConfiguration(tc);
+
+ assertSame(tc, securityProvider.getConfiguration(TokenConfiguration.class));
for (SecurityConfiguration sc : securityProvider.getConfigurations()) {
- if (sc instanceof PrivilegeConfiguration) {
- fail();
+ if (sc instanceof TokenConfiguration) {
+ assertSame(tc, sc);
}
}
+ assertEquals(PARAMS, securityProvider.getParameters(TokenConfiguration.NAME));
+ }
+
+ @Test(expected = IllegalArgumentException.class)
+ public void testGetUnknownConfiguration() {
+ securityProvider.getConfiguration(SecurityConfiguration.class);
+ }
+
+ @Test
+ public void testGetParametersForNull() {
+ assertSame(ConfigurationParameters.EMPTY, securityProvider.getParameters(null));
+ }
+
+ @Test
+ public void testGetParametersForUnknown() {
+ assertSame(ConfigurationParameters.EMPTY, securityProvider.getParameters("unknownName"));
}
}
\ No newline at end of file
Added: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/PreconditionsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/PreconditionsTest.java?rev=1797086&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/PreconditionsTest.java (added)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/PreconditionsTest.java Wed May 31 17:39:07 2017
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.oak.security.internal;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class PreconditionsTest {
+
+ private Preconditions preconditions = new Preconditions();
+
+ @Test
+ public void testEmptyIsSatisfied() {
+ assertTrue(preconditions.areSatisfied());
+ }
+
+ @Test
+ public void testAddPrecondition() {
+ preconditions.addPrecondition("a");
+ assertFalse(preconditions.areSatisfied());
+ }
+
+ @Test
+ public void testClearPrecondition() {
+ preconditions.addPrecondition("a");
+ preconditions.clearPreconditions();
+ assertTrue(preconditions.areSatisfied());
+ }
+
+ @Test
+ public void testAddNonMatchingCandidate() {
+ preconditions.addPrecondition("a");
+ preconditions.addCandidate("c");
+ assertFalse(preconditions.areSatisfied());
+ }
+
+ @Test
+ public void testAddCandidateNoPrecondition() {
+ preconditions.addCandidate("a");
+ assertTrue(preconditions.areSatisfied());
+ }
+
+ @Test
+ public void testAddMatchingCandidate() {
+ preconditions.addPrecondition("a");
+ preconditions.addCandidate("a");
+ assertTrue(preconditions.areSatisfied());
+ }
+
+ @Test
+ public void testRemoveMatchingCandidate() {
+ preconditions.addPrecondition("a");
+ preconditions.addCandidate("a");
+ preconditions.removeCandidate("a");
+ assertFalse(preconditions.areSatisfied());
+ }
+}
\ No newline at end of file
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/PreconditionsTest.java
------------------------------------------------------------------------------
svn:eol-style = native