Author: angela
Date: Tue May 9 14:04:33 2017
New Revision: 1794586
URL: http://svn.apache.org/viewvc?rev=1794586&view=rev
Log:
minor improvement: missing tests
Added:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImporterTest.java
(with props)
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/pom.xml
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfigurationTest.java
Modified: jackrabbit/oak/trunk/oak-authorization-cug/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/pom.xml?rev=1794586&r1=1794585&r2=1794586&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-authorization-cug/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-authorization-cug/pom.xml Tue May 9 14:04:33 2017
@@ -27,7 +27,7 @@
<properties>
<!-- enable execution of jacoco and set minimal line coverage -->
<skip.coverage>false</skip.coverage>
- <minimum.coverage>0.96</minimum.coverage>
+ <minimum.coverage>0.97</minimum.coverage>
</properties>
<artifactId>oak-authorization-cug</artifactId>
@@ -155,6 +155,12 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>1.10.19</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfigurationTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfigurationTest.java?rev=1794586&r1=1794585&r2=1794586&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfigurationTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfigurationTest.java
Tue May 9 14:04:33 2017
@@ -16,9 +16,11 @@
*/
package org.apache.jackrabbit.oak.spi.security.authorization.cug.impl;
+import java.lang.reflect.Field;
import java.security.Principal;
import java.util.List;
import java.util.Set;
+import javax.annotation.Nonnull;
import javax.jcr.security.AccessControlManager;
import com.google.common.collect.ImmutableList;
@@ -156,4 +158,18 @@ public class CugConfigurationTest extend
assertSame(EmptyPermissionProvider.getInstance(), pp);
}
}
+
+ @Test
+ public void testActivate() throws Exception {
+ CugConfiguration cugConfiguration = new
CugConfiguration(getSecurityProvider());
+ cugConfiguration.activate(ImmutableMap.of(
+ CugConstants.PARAM_CUG_SUPPORTED_PATHS, new String[]
{"/content", "/anotherContent"}
+ ));
+ assertSupportedPaths(cugConfiguration, "/content", "/anotherContent");
+ }
+
+ private static void assertSupportedPaths(@Nonnull CugConfiguration
configuration, @Nonnull String... paths) throws Exception {
+ Set<String> expected = ImmutableSet.copyOf(paths);
+ assertEquals(expected,
configuration.getParameters().getConfigValue(CugConstants.PARAM_CUG_SUPPORTED_PATHS,
ImmutableSet.of()));
+ }
}
\ No newline at end of file
Added:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImporterTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImporterTest.java?rev=1794586&view=auto
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImporterTest.java
(added)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImporterTest.java
Tue May 9 14:04:33 2017
@@ -0,0 +1,77 @@
+/*
+ * 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.spi.security.authorization.cug.impl;
+
+import javax.jcr.ImportUUIDBehavior;
+import javax.jcr.PropertyType;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.Value;
+import javax.jcr.nodetype.PropertyDefinition;
+
+import com.google.common.collect.ImmutableList;
+import org.apache.jackrabbit.JcrConstants;
+import org.apache.jackrabbit.oak.api.Tree;
+import org.apache.jackrabbit.oak.spi.xml.PropInfo;
+import org.apache.jackrabbit.oak.spi.xml.ReferenceChangeTracker;
+import org.apache.jackrabbit.oak.spi.xml.TextValue;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class CugImporterTest extends AbstractCugTest {
+
+ private CugImporter importer;
+
+ @Override
+ public void before() throws Exception {
+ super.before();
+ importer = new CugImporter();
+ }
+
+ @Test(expected = IllegalStateException.class)
+ public void testInitTwice() throws Exception {
+ Session session = Mockito.mock(Session.class);
+ assertTrue(importer.init(session, root, getNamePathMapper(), true,
ImportUUIDBehavior.IMPORT_UUID_CREATE_NEW, new ReferenceChangeTracker(),
getSecurityProvider()));
+ importer.init(session, root, getNamePathMapper(), true,
ImportUUIDBehavior.IMPORT_UUID_CREATE_NEW, new ReferenceChangeTracker(),
getSecurityProvider());
+ }
+
+ @Test
+ public void testInvalidPropInfo() throws Exception {
+ createCug(root, SUPPORTED_PATH, "principalName");
+ Tree parent = root.getTree(SUPPORTED_PATH);
+ PropInfo propInfo = new PropInfo(JcrConstants.JCR_PRIMARYTYPE,
PropertyType.STRING, ImmutableList.of(new TextValue() {
+ @Override
+ public String getString() {
+ return "principalName";
+ }
+
+ @Override
+ public Value getValue(int targetType) throws RepositoryException {
+ return getValueFactory(root).createValue("principalName",
PropertyType.STRING);
+ }
+
+ @Override
+ public void dispose() {
+ }
+ }));
+ PropertyDefinition propDef = Mockito.mock(PropertyDefinition.class);
+ assertFalse(importer.handlePropInfo(parent, propInfo, propDef));
+ }
+}
\ No newline at end of file
Propchange:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImporterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
