From cc7889143c6a5a7ce33a3f68a34ae59366d7bcd7 Mon Sep 17 00:00:00 2001 From: jensp Date: Sat, 23 Jan 2016 18:13:28 +0000 Subject: [PATCH] CCM NG: All tests in ccm-core now pass again git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@3824 8810af33-2d31-482b-a856-94f89814c4df --- ccm-core/pom.xml | 47 ++-- .../formbuilder/FormBuilderConfig.java | 2 + .../com/arsdigita/kernel/KernelConfig.java | 10 +- .../java/com/arsdigita/xml/XmlConfig.java | 32 +-- .../categorization/CategoryRepository.java | 53 ++--- .../configuration/ConfigurationManager.java | 110 ++++----- .../libreccm/configuration/SettingInfo.java | 32 ++- .../configuration/StringListSetting.java | 2 +- .../ConfigurationManagerBTest.java | 216 ------------------ .../ConfigurationManagerTest.java | 8 +- .../AuthorizationInterceptorTest.java | 4 +- .../libreccm/security/GroupManagerTest.java | 45 ++-- .../security/PermissionCheckerTest.java | 207 +++++++---------- .../security/PermissionManagerTest.java | 61 ++--- .../libreccm/security/RoleManagerTest.java | 63 ++--- .../security/SecuredCollectionTest.java | 64 ++---- .../security/SecuredIteratorTest.java | 76 ++---- .../java/org/libreccm/security/ShiroTest.java | 60 ++--- .../libreccm/security/UserManagerTest.java | 53 ++--- .../security/UserManagerTest/data.yml | 60 ++++- pom.xml | 42 +--- 21 files changed, 465 insertions(+), 782 deletions(-) delete mode 100644 ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerBTest.java diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml index 77939b898..4b8b29de4 100644 --- a/ccm-core/pom.xml +++ b/ccm-core/pom.xml @@ -215,7 +215,6 @@ org.apache.maven.plugins maven-compiler-plugin - 3.3 1.8 1.8 @@ -240,7 +239,6 @@ org.apache.maven.plugins maven-surefire-plugin - 2.18.1 org.libreccm.tests.categories.UnitTest @@ -248,7 +246,6 @@ org.jacoco jacoco-maven-plugin - 0.7.5.201505241946 default-prepare-agent @@ -383,7 +380,7 @@ org.apache.maven.plugins maven-surefire-report-plugin - 2.18.1 + 2.19.1 org.jacoco @@ -393,7 +390,7 @@ org.codehaus.mojo findbugs-maven-plugin - 3.0.1 + 3.0.3 findbugs-exclude.xml @@ -401,11 +398,11 @@ org.apache.maven.plugins maven-pmd-plugin - 3.4 + 3.6 true utf-8 - 1.7 + 1.8 /rulesets/java/basic.xml /rulesets/java/braces.xml @@ -458,7 +455,6 @@ **/ExceptionUnwrapper.java **/Exceptions.java **/FileParameter.java - **/FormBuilderConfig.java **/FullDateFormatter.java **/globalization/** **/GlobalizationConfig.java @@ -466,10 +462,8 @@ **/JavaPropertyReader.java **/JavaPropertyWriter.java **/kernel/** - **/KernelConfig.java **/LockableImpl.java **/mail/** - **/MailConfig.java **/MapParameter.java **/NotificationConfig.java **/Parameter.java @@ -477,7 +471,6 @@ **/ParameterException.java **/RegistryConfig.java **/ResourceParameter.java - **/SecurityConfig.java **/SecurityHelper.java **/SingletonParameter.java **/SpecificClassParameter.java @@ -514,7 +507,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 2.8 + 2.8.1 @@ -542,13 +535,13 @@ org.apache.openejb arquillian-tomee-embedded - 1.7.2 + 1.7.3 test org.apache.openejb tomee-embedded - 1.7.2 + 1.7.3 test @@ -580,19 +573,19 @@ org.jboss.logmanager jboss-logmanager - 1.5.4.Final + 2.0.3.Final test org.apache.openejb tomee-webservices - 1.7.1 + 4.0.0 org.apache.openejb tomee-jaxrs - 1.7.1 + 1.7.3 com.h2database @@ -652,7 +645,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.18.1 + 2.19.1 always 999 @@ -682,12 +675,12 @@ org.apache.openejb arquillian-tomee-remote - 1.7.2 + 1.7.3 org.apache.openejb apache-tomee - 1.7.2 + 1.7.3 plus zip @@ -733,7 +726,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.18.1 + 2.19.1 always 999 @@ -969,7 +962,7 @@ --> - wildfly8-remote-h2-mem + wildfly-remote-h2-mem org.wildfly @@ -1030,7 +1023,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.18.1 + 2.19.1 always 999 @@ -1052,7 +1045,7 @@ - wildfly8-remote-pgsql + wildfly-remote-pgsql org.wildfly @@ -1113,7 +1106,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.18.1 + 2.19.1 always 999 @@ -1135,7 +1128,7 @@ - wildfly8-remote-mysql + wildfly-remote-mysql org.wildfly @@ -1196,7 +1189,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.18.1 + 2.19.1 always 999 diff --git a/ccm-core/src/main/java/com/arsdigita/formbuilder/FormBuilderConfig.java b/ccm-core/src/main/java/com/arsdigita/formbuilder/FormBuilderConfig.java index 6d563ca6d..4cf0cba90 100755 --- a/ccm-core/src/main/java/com/arsdigita/formbuilder/FormBuilderConfig.java +++ b/ccm-core/src/main/java/com/arsdigita/formbuilder/FormBuilderConfig.java @@ -39,6 +39,7 @@ public final class FormBuilderConfig { private String controlsHelpUrl; @Setting + @SuppressWarnings("PMD.LongVariable") private Boolean interpolateEmailActions; public static FormBuilderConfig getConfig() { @@ -68,6 +69,7 @@ public final class FormBuilderConfig { return interpolateEmailActions; } + @SuppressWarnings("PMD.LongVariable") public void setInterpolateEmailActions(final Boolean interpolateEmailActions) { this.interpolateEmailActions = interpolateEmailActions; } diff --git a/ccm-core/src/main/java/com/arsdigita/kernel/KernelConfig.java b/ccm-core/src/main/java/com/arsdigita/kernel/KernelConfig.java index 34096faeb..528c5bd0e 100644 --- a/ccm-core/src/main/java/com/arsdigita/kernel/KernelConfig.java +++ b/ccm-core/src/main/java/com/arsdigita/kernel/KernelConfig.java @@ -255,6 +255,13 @@ public final class KernelConfig { @Override public String toString() { + final String languages; + if (supportedLanguages == null) { + languages = ""; + } else { + languages = supportedLanguages.stream().collect(Collectors.joining(", ")); + } + return String.format( "%s{ " + "debugEnabled = %b, " @@ -275,7 +282,8 @@ public final class KernelConfig { ssoEnabled, rememberLoginEnabled, secureLoginEnabled, - supportedLanguages.stream().collect(Collectors.joining(", ")), + //supportedLanguages == null ? "" : supportedLanguages.stream().collect(Collectors.joining(", ")), + languages, defaultLanguage); } diff --git a/ccm-core/src/main/java/com/arsdigita/xml/XmlConfig.java b/ccm-core/src/main/java/com/arsdigita/xml/XmlConfig.java index 9a2606270..9ed205736 100644 --- a/ccm-core/src/main/java/com/arsdigita/xml/XmlConfig.java +++ b/ccm-core/src/main/java/com/arsdigita/xml/XmlConfig.java @@ -68,6 +68,7 @@ public final class XmlConfig { private String saxParser = "xerces"; @Setting + @SuppressWarnings("PMD.LongVariable") private Boolean fullTimeFormatterEnabled = false; public static XmlConfig getConfig() { @@ -100,11 +101,11 @@ public final class XmlConfig { * Returns the class name of the default {@link TransformerFactory}. This * method encapsulates the default value so that is easy to change. The * method is only for use by the classes in the {@code com.arsdigita.xml} - * package, therefore the method is {@code protected}. + * package, therefore the method is visible for the package. * * @return */ - protected String getDefaultXslTransformerFactoryClassname() { + String getDefaultXslTransformerFactoryClassname() { return SAXON; } @@ -127,11 +128,10 @@ public final class XmlConfig { */ public String getDomBuilderFactoryClassname() { - switch(domBuilder) { - case "resin": + if ("resin".equals(domBuilder)) { return DOM_RESIN; - default: - return getDefaultDomBuilderFactoryClassname(); + } else { + return getDefaultDomBuilderFactoryClassname(); } } @@ -139,11 +139,11 @@ public final class XmlConfig { * Returns the class name of the default {@link DocumentBuilderFactory}. * This method encapsulates the default value so that is easy to change. The method is only for * use by the classes in the {@code com.arsdigita.xml} package, therefore the method is - * {@code protected}. + * only accessible from the package. * * @return */ - protected String getDefaultDomBuilderFactoryClassname() { + String getDefaultDomBuilderFactoryClassname() { return DOM_XERCES; } @@ -167,23 +167,22 @@ public final class XmlConfig { */ public String getSaxParserFactoryClassname() { - switch(saxParser) { - case "resin": - return SAX_RESIN; - default: - return getDefaultSaxParserFactoryClassname(); - } + if ("resin".equals(saxParser)) { + return SAX_RESIN; + } else { + return getDefaultSaxParserFactoryClassname(); + } } /** * Returns the class name of the default {@link SAXParserFactory}. * This method encapsulates the default value so that is easy to change. The method is only for * use by the classes in the {@code com.arsdigita.xml} package, therefore the method is - * {@code protected}. + * only visible in the package. * * @return */ - protected String getDefaultSaxParserFactoryClassname() { + String getDefaultSaxParserFactoryClassname() { return SAX_XERCES; } @@ -196,6 +195,7 @@ public final class XmlConfig { return fullTimeFormatterEnabled; } + @SuppressWarnings("PMD.LongVariable") public void setFullTimeFormatterEnabled( final Boolean fullTimeFormatterEnabled) { this.fullTimeFormatterEnabled = fullTimeFormatterEnabled; diff --git a/ccm-core/src/main/java/org/libreccm/categorization/CategoryRepository.java b/ccm-core/src/main/java/org/libreccm/categorization/CategoryRepository.java index 8132a1478..786dac824 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/CategoryRepository.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/CategoryRepository.java @@ -39,7 +39,7 @@ import javax.persistence.TypedQuery; public class CategoryRepository extends AbstractEntityRepository { private static final Logger LOGGER = LogManager.getLogger( - CategoryRepository.class); + CategoryRepository.class); @Inject private DomainRepository domainRepo; @@ -62,7 +62,7 @@ public class CategoryRepository extends AbstractEntityRepository */ public List getTopLevelCategories() { final TypedQuery query = getEntityManager().createNamedQuery( - "Category.topLevelCategories", Category.class); + "Category.topLevelCategories", Category.class); return query.getResultList(); } @@ -75,14 +75,14 @@ public class CategoryRepository extends AbstractEntityRepository final String[] tokens = path.split(":"); if (tokens.length > 2) { throw new InvalidCategoryPathException( - "The provided path is invalid: More than one colon found. " - + "Valid path format: domainKey:path"); + "The provided path is invalid: More than one colon found. " + + "Valid path format: domainKey:path"); } if (tokens.length < 2) { throw new InvalidCategoryPathException( - "The provided path is invalid: No domain found in path. " - + "Valid path format: domainKey:path"); + "The provided path is invalid: No domain found in path. " + + "Valid path format: domainKey:path"); } final Domain domain; @@ -90,8 +90,8 @@ public class CategoryRepository extends AbstractEntityRepository domain = domainRepo.findByDomainKey(tokens[0]); } catch (NoResultException ex) { throw new InvalidCategoryPathException(String.format( - "No domain identified by the key '%s' found.", - tokens[0]), + "No domain identified by the key '%s' found.", + tokens[0]), ex); } @@ -108,7 +108,7 @@ public class CategoryRepository extends AbstractEntityRepository } String normalizedPath = path.replace('.', '/'); - if (normalizedPath.startsWith("/")) { + if (normalizedPath.charAt(0) == '/') { normalizedPath = normalizedPath.substring(1); } @@ -118,28 +118,29 @@ public class CategoryRepository extends AbstractEntityRepository } LOGGER.debug(String.format( - "Trying to find category with path \"%s\" in " - + "domain \"%s\".", - normalizedPath, - domain.getDomainKey())); + "Trying to find category with path \"%s\" in " + + "domain \"%s\".", + normalizedPath, + domain.getDomainKey())); final String[] tokens = normalizedPath.split("/"); Category current = domain.getRoot(); - for (String token : tokens) { + for (final String token : tokens) { if (current.getSubCategories() == null) { return null; } final Optional result = current.getSubCategories() - .stream() - .filter((c) -> { - LOGGER.debug(new FormattedMessage( - "#findByPath(Domain, String): c = %s", c.toString())); - LOGGER.debug(new FormattedMessage( - "#findByPath(Domain, String): c.getName = \"%s\"", c.getName())); - LOGGER.debug(new FormattedMessage( - "#findByPath(Domain, String): token = \"%s\"", token)); - return c.getName().equals(token); - }) - .findFirst(); + .stream() + .filter((c) -> { + LOGGER.debug("#findByPath(Domain, String): c = {}", + c.toString()); + LOGGER.debug( + "#findByPath(Domain, String): c.getName = \"{}\"", + c.getName()); + LOGGER.debug("#findByPath(Domain, String): token = \"{}\"", + token); + return c.getName().equals(token); + }) + .findFirst(); if (result.isPresent()) { current = result.get(); } else { @@ -155,7 +156,7 @@ public class CategoryRepository extends AbstractEntityRepository * subcategory or the an {@link Domain} as root category. * * @return A list of all orphaned categories. Normally this list should be - * empty. + * empty. */ public List getOrphanedCategories() { // TODO implement method diff --git a/ccm-core/src/main/java/org/libreccm/configuration/ConfigurationManager.java b/ccm-core/src/main/java/org/libreccm/configuration/ConfigurationManager.java index 37162ff43..62e99f4cc 100644 --- a/ccm-core/src/main/java/org/libreccm/configuration/ConfigurationManager.java +++ b/ccm-core/src/main/java/org/libreccm/configuration/ConfigurationManager.java @@ -51,6 +51,11 @@ import javax.persistence.EntityManager; * @author Jens Pelzetter */ @RequestScoped +@SuppressWarnings({"PMD.GodClass", + "PMD.TooManyMethods", + "PMD.LongVariable", + "PMD.ModifiedCyclomaticComplexity", + "PMD.StandardCyclomaticComplexity",}) public class ConfigurationManager { private static final Logger LOGGER = LogManager.getLogger( @@ -307,6 +312,9 @@ public class ConfigurationManager { * * @return The {@link SettingInfo} for the provided configuration class. */ + @SuppressWarnings({"PMD.NPathComplexity", + "PMD.CyclomaticComplexity", + "PMD.StandardCyclomaticComplexity"}) public SettingInfo getSettingInfo(final Class configuration, final String name) { if (configuration == null) { @@ -374,18 +382,18 @@ public class ConfigurationManager { settingInfo.setConfClass(configuration.getName()); settingInfo.setDescBundle(descBundle); - + if (settingAnnotation.labelKey() == null - || settingAnnotation.labelKey().isEmpty()) { + || settingAnnotation.labelKey().isEmpty()) { settingInfo.setLabelKey(String.join(".", field.getName(), - "label")); + "label")); } else { settingInfo.setLabelKey(name); } - + if (settingAnnotation.descKey() == null || settingAnnotation.descKey().isEmpty()) { - settingInfo.setDescKey(String.join(".", + settingInfo.setDescKey(String.join(".", field.getName(), "descripotion")); } else { @@ -578,25 +586,6 @@ public class ConfigurationManager { setting.setDisplayName(settingName); final Category category = findCategoryForNewSetting(configuration); categoryManager.addObjectToCategory(setting, category); - -// final Domain registry = domainRepository -// .findByDomainKey(REGISTRY_DOMAIN); -// Category category = categoryRepository -// .findByPath(registry, configuration.getClass().getName()); -// if (category == null) { -// final String[] tokens = configuration.getClass().getName(). -// split("\\."); -// final StringBuilder categoryPath = new StringBuilder( -// configuration.getClass().getName().length()); -// for (String token : tokens) { -// if (categoryPath.length() > 0) { -// categoryPath.append('.'); -// } -// categoryPath.append(token); -// category = createCategoryIfNotExists(categoryPath.toString()); -// } -// } -// categoryManager.addObjectToCategory(setting, category); } LOGGER.debug(String.format("New value of setting \"%s\" is: \"%s\"", @@ -685,7 +674,7 @@ public class ConfigurationManager { ex); return null; } - + if (category == null) { return conf; } @@ -705,17 +694,16 @@ public class ConfigurationManager { settingType); if (setting != null) { try { - LOGGER.debug(String. - format("Setting \"%s\" found. Value: %s", - settingPath, - setting.getValue().toString())); + LOGGER.debug("Setting \"{}\" found. Value: %s", + settingPath, + setting.getValue().toString()); field.set(conf, setting.getValue()); } catch (IllegalAccessException ex) { - LOGGER.warn(String.format( - "Failed to set value of configuration class \"%s\". " + LOGGER.warn( + "Failed to set value of configuration class \"{}\". " + "Ignoring.", - confClass.getName()), - ex); + confClass.getName(), + ex); } } } @@ -724,10 +712,9 @@ public class ConfigurationManager { } private Category findCategoryForNewSetting(final Object configuration) { - LOGGER.debug(new FormattedMessage( - "#findCategoryForNewSetting: Looking for category for " - + "configuration \"%s\"...", - configuration.getClass().getName())); + LOGGER.debug("#findCategoryForNewSetting: Looking for category for " + + "configuration \"{}\"...", + configuration.getClass().getName()); final String categoryPath = configuration.getClass().getName(); final String[] tokens = categoryPath.split("\\."); final Domain registry = domainRepository @@ -739,20 +726,20 @@ public class ConfigurationManager { final boolean[] exists = new boolean[tokens.length]; for (int i = 0; i < tokens.length; i++) { final String path = buildCategoryPath(tokens, i); - LOGGER.debug(new FormattedMessage( - "#findCategoryForNewSetting: Checking if category \"%s\" exists.", - path)); + LOGGER.debug("#findCategoryForNewSetting: " + + "Checking if category \"{}\" exists.", + path); final Category category = categoryRepository.findByPath(registry, path); if (category == null) { - LOGGER.debug(new FormattedMessage( - "#findCategoryForNewSetting: Category \"%s\" does not exist.", - path)); + LOGGER.debug("#findCategoryForNewSetting: " + + "Category \"{}\" does not exist.", + path); exists[i] = false; } else { - LOGGER.debug(new FormattedMessage( - "#findCategoryForNewSetting: Category \"%s\" exists.", - path)); + LOGGER.debug( + "#findCategoryForNewSetting: Category \"{}\" exists.", + path); exists[i] = true; categories[i] = category; } @@ -761,33 +748,34 @@ public class ConfigurationManager { LOGGER.debug( "#findCategoryForNewSetting: Creating missing categories..."); for (int i = 0; i < tokens.length; i++) { - LOGGER.debug(new FormattedMessage( - "#findCategoryForNewSetting: Checking for category \"%s\"...", - tokens[i])); + LOGGER.debug( + "#findCategoryForNewSetting: Checking for category \"{}\"...", + tokens[i]); if (!exists[i]) { if (i == 0) { - LOGGER.debug(new FormattedMessage( - "#findCategoryForNewSetting: Category \"%s\" does not exist, " - + "creating as subcategory of the registry root category.", - tokens[i])); + LOGGER.debug("#findCategoryForNewSetting: " + + "Category \"{}\" does not exist, " + + "creating as subcategory of the registry " + + "root category.", + tokens[i]); categories[i] = createNewCategory(tokens[i], registry.getRoot()); } else { - LOGGER.debug(new FormattedMessage( - "#findCategoryForNewSetting: Category \"%s\" does not exist, " - + "creating as subcategory of \"%s\"", - tokens[i], - categories[i - 1].getName())); + LOGGER.debug("#findCategoryForNewSetting: " + + "Category \"{}\" does not exist, " + + "creating as subcategory of \"{}\"", + tokens[i], + categories[i - 1].getName()); categories[i] = createNewCategory(tokens[i], categories[i - 1]); } } } - LOGGER.debug(new FormattedMessage( - "#findCategoryForNewSetting: Found/Created category \"%s\".", - categoryPath)); + LOGGER.debug("#findCategoryForNewSetting: " + + "Found/Created category \"{}\".", + categoryPath); return categories[categories.length - 1]; } diff --git a/ccm-core/src/main/java/org/libreccm/configuration/SettingInfo.java b/ccm-core/src/main/java/org/libreccm/configuration/SettingInfo.java index b13a3b36b..df48aa381 100644 --- a/ccm-core/src/main/java/org/libreccm/configuration/SettingInfo.java +++ b/ccm-core/src/main/java/org/libreccm/configuration/SettingInfo.java @@ -155,16 +155,40 @@ public final class SettingInfo { if (!Objects.equals(name, other.getName())) { return false; } - if (!Objects.equals(valueType, other.getValueType())) { - return false; - } - if (!Objects.equals(defaultValue, other.getDefaultValue())) { +// if (!Objects.equals(valueType, other.getValueType())) { +// return false; +// } +// if (!Objects.equals(defaultValue, other.getDefaultValue())) { +// return false; +// } + if (!equalsValueProps(other)) { return false; } if (!Objects.equals(confClass, other.getConfClass())) { return false; } +// if (!Objects.equals(descBundle, other.getDescBundle())) { +// return false; +// } +// +// if (!Objects.equals(labelKey, other.getLabelKey())) { +// return false; +// } +// +// return Objects.equals(descKey, other.getDescKey()); + return equalsDescProps(other); + } + + private boolean equalsValueProps(final SettingInfo other) { + if (!Objects.equals(valueType, other.getValueType())) { + return false; + } + + return Objects.equals(defaultValue, other.getDefaultValue()); + } + + private boolean equalsDescProps(final SettingInfo other) { if (!Objects.equals(descBundle, other.getDescBundle())) { return false; } diff --git a/ccm-core/src/main/java/org/libreccm/configuration/StringListSetting.java b/ccm-core/src/main/java/org/libreccm/configuration/StringListSetting.java index ee8ac61e0..71ee99d16 100644 --- a/ccm-core/src/main/java/org/libreccm/configuration/StringListSetting.java +++ b/ccm-core/src/main/java/org/libreccm/configuration/StringListSetting.java @@ -76,7 +76,7 @@ public class StringListSetting extends AbstractSetting> { } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } diff --git a/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerBTest.java b/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerBTest.java deleted file mode 100644 index 62e23d179..000000000 --- a/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerBTest.java +++ /dev/null @@ -1,216 +0,0 @@ -/* - * Copyright (C) 2015 LibreCCM Foundation. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301 USA - */ -package org.libreccm.configuration; - -import com.example.TestConfiguration; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.junit.InSequence; -import org.jboss.arquillian.persistence.CreateSchema; -import org.jboss.arquillian.persistence.PersistenceTest; -import org.jboss.arquillian.persistence.UsingDataSet; -import org.jboss.arquillian.transaction.api.annotation.TransactionMode; -import org.jboss.arquillian.transaction.api.annotation.Transactional; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.resolver.api.maven.Maven; -import org.jboss.shrinkwrap.resolver.api.maven.PomEquippedResolveStage; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.libreccm.categorization.Categorization; -import org.libreccm.core.CcmObject; -import org.libreccm.jpa.EntityManagerProducer; -import org.libreccm.jpa.utils.MimeTypeConverter; -import org.libreccm.l10n.LocalizedString; -import org.libreccm.security.Permission; -import org.libreccm.tests.categories.IntegrationTest; -import org.libreccm.testutils.EqualsVerifier; -import org.libreccm.web.CcmApplication; -import org.libreccm.workflow.Workflow; - -import java.io.File; -import java.math.BigDecimal; - -import javax.inject.Inject; -import org.jboss.arquillian.persistence.ShouldMatchDataSet; - -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.*; - -/** - * - * @author Jens Pelzetter - */ -@org.junit.experimental.categories.Category(IntegrationTest.class) -@RunWith(Arquillian.class) -@PersistenceTest -@Transactional(TransactionMode.COMMIT) -@CreateSchema({"create_ccm_core_schema.sql"}) -public class ConfigurationManagerBTest { - - @Inject - private ConfigurationManager configurationManager; - - public ConfigurationManagerBTest() { - } - - @BeforeClass - public static void setUpClass() { - } - - @AfterClass - public static void tearDownClass() { - } - - @Before - public void setUp() { - } - - @After - public void tearDown() { - } - - @Deployment - public static WebArchive createDeployment() { - final PomEquippedResolveStage pom = Maven - .resolver() - .loadPomFromFile("pom.xml"); - final PomEquippedResolveStage dependencies = pom - .importCompileAndRuntimeDependencies(); - final File[] libs = dependencies.resolve().withTransitivity().asFile(); - - for (File lib : libs) { - System.err.printf("Adding file '%s' to test archive...%n", - lib.getName()); - } - - return ShrinkWrap - .create(WebArchive.class, - "LibreCCM-org.libreccm.categorization.ConfigurationManagerBTest.war") - .addPackage("org.libreccm.categorization") - .addPackage("org.libreccm.configuration") - .addPackage("org.libreccm.core") - .addPackage("org.libreccm.jpa") - .addPackage("org.libreccm.jpa.utils") - .addPackage("org.libreccm.l10n") - .addPackage("org.libreccm.security") - .addPackage("org.libreccm.tests.categories") - .addPackage("org.libreccm.testutils") - .addPackage("org.libreccm.web") - .addPackage("org.libreccm.workflow") - .addPackage("com.example") - //-- - .addPackage("org.libreccm.cdi.utils") - .addPackage("org.libreccm.modules") - .addPackage("com.arsdigita.kernel") - .addPackage("com.arsdigita.kernel.security") - .addPackage("com.arsdigita.util") - .addPackage("com.arsdigita.util.parameter") - .addAsLibraries(libs) - .addAsResource("test-persistence.xml", - "META-INF/persistence.xml") - .addAsResource( - "configs/org/libreccm/configuration/ConfigurationManagerTest/" - + "log4j2.xml", - "log4j2.xml") - .addAsWebInfResource("test-web.xml", "WEB-INF/web.xml") - .addAsWebInfResource(EmptyAsset.INSTANCE, "WEB-INF/beans.xml"); - } - - @Test - @InSequence(1) - public void managerIsInjected() { - assertThat(configurationManager, is(not(nullValue()))); - } - - @Test - @UsingDataSet( - "datasets/org/libreccm/configuration/ConfigurationManagerTest/data.yml") - @InSequence(2) - public void datasetOnly() { - System.out.println("Dataset loaded successfully."); - } - - @Test - @UsingDataSet( - "datasets/org/libreccm/configuration/ConfigurationManagerTest/data.yml") - @InSequence(1100) - public void loadConfiguration() { - final ExampleConfiguration configuration = configurationManager - .findConfiguration(ExampleConfiguration.class); - - assertThat(configuration, is(not(nullValue()))); - assertThat(configuration.getPrice(), - is(equalTo(new BigDecimal("98.99")))); - assertThat(configuration.isEnabled(), is(true)); - assertThat(configuration.getMinTemperature(), is(23.5)); - assertThat(configuration.getItemsPerPage(), is(20L)); - assertThat(configuration.getHelpUrl(), - is(equalTo("http://www.example.org"))); - assertThat(configuration.getLanguages().size(), is(2)); - assertThat(configuration.getLanguages(), hasItem("de")); - assertThat(configuration.getLanguages(), hasItem("en")); - } - - @Test - @UsingDataSet( - "datasets/org/libreccm/configuration/ConfigurationManagerTest/data.yml") - @ShouldMatchDataSet( - "datasets/org/libreccm/configuration/ConfigurationManagerTest/" - + "after-save-changed.yml") - @InSequence(1200) - public void saveConfiguration() { - final ExampleConfiguration configuration = configurationManager - .findConfiguration(ExampleConfiguration.class); - - configuration.setPrice(new BigDecimal("109.99")); - configuration.setItemsPerPage(30L); - configuration.addLanguage("es"); - - configurationManager.saveConfiguration(configuration); - } - - @Test - @UsingDataSet( - "datasets/org/libreccm/configuration/ConfigurationManagerTest/data.yml") - @InSequence(2100) - public void loadNewConfiguration() { - final TestConfiguration configuration = configurationManager - .findConfiguration(TestConfiguration.class); - - assertThat(configuration, is(nullValue())); - } - - @Test - @UsingDataSet( - "datasets/org/libreccm/configuration/ConfigurationManagerTest/data.yml") - @ShouldMatchDataSet( - "datasets/org/libreccm/configuration/ConfigurationManagerTest/" - + "after-save-new.yml") - @InSequence(2200) - public void saveNewConfiguration() { - configurationManager.saveConfiguration(new TestConfiguration()); - } - -} diff --git a/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerTest.java b/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerTest.java index ab47b4617..0a4b1bc54 100644 --- a/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerTest.java @@ -53,7 +53,11 @@ import java.io.File; import java.math.BigDecimal; import javax.inject.Inject; + import org.jboss.arquillian.persistence.ShouldMatchDataSet; +import org.libreccm.categorization.Category; + +import javax.persistence.TypedQuery; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; @@ -192,7 +196,9 @@ public class ConfigurationManagerTest { final TestConfiguration configuration = configurationManager .findConfiguration(TestConfiguration.class); - assertThat(configuration, is(nullValue())); + assertThat(configuration, is(not(nullValue()))); + assertThat(configuration.getEnabled(), is(false)); + assertThat(configuration.getItemsPerPage(), is(40L)); } @Test diff --git a/ccm-core/src/test/java/org/libreccm/security/AuthorizationInterceptorTest.java b/ccm-core/src/test/java/org/libreccm/security/AuthorizationInterceptorTest.java index 23343fc7a..54926a00c 100644 --- a/ccm-core/src/test/java/org/libreccm/security/AuthorizationInterceptorTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/AuthorizationInterceptorTest.java @@ -112,9 +112,9 @@ public class AuthorizationInterceptorTest { .addPackage(org.libreccm.categorization.Categorization.class .getPackage()) .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) - .addPackage(org.libreccm.core.CcmObject.class.getPackage()) .addPackage(org.libreccm.configuration.ConfigurationManager.class .getPackage()) + .addPackage(org.libreccm.core.CcmObject.class.getPackage()) .addPackage(org.libreccm.jpa.EntityManagerProducer.class .getPackage()) .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class @@ -123,9 +123,9 @@ public class AuthorizationInterceptorTest { .addPackage(org.libreccm.security.User.class.getPackage()) .addPackage(org.libreccm.security.authorization.LabBean.class .getPackage()) - .addPackage(org.libreccm.testutils.EqualsVerifier.class.getPackage()) .addPackage(org.libreccm.tests.categories.IntegrationTest.class .getPackage()) + .addPackage(org.libreccm.testutils.EqualsVerifier.class.getPackage()) .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) .addPackage(com.arsdigita.kernel.security.SecurityConfig.class diff --git a/ccm-core/src/test/java/org/libreccm/security/GroupManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/GroupManagerTest.java index 0624db320..db1161291 100644 --- a/ccm-core/src/test/java/org/libreccm/security/GroupManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/GroupManagerTest.java @@ -120,36 +120,27 @@ public class GroupManagerTest { return ShrinkWrap .create(WebArchive.class, "LibreCCM-org.libreccm.security.GroupManagerTest.war") - .addPackage(User.class.getPackage()) - .addPackage(CcmObject.class.getPackage()) - .addPackage(Categorization.class.getPackage()) - .addPackage(LocalizedString.class.getPackage()) - .addPackage(CcmApplication.class.getPackage()) - .addPackage(Workflow.class.getPackage()) - .addPackage(EntityManagerProducer.class.getPackage()) - .addPackage(MimeTypeConverter.class.getPackage()) - .addPackage(EqualsVerifier.class.getPackage()) - .addPackage(IntegrationTest.class.getPackage()) - .addPackage(SecurityConfig.class.getPackage()) - .addPackage(AbstractParameterContext.class.getPackage()) - .addPackage(CCMApplicationContextListener.class.getPackage()) - .addPackage(XML.class.getPackage()) - .addPackage(DateTimeFormatter.class.getPackage()) - .addPackage(UncheckedWrapperException.class.getPackage()) + .addPackage(org.libreccm.categorization.Categorization.class + .getPackage()) + .addPackage(org.libreccm.core.CcmObject.class.getPackage()) + .addPackage(org.libreccm.jpa.EntityManagerProducer.class + .getPackage()) + .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class + .getPackage()) + .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()) + .addPackage(org.libreccm.security.User.class.getPackage()) + .addPackage(org.libreccm.tests.categories.IntegrationTest.class + .getPackage()) + .addPackage(org.libreccm.testutils.EqualsVerifier.class.getPackage()) + .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) + .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) + .addPackage(com.arsdigita.kernel.security.SecurityConfig.class + .getPackage()) + .addPackage(com.arsdigita.util.UncheckedWrapperException.class + .getPackage()) .addAsLibraries(libs) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") - .addAsResource("com/arsdigita/kernel/security/" - + "SecurityConfig_parameter.properties", - "com/arsdigita/kernel/security/" - + "SecurityConfig_parameter.properties") - .addAsWebInfResource( - "configs/org/libreccm/security/UserManagerTest/" - + "registry.properties", - "conf/registry/registry.properties") - .addAsResource( - "configs/org/libreccm/security/UserManagerTest/ccm-core.config", - "ccm-core.config") .addAsWebInfResource("test-web.xml", "web.xml") .addAsResource("configs/shiro.ini", "shiro.ini") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml"); diff --git a/ccm-core/src/test/java/org/libreccm/security/PermissionCheckerTest.java b/ccm-core/src/test/java/org/libreccm/security/PermissionCheckerTest.java index 56349744e..ca08a2c75 100644 --- a/ccm-core/src/test/java/org/libreccm/security/PermissionCheckerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/PermissionCheckerTest.java @@ -18,13 +18,6 @@ */ package org.libreccm.security; -import com.arsdigita.kernel.security.SecurityConfig; -import com.arsdigita.util.UncheckedWrapperException; -import com.arsdigita.util.parameter.AbstractParameterContext; -import com.arsdigita.web.CCMApplicationContextListener; -import com.arsdigita.xml.XML; -import com.arsdigita.xml.formatters.DateTimeFormatter; - import static org.libreccm.core.CoreConstants.*; import java.io.File; @@ -56,19 +49,10 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import org.libreccm.categorization.Categorization; -import org.libreccm.cdi.utils.CdiUtil; import org.libreccm.core.CcmObject; import org.libreccm.core.CcmObjectRepository; -import org.libreccm.jpa.EntityManagerProducer; -import org.libreccm.jpa.utils.MimeTypeConverter; -import org.libreccm.l10n.LocalizedString; import org.libreccm.tests.categories.IntegrationTest; -import org.libreccm.testutils.EqualsVerifier; -import org.libreccm.web.CcmApplication; -import org.libreccm.workflow.Workflow; - import java.util.ArrayList; import java.util.List; @@ -85,38 +69,38 @@ import static org.junit.Assert.*; @Transactional(TransactionMode.COMMIT) @CreateSchema({"create_ccm_core_schema.sql"}) public class PermissionCheckerTest { - + @Inject private Subject subject; - + @Inject private Shiro shiro; - + @Inject private PermissionChecker permissionChecker; - + @Inject private CcmObjectRepository objectRepository; - + public PermissionCheckerTest() { } - + @BeforeClass public static void setUpClass() { } - + @AfterClass public static void tearDownClass() { } - + @Before public void setUp() { } - + @After public void tearDown() { } - + @Deployment public static WebArchive createDeployment() { final PomEquippedResolveStage pom = Maven @@ -125,66 +109,49 @@ public class PermissionCheckerTest { final PomEquippedResolveStage dependencies = pom. importCompileAndRuntimeDependencies(); final File[] libs = dependencies.resolve().withTransitivity().asFile(); - + for (File lib : libs) { System.err.printf("Adding file '%s' to test archive...%n", lib.getName()); } - + return ShrinkWrap .create(WebArchive.class, - "LibreCCM-org.libreccm.security.PermissionCheckerTest.war"). - addPackage(User.class.getPackage()) - .addPackage(CcmObject.class.getPackage()) - .addPackage(Categorization.class.getPackage()) - .addPackage(LocalizedString.class.getPackage()) - .addPackage(CcmApplication.class.getPackage()) - .addPackage(Workflow.class.getPackage()) - .addPackage(EntityManagerProducer.class.getPackage()) - .addPackage(MimeTypeConverter.class.getPackage()) - .addPackage(EqualsVerifier.class.getPackage()) - .addPackage(IntegrationTest.class.getPackage()) - .addPackage(SecurityConfig.class.getPackage()) - .addPackage(AbstractParameterContext.class.getPackage()) - .addPackage(CCMApplicationContextListener.class.getPackage()) - .addPackage(XML.class.getPackage()) - .addPackage(DateTimeFormatter.class.getPackage()) - .addPackage(CdiUtil.class.getPackage()) - .addPackage(UncheckedWrapperException.class.getPackage()) + "LibreCCM-org.libreccm.security.PermissionCheckerTest.war") + .addPackage(org.libreccm.categorization.Categorization.class + .getPackage()) + .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) + .addPackage(org.libreccm.configuration.ConfigurationManager.class + .getPackage()) + .addPackage(org.libreccm.core.CcmObject.class.getPackage()) + .addPackage(org.libreccm.jpa.EntityManagerProducer.class + .getPackage()) + .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class + .getPackage()) + .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()) + .addPackage(org.libreccm.security.User.class.getPackage()) + .addPackage(org.libreccm.tests.categories.IntegrationTest.class + .getPackage()) + .addPackage(org.libreccm.testutils.EqualsVerifier.class.getPackage()) + .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) + .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) + .addPackage(com.arsdigita.kernel.KernelConfig.class + .getPackage()) + .addPackage(com.arsdigita.kernel.security.SecurityConfig.class + .getPackage()) + .addPackage(com.arsdigita.util.UncheckedWrapperException.class + .getPackage()) .addAsLibraries(libs) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") - .addAsResource("com/arsdigita/kernel/" - + "KernelConfig_parameter.properties", - "com/arsdigita/kernel/" - + "KernelConfig_parameter.properties") - .addAsResource("com/arsdigita/kernel/security/" - + "SecurityConfig_parameter.properties", - "com/arsdigita/kernel/security/" - + "SecurityConfig_parameter.properties") - .addAsWebInfResource( - "configs/org/libreccm/security/UserManagerTest/" - + "registry.properties", - "conf/registry/registry.properties") - .addAsResource( - "configs/org/libreccm/security/UserManagerTest/ccm-core.config", - "ccm-core.config") .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource( "configs/org/libreccm/security/ShiroTest/log4j2.xml", "log4j2.xml") - .addAsWebInfResource( - "configs/org/libreccm/security/ShiroTest/" - + "kernel.properties", - "conf/registry/ccm-core/kernel.properties") - .addAsWebInfResource( - "configs/org/libreccm//security/ShiroTest/" - + "security.properties", - "conf/registry/ccm-core/security.properties") .addAsWebInfResource("test-web.xml", "web.xml") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml"); } - + @Test @UsingDataSet("datasets/org/libreccm/security/ShiroTest/data.yml") @InSequence(1100) @@ -193,12 +160,12 @@ public class PermissionCheckerTest { "foo123"); token.setRememberMe(true); subject.login(token); - + assertThat(permissionChecker.isPermitted("privilege1"), is(false)); assertThat(permissionChecker.isPermitted("privilege2"), is(false)); assertThat(permissionChecker.isPermitted("privilege3"), is(false)); } - + @Test @UsingDataSet("datasets/org/libreccm/security/ShiroTest/data.yml") @InSequence(1200) @@ -207,7 +174,7 @@ public class PermissionCheckerTest { assertThat(permissionChecker.isPermitted("privilege2"), is(false)); assertThat(permissionChecker.isPermitted("privilege3"), is(false)); } - + @Test @UsingDataSet("datasets/org/libreccm/security/ShiroTest/data.yml") @InSequence(1300) @@ -215,9 +182,9 @@ public class PermissionCheckerTest { final CcmObject object1 = objectRepository.findById(-20001L); final CcmObject object2 = objectRepository.findById(-20002L); final CcmObject object3 = objectRepository.findById(-20003L); - + shiro.getSystemUser().execute(new Callable() { - + @Override public Boolean call() { assertThat(permissionChecker.isPermitted("privilege1"), @@ -226,7 +193,7 @@ public class PermissionCheckerTest { is(true)); assertThat(permissionChecker.isPermitted("privilege3"), is(true)); - + assertThat(permissionChecker.isPermitted("privilege1", object2), is(true)); @@ -236,42 +203,42 @@ public class PermissionCheckerTest { assertThat(permissionChecker.isPermitted("privilege3", object3), is(true)); - + return false; } - + }); - + } - + @Test @UsingDataSet("datasets/org/libreccm/security/ShiroTest/data.yml") @InSequence(1400) public void isPermittedObjectAuthenticatedUser() { final CcmObject object1 = objectRepository.findById(-20001L); final CcmObject object2 = objectRepository.findById(-20002L); - + final UsernamePasswordToken token = new UsernamePasswordToken("jdoe", "foo123"); token.setRememberMe(true); subject.login(token); - + assertThat(permissionChecker.isPermitted("privilege1", object1), is(false)); assertThat(permissionChecker.isPermitted("privilege2", object1), is(false)); assertThat(permissionChecker.isPermitted("privilege2", object2), is(true)); - + } - + @Test @UsingDataSet("datasets/org/libreccm/security/ShiroTest/data.yml") @InSequence(1500) public void isPermittedObjectUnAuthenticatedUser() { final CcmObject object1 = objectRepository.findById(-20001L); final CcmObject object2 = objectRepository.findById(-20002L); - + assertThat(permissionChecker.isPermitted("privilege1", object1), is(false)); assertThat(permissionChecker.isPermitted("privilege2", object1), @@ -281,7 +248,7 @@ public class PermissionCheckerTest { assertThat(permissionChecker.isPermitted("privilege3", object1), is(true)); } - + @Test @UsingDataSet("datasets/org/libreccm/security/ShiroTest/data.yml") @InSequence(2100) @@ -290,10 +257,10 @@ public class PermissionCheckerTest { "foo123"); token.setRememberMe(true); subject.login(token); - + permissionChecker.checkPermission("privilege1"); } - + @Test(expected = AuthorizationException.class) @UsingDataSet("datasets/org/libreccm/security/ShiroTest/data.yml") @ShouldThrowException(AuthorizationException.class) @@ -301,40 +268,40 @@ public class PermissionCheckerTest { public void checkPermissionUnAuthenticatedUser() { permissionChecker.checkPermission("privilege1"); } - + @Test @UsingDataSet("datasets/org/libreccm/security/ShiroTest/data.yml") @InSequence(2300) public void checkPermissionObjectAuthenticatedUser() { final CcmObject object2 = objectRepository.findById(-20002L); - + final UsernamePasswordToken token = new UsernamePasswordToken("jdoe", "foo123"); token.setRememberMe(true); subject.login(token); - + permissionChecker.checkPermission("privilege2", object2); } - + @Test(expected = AuthorizationException.class) @UsingDataSet("datasets/org/libreccm/security/ShiroTest/data.yml") @ShouldThrowException(AuthorizationException.class) @InSequence(2400) public void checkPermissionObjectUnAuthenticatedUser() { final CcmObject object2 = objectRepository.findById(-20002L); - + permissionChecker.checkPermission("privilege2", object2); } - + @Test @UsingDataSet("datasets/org/libreccm/security/ShiroTest/data.yml") @InSequence(2500) public void checkPermissionObjectPublicUser() { final CcmObject object1 = objectRepository.findById(-20001L); - + permissionChecker.checkPermission("privilege3", object1); } - + @Test @UsingDataSet("datasets/org/libreccm/security/ShiroTest/data.yml") @InSequence(2600) @@ -342,69 +309,69 @@ public class PermissionCheckerTest { final CcmObject object1 = objectRepository.findById(-20001L); final CcmObject object2 = objectRepository.findById(-20002L); final CcmObject object3 = objectRepository.findById(-20003L); - + shiro.getSystemUser().execute(new Callable() { - + @Override public Boolean call() { permissionChecker.checkPermission("privilege1"); permissionChecker.checkPermission("privilege2"); permissionChecker.checkPermission("privilege3"); - + permissionChecker.checkPermission("privilege1", object3); permissionChecker.checkPermission("privilege2", object1); permissionChecker.checkPermission("privilege3", object2); - + return false; } - + }); } - + @Test @UsingDataSet("datasets/org/libreccm/security/ShiroTest/data.yml") @InSequence(3100) public void checkPermissionReturnObjectAuthenticatedUser() { final CcmObject object2 = objectRepository.findById(-20002L); - + final UsernamePasswordToken token = new UsernamePasswordToken("jdoe", "foo123"); token.setRememberMe(true); subject.login(token); - + final CcmObject result = permissionChecker.checkPermission( "privilege2", object2, CcmObject.class); assertThat(result.getDisplayName(), is(equalTo("object2"))); assertThat(permissionChecker.isAccessDeniedObject(result), is(false)); assertThat(result, is(equalTo(object2))); } - + @Test @UsingDataSet("datasets/org/libreccm/security/ShiroTest/data.yml") @InSequence(3200) public void checkPermissionReturnObjectUnAuthenticatedUser() { final CcmObject object2 = objectRepository.findById(-20002L); - + final CcmObject result = permissionChecker.checkPermission( "privilege2", object2, CcmObject.class); assertThat(result.getDisplayName(), is(equalTo(ACCESS_DENIED))); assertThat(permissionChecker.isAccessDeniedObject(result), is(true)); assertThat(result, is(not(equalTo(object2)))); } - + @Test @UsingDataSet("datasets/org/libreccm/security/ShiroTest/data.yml") @InSequence(600) public void checkPermissionReturnObjectPublicUser() { final CcmObject object1 = objectRepository.findById(-20001L); - + final CcmObject result = permissionChecker.checkPermission( "privilege3", object1, CcmObject.class); assertThat(result.getDisplayName(), is(equalTo("object1"))); assertThat(permissionChecker.isAccessDeniedObject(result), is(false)); assertThat(result, is(equalTo(object1))); } - + @Test @UsingDataSet("datasets/org/libreccm/security/ShiroTest/data.yml") @InSequence(3200) @@ -412,48 +379,48 @@ public class PermissionCheckerTest { final CcmObject object1 = objectRepository.findById(-20001L); final CcmObject object2 = objectRepository.findById(-20002L); final CcmObject object3 = objectRepository.findById(-20003L); - + final List results = shiro.getSystemUser().execute( new Callable>() { - + @Override public List call() { permissionChecker.checkPermission("privilege1"); permissionChecker.checkPermission("privilege2"); permissionChecker.checkPermission("privilege3"); - + final CcmObject result3 = permissionChecker.checkPermission( "privilege1", object3, CcmObject.class); final CcmObject result1 = permissionChecker.checkPermission( "privilege2", object1, CcmObject.class); final CcmObject result2 = permissionChecker.checkPermission( "privilege3", object2, CcmObject.class); - + final List results = new ArrayList<>(); results.add(result1); results.add(result2); results.add(result3); - + return results; } - + }); - + final CcmObject result1 = results.get(0); final CcmObject result2 = results.get(1); final CcmObject result3 = results.get(2); - + assertThat(result1.getDisplayName(), is(equalTo("object1"))); assertThat(permissionChecker.isAccessDeniedObject(result1), is(false)); assertThat(result1, is(equalTo(object1))); - + assertThat(result2.getDisplayName(), is(equalTo("object2"))); assertThat(permissionChecker.isAccessDeniedObject(result2), is(false)); assertThat(result2, is(equalTo(object2))); - + assertThat(result3.getDisplayName(), is(equalTo("object3"))); assertThat(permissionChecker.isAccessDeniedObject(result3), is(false)); assertThat(result3, is(equalTo(object3))); } - + } diff --git a/ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java index d43e11fcd..0eea4b6d9 100644 --- a/ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java @@ -18,12 +18,6 @@ */ package org.libreccm.security; -import com.arsdigita.kernel.security.SecurityConfig; -import com.arsdigita.util.UncheckedWrapperException; -import com.arsdigita.util.parameter.AbstractParameterContext; -import com.arsdigita.web.CCMApplicationContextListener; -import com.arsdigita.xml.XML; -import com.arsdigita.xml.formatters.DateTimeFormatter; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; @@ -47,16 +41,9 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import org.libreccm.categorization.Categorization; import org.libreccm.core.CcmObject; import org.libreccm.core.CcmObjectRepository; -import org.libreccm.jpa.EntityManagerProducer; -import org.libreccm.jpa.utils.MimeTypeConverter; -import org.libreccm.l10n.LocalizedString; import org.libreccm.tests.categories.IntegrationTest; -import org.libreccm.testutils.EqualsVerifier; -import org.libreccm.web.CcmApplication; -import org.libreccm.workflow.Workflow; import java.io.File; @@ -125,36 +112,30 @@ public class PermissionManagerTest { return ShrinkWrap .create(WebArchive.class, "LibreCCM-org.libreccm.security.PermissionManagerTest.war") - .addPackage(User.class.getPackage()) - .addPackage(CcmObject.class.getPackage()) - .addPackage(Categorization.class.getPackage()) - .addPackage(LocalizedString.class.getPackage()) - .addPackage(CcmApplication.class.getPackage()) - .addPackage(Workflow.class.getPackage()) - .addPackage(EntityManagerProducer.class.getPackage()) - .addPackage(MimeTypeConverter.class.getPackage()) - .addPackage(EqualsVerifier.class.getPackage()) - .addPackage(IntegrationTest.class.getPackage()) - .addPackage(SecurityConfig.class.getPackage()) - .addPackage(AbstractParameterContext.class.getPackage()) - .addPackage(CCMApplicationContextListener.class.getPackage()) - .addPackage(XML.class.getPackage()) - .addPackage(DateTimeFormatter.class.getPackage()) - .addPackage(UncheckedWrapperException.class.getPackage()) + .addPackage(org.libreccm.categorization.Categorization.class + .getPackage()) + .addPackage(org.libreccm.configuration.Configuration.class + .getPackage()) + .addPackage(org.libreccm.core.CcmObject.class.getPackage()) + .addPackage(org.libreccm.jpa.EntityManagerProducer.class + .getPackage()) + .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class + .getPackage()) + .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()) + .addPackage(org.libreccm.security.User.class.getPackage()) + .addPackage(org.libreccm.tests.categories.IntegrationTest.class + .getPackage()) + .addPackage(org.libreccm.testutils.EqualsVerifier.class.getPackage()) + .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) + .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) + .addPackage(com.arsdigita.kernel.KernelConfig.class.getPackage()) + .addPackage(com.arsdigita.kernel.security.SecurityConfig.class + .getPackage()) + .addPackage(com.arsdigita.util.UncheckedWrapperException.class + .getPackage()) .addAsLibraries(libs) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") - .addAsResource("com/arsdigita/kernel/security/" - + "SecurityConfig_parameter.properties", - "com/arsdigita/kernel/security/" - + "SecurityConfig_parameter.properties") - .addAsWebInfResource( - "configs/org/libreccm/security/UserManagerTest/" - + "registry.properties", - "conf/registry/registry.properties") - .addAsResource( - "configs/org/libreccm/security/UserManagerTest/ccm-core.config", - "ccm-core.config") .addAsResource("configs/shiro.ini", "shiro.ini") .addAsWebInfResource("test-web.xml", "web.xml") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml"); diff --git a/ccm-core/src/test/java/org/libreccm/security/RoleManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/RoleManagerTest.java index 49a584043..1354806f8 100644 --- a/ccm-core/src/test/java/org/libreccm/security/RoleManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/RoleManagerTest.java @@ -18,13 +18,6 @@ */ package org.libreccm.security; -import com.arsdigita.kernel.security.SecurityConfig; -import com.arsdigita.util.UncheckedWrapperException; -import com.arsdigita.util.parameter.AbstractParameterContext; -import com.arsdigita.web.CCMApplicationContextListener; -import com.arsdigita.xml.XML; -import com.arsdigita.xml.formatters.DateTimeFormatter; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; import org.jboss.arquillian.junit.Arquillian; @@ -47,15 +40,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import org.libreccm.categorization.Categorization; -import org.libreccm.core.CcmObject; -import org.libreccm.jpa.EntityManagerProducer; -import org.libreccm.jpa.utils.MimeTypeConverter; -import org.libreccm.l10n.LocalizedString; import org.libreccm.tests.categories.IntegrationTest; -import org.libreccm.testutils.EqualsVerifier; -import org.libreccm.web.CcmApplication; -import org.libreccm.workflow.Workflow; import java.io.File; @@ -120,36 +105,30 @@ public class RoleManagerTest { return ShrinkWrap .create(WebArchive.class, "LibreCCM-org.libreccm.security.RoleManagerTest.war") - .addPackage(User.class.getPackage()) - .addPackage(CcmObject.class.getPackage()) - .addPackage(Categorization.class.getPackage()) - .addPackage(LocalizedString.class.getPackage()) - .addPackage(CcmApplication.class.getPackage()) - .addPackage(Workflow.class.getPackage()) - .addPackage(EntityManagerProducer.class.getPackage()) - .addPackage(MimeTypeConverter.class.getPackage()) - .addPackage(EqualsVerifier.class.getPackage()) - .addPackage(IntegrationTest.class.getPackage()) - .addPackage(SecurityConfig.class.getPackage()) - .addPackage(AbstractParameterContext.class.getPackage()) - .addPackage(CCMApplicationContextListener.class.getPackage()) - .addPackage(XML.class.getPackage()) - .addPackage(DateTimeFormatter.class.getPackage()) - .addPackage(UncheckedWrapperException.class.getPackage()) + .addPackage(org.libreccm.categorization.Categorization.class + .getPackage()) + .addPackage(org.libreccm.configuration.Configuration.class + .getPackage()) + .addPackage(org.libreccm.core.CcmObject.class.getPackage()) + .addPackage(org.libreccm.jpa.EntityManagerProducer.class + .getPackage()) + .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class + .getPackage()) + .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()) + .addPackage(org.libreccm.security.User.class.getPackage()) + .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) + .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) + .addPackage(org.libreccm.testutils.EqualsVerifier.class.getPackage()) + .addPackage(org.libreccm.tests.categories.IntegrationTest.class + .getPackage()) + .addPackage(com.arsdigita.kernel.KernelConfig.class.getPackage()) + .addPackage(com.arsdigita.kernel.security.SecurityConfig.class + .getPackage()) + .addPackage(com.arsdigita.util.UncheckedWrapperException.class + .getPackage()) .addAsLibraries(libs) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") - .addAsResource("com/arsdigita/kernel/security/" - + "SecurityConfig_parameter.properties", - "com/arsdigita/kernel/security/" - + "SecurityConfig_parameter.properties") - .addAsWebInfResource( - "configs/org/libreccm/security/UserManagerTest/" - + "registry.properties", - "conf/registry/registry.properties") - .addAsResource( - "configs/org/libreccm/security/UserManagerTest/ccm-core.config", - "ccm-core.config") .addAsResource("configs/shiro.ini", "shiro.ini") .addAsWebInfResource("test-web.xml", "web.xml") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml"); diff --git a/ccm-core/src/test/java/org/libreccm/security/SecuredCollectionTest.java b/ccm-core/src/test/java/org/libreccm/security/SecuredCollectionTest.java index 250a26fc8..36c6a14c6 100644 --- a/ccm-core/src/test/java/org/libreccm/security/SecuredCollectionTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/SecuredCollectionTest.java @@ -150,54 +150,36 @@ public class SecuredCollectionTest { return ShrinkWrap .create(WebArchive.class, - "LibreCCM-org.libreccm.security.SecuredCollectionTest.war"). - addPackage(User.class.getPackage()) - .addPackage(CcmObject.class.getPackage()) - .addPackage(Categorization.class.getPackage()) - .addPackage(LocalizedString.class.getPackage()) - .addPackage(CcmApplication.class.getPackage()) - .addPackage(Workflow.class.getPackage()) - .addPackage(EntityManagerProducer.class.getPackage()) - .addPackage(MimeTypeConverter.class.getPackage()) - .addPackage(EqualsVerifier.class.getPackage()) - .addPackage(IntegrationTest.class.getPackage()) - .addPackage(SecurityConfig.class.getPackage()) - .addPackage(AbstractParameterContext.class.getPackage()) - .addPackage(CCMApplicationContextListener.class.getPackage()) - .addPackage(XML.class.getPackage()) - .addPackage(DateTimeFormatter.class.getPackage()) - .addPackage(CdiUtil.class.getPackage()) - .addPackage(UncheckedWrapperException.class.getPackage()) + "LibreCCM-org.libreccm.security.SecuredCollectionTest.war") + .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) + .addPackage(org.libreccm.categorization.Categorization.class + .getPackage()) + .addPackage(org.libreccm.core.CcmObject.class.getPackage()) + .addPackage(org.libreccm.configuration.Configuration.class + .getPackage()) + .addPackage(org.libreccm.jpa.EntityManagerProducer.class + .getPackage()) + .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class + .getPackage()) + .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()) + .addPackage(org.libreccm.security.User.class.getPackage()) + .addPackage(org.libreccm.testutils.EqualsVerifier.class.getPackage()) + .addPackage(org.libreccm.tests.categories.IntegrationTest.class + .getPackage()) + .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) + .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) + .addPackage(com.arsdigita.kernel.KernelConfig.class.getPackage()) + .addPackage(com.arsdigita.kernel.security.SecurityConfig.class + .getPackage()) + .addPackage(com.arsdigita.util.UncheckedWrapperException.class + .getPackage()) .addAsLibraries(libs) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") - .addAsResource("com/arsdigita/kernel/" - + "KernelConfig_parameter.properties", - "com/arsdigita/kernel/" - + "KernelConfig_parameter.properties") - .addAsResource("com/arsdigita/kernel/security/" - + "SecurityConfig_parameter.properties", - "com/arsdigita/kernel/security/" - + "SecurityConfig_parameter.properties") - .addAsWebInfResource( - "configs/org/libreccm/security/UserManagerTest/" - + "registry.properties", - "conf/registry/registry.properties") - .addAsResource( - "configs/org/libreccm/security/UserManagerTest/ccm-core.config", - "ccm-core.config") .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource( "configs/org/libreccm/security/ShiroTest/log4j2.xml", "log4j2.xml") - .addAsWebInfResource( - "configs/org/libreccm/security/ShiroTest/" - + "kernel.properties", - "conf/registry/ccm-core/kernel.properties") - .addAsWebInfResource( - "configs/org/libreccm//security/ShiroTest/" - + "security.properties", - "conf/registry/ccm-core/security.properties") .addAsWebInfResource("test-web.xml", "web.xml") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml"); } diff --git a/ccm-core/src/test/java/org/libreccm/security/SecuredIteratorTest.java b/ccm-core/src/test/java/org/libreccm/security/SecuredIteratorTest.java index a282dbe3e..f75c559b3 100644 --- a/ccm-core/src/test/java/org/libreccm/security/SecuredIteratorTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/SecuredIteratorTest.java @@ -18,12 +18,6 @@ */ package org.libreccm.security; -import com.arsdigita.kernel.security.SecurityConfig; -import com.arsdigita.util.UncheckedWrapperException; -import com.arsdigita.util.parameter.AbstractParameterContext; -import com.arsdigita.web.CCMApplicationContextListener; -import com.arsdigita.xml.XML; -import com.arsdigita.xml.formatters.DateTimeFormatter; import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.subject.Subject; @@ -47,17 +41,9 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import org.libreccm.categorization.Categorization; -import org.libreccm.cdi.utils.CdiUtil; import org.libreccm.core.CcmObject; import org.libreccm.core.CcmObjectRepository; -import org.libreccm.jpa.EntityManagerProducer; -import org.libreccm.jpa.utils.MimeTypeConverter; -import org.libreccm.l10n.LocalizedString; import org.libreccm.tests.categories.IntegrationTest; -import org.libreccm.testutils.EqualsVerifier; -import org.libreccm.web.CcmApplication; -import org.libreccm.workflow.Workflow; import java.io.File; import java.util.ArrayList; @@ -151,53 +137,35 @@ public class SecuredIteratorTest { return ShrinkWrap .create(WebArchive.class, "LibreCCM-org.libreccm.security.SecuredIteratorTest.war") - .addPackage(User.class.getPackage()) - .addPackage(CcmObject.class.getPackage()) - .addPackage(Categorization.class.getPackage()) - .addPackage(LocalizedString.class.getPackage()) - .addPackage(CcmApplication.class.getPackage()) - .addPackage(Workflow.class.getPackage()) - .addPackage(EntityManagerProducer.class.getPackage()) - .addPackage(MimeTypeConverter.class.getPackage()) - .addPackage(EqualsVerifier.class.getPackage()) - .addPackage(IntegrationTest.class.getPackage()) - .addPackage(SecurityConfig.class.getPackage()) - .addPackage(AbstractParameterContext.class.getPackage()) - .addPackage(CCMApplicationContextListener.class.getPackage()) - .addPackage(XML.class.getPackage()) - .addPackage(DateTimeFormatter.class.getPackage()) - .addPackage(CdiUtil.class.getPackage()) - .addPackage(UncheckedWrapperException.class.getPackage()) + .addPackage(org.libreccm.categorization.Categorization.class + .getPackage()) + .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) + .addPackage(org.libreccm.configuration.Configuration.class + .getPackage()) + .addPackage(org.libreccm.core.CcmObject.class.getPackage()) + .addPackage(org.libreccm.jpa.EntityManagerProducer.class + .getPackage()) + .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class + .getPackage()) + .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()) + .addPackage(org.libreccm.security.User.class.getPackage()) + .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) + .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) + .addPackage(org.libreccm.tests.categories.IntegrationTest.class + .getPackage()) + .addPackage(org.libreccm.testutils.EqualsVerifier.class.getPackage()) + .addPackage(com.arsdigita.kernel.security.SecurityConfig.class + .getPackage()) + .addPackage(com.arsdigita.kernel.KernelConfig.class.getPackage()) + .addPackage(com.arsdigita.util.UncheckedWrapperException.class + .getPackage()) .addAsLibraries(libs) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") - .addAsResource("com/arsdigita/kernel/" - + "KernelConfig_parameter.properties", - "com/arsdigita/kernel/" - + "KernelConfig_parameter.properties") - .addAsResource("com/arsdigita/kernel/security/" - + "SecurityConfig_parameter.properties", - "com/arsdigita/kernel/security/" - + "SecurityConfig_parameter.properties") - .addAsWebInfResource( - "configs/org/libreccm/security/UserManagerTest/" - + "registry.properties", - "conf/registry/registry.properties") - .addAsResource( - "configs/org/libreccm/security/UserManagerTest/ccm-core.config", - "ccm-core.config") .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource( "configs/org/libreccm/security/ShiroTest/log4j2.xml", "log4j2.xml") - .addAsWebInfResource( - "configs/org/libreccm/security/ShiroTest/" - + "kernel.properties", - "conf/registry/ccm-core/kernel.properties") - .addAsWebInfResource( - "configs/org/libreccm//security/ShiroTest/" - + "security.properties", - "conf/registry/ccm-core/security.properties") .addAsWebInfResource("test-web.xml", "web.xml") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml"); } diff --git a/ccm-core/src/test/java/org/libreccm/security/ShiroTest.java b/ccm-core/src/test/java/org/libreccm/security/ShiroTest.java index 144d5a8b2..98cc3a682 100644 --- a/ccm-core/src/test/java/org/libreccm/security/ShiroTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/ShiroTest.java @@ -105,47 +105,25 @@ public class ShiroTest { return ShrinkWrap .create(WebArchive.class, "LibreCCM-org.libreccm.security.ShiroTest.war") - .addPackage("org.libreccm.cdi.utils") //Checked - .addPackage("org.libreccm.categorization") //Checked - .addPackage("org.libreccm.configuration") //Checked - .addPackage("org.libreccm.core") //Checked - .addPackage("org.libreccm.jpa") //Checked - .addPackage("org.libreccm.jpa.utils") //Checked - .addPackage("org.libreccm.l10n") //Checked - .addPackage("org.libreccm.modules") //Checked - .addPackage("org.libreccm.security") //Checked - .addPackage("org.libreccm.tests.categories") //Checked - .addPackage("org.libreccm.testutils") //Checked - .addPackage("org.libreccm.web") //Checked - .addPackage("org.libreccm.workflow") //Checked - .addPackage("com.arsdigita.kernel") //Checked - .addPackage("com.arsdigita.kernel.security") //Checked - .addPackage("com.arsdigita.util") //Checked - .addPackage("com.arsdigita.util.parameter") //Checked - // .addPackage(CcmCore.class.getPackage()) - // .addPackage(CcmModule.class.getPackage()) - // .addPackage(CcmObject.class.getPackage()) - // .addPackage(CdiUtil.class.getPackage()) - // .addPackage(Categorization.class.getPackage()) - // .addPackage(Configuration.class.getPackage()) - // .addPackage(LocalizedString.class.getPackage()) - // .addPackage(CcmApplication.class.getPackage()) - // .addPackage(Workflow.class.getPackage()) - // .addPackage(EntityManagerProducer.class.getPackage()) - // .addPackage(MimeTypeConverter.class.getPackage()) - // .addPackage(EqualsVerifier.class.getPackage()) - // .addPackage(IntegrationTest.class.getPackage()) - // .addPackage(SecurityConfig.class.getPackage()) - // .addPackage(CCMApplicationContextListener.class.getPackage()) - // .addPackage(XML.class.getPackage()) - // .addPackage(DateTimeFormatter.class.getPackage()) - // .addPackage(AbstractParameterContext.class.getPackage()) - // .addPackage(UncheckedWrapperException.class.getPackage()) - // .addPackage(CCMResourceManager.class.getPackage()) - // .addPackage(DispatcherHelper.class.getPackage()) - // .addPackage(UI.class.getPackage()) - // .addPackage(KernelConfig.class.getPackage()) - // .addPackage(BasePage.class.getPackage()) + .addPackage(org.libreccm.categorization.Category.class.getPackage()) + .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) + .addPackage(org.libreccm.configuration.Configuration.class + .getPackage()) + .addPackage(org.libreccm.core.CcmObject.class.getPackage()) + .addPackage(org.libreccm.jpa.EntityManagerProducer.class + .getPackage()) + .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class + .getPackage()) + .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()) + .addPackage(org.libreccm.security.User.class.getPackage()) + .addPackage(org.libreccm.tests.categories.IntegrationTest.class + .getPackage()) + .addPackage(org.libreccm.testutils.EqualsVerifier.class.getPackage()) + .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) + .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) + .addPackage(com.arsdigita.kernel.KernelConfig.class.getPackage()) + .addPackage(com.arsdigita.kernel.security.SecurityConfig.class + .getPackage()) .addAsLibraries(libs) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/security/UserManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/UserManagerTest.java index e5eb567ec..c318eb0ee 100644 --- a/ccm-core/src/test/java/org/libreccm/security/UserManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/UserManagerTest.java @@ -121,41 +121,32 @@ public class UserManagerTest { return ShrinkWrap .create(WebArchive.class, "LibreCCM-org.libreccm.security.UserManagerTest.war") - .addPackage(User.class.getPackage()) - .addPackage(CcmObject.class.getPackage()) - .addPackage(Categorization.class.getPackage()) - .addPackage(LocalizedString.class.getPackage()) - .addPackage(CcmApplication.class.getPackage()) - .addPackage(Workflow.class.getPackage()) - .addPackage(EntityManagerProducer.class.getPackage()) - .addPackage(MimeTypeConverter.class.getPackage()) - .addPackage(EqualsVerifier.class.getPackage()) - .addPackage(IntegrationTest.class.getPackage()) - .addPackage(SecurityConfig.class.getPackage()) - .addPackage(AbstractParameterContext.class.getPackage()) - .addPackage(CCMApplicationContextListener.class.getPackage()) - .addPackage(XML.class.getPackage()) - .addPackage(DateTimeFormatter.class.getPackage()) - .addPackage(UncheckedWrapperException.class.getPackage()) + .addPackage(org.libreccm.categorization.Categorization.class + .getPackage()) + .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) + .addPackage(org.libreccm.configuration.Configuration.class + .getPackage()) + .addPackage(org.libreccm.core.CcmObject.class.getPackage()) + .addPackage(org.libreccm.jpa.EntityManagerProducer.class + .getPackage()) + .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class + .getPackage()) + .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()) + .addPackage(org.libreccm.security.User.class.getPackage()) + .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) + .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) + .addPackage(org.libreccm.tests.categories.IntegrationTest.class + .getPackage()) + .addPackage(org.libreccm.testutils.EqualsVerifier.class.getPackage()) + .addPackage(com.arsdigita.kernel.KernelConfig.class.getPackage()) + .addPackage(com.arsdigita.kernel.security.SecurityConfig.class + .getPackage()) + .addPackage(com.arsdigita.util.UncheckedWrapperException.class + .getPackage()) .addAsLibraries(libs) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") - .addAsResource("com/arsdigita/kernel/security/" - + "SecurityConfig_parameter.properties", - "com/arsdigita/kernel/security/" - + "SecurityConfig_parameter.properties") - .addAsWebInfResource( - "configs/org/libreccm/security/UserManagerTest/" - + "registry.properties", - "conf/registry/registry.properties") .addAsResource("configs/shiro.ini", "shiro.ini") - .addAsResource( - "configs/org/libreccm/security/UserManagerTest/ccm-core.config", - "ccm-core.config") - // .addAsWebInfResource( - // "datasets/org/libreccm//security/UserManagerTest/" - // + "security.properties", - // "conf/registry/ccm-core/security.properties") .addAsWebInfResource("test-web.xml", "web.xml") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml"); } diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserManagerTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserManagerTest/data.yml index 04abe71be..732fe8f0c 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserManagerTest/data.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserManagerTest/data.yml @@ -40,4 +40,62 @@ ccm_core.users: party_id: -30 password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw== password_reset_required: false - verified: true \ No newline at end of file + verified: true +ccm_core.ccm_objects: + - object_id: -100 + display_name: registry + - object_id: -200 + display_name: registry-root + - object_id: -201 + display_name: com + - object_id: -202 + display_name: arsdigita + - object_id: -203 + display_name: kernel + - object_id: -204 + display_name: KernelConfig +ccm_core.categories: + - object_id: -200 + unique_id: bb93a964-bf66-424c-a22d-074d001db3b8 + name: registry-root + enabled: true + visible: true + abstract_category: false + category_order: 0 + - object_id: -201 + unique_id: 35ac50aa-7062-47b9-808d-ac830050d373 + parent_category_id: -200 + name: com + enabled: true + visible: true + abstract_category: false + category_order: 1 + - object_id: -202 + unique_id: 28f09d9d-a7fc-4dc3-a53e-670822fa5480 + parent_category_id: -201 + name: arsdigita + enabled: true + visible: true + abstract_category: false + category_order: 1 + - object_id: -203 + unique_id: 58c0b235-8762-4ab7-9232-a5a0e39c3a01 + parent_category_id: -202 + name: kernel + enabled: true + visible: true + abstract_category: false + category_order: 1 + - object_id: -204 + unique_id: c1a45148-df0a-486f-b4f1-c5a6659081c2 + parent_category_id: -203 + name: KernelConfig + enabled: true + visible: true + abstract_category: false + category_order: 1 +ccm_core.category_domains: + - object_id: -100 + domain_key: registry + root_category_id: -200 + version: 1.0 diff --git a/pom.xml b/pom.xml index 8dda28ce7..f1899f295 100644 --- a/pom.xml +++ b/pom.xml @@ -60,30 +60,7 @@ ccm-cms-types-faqitem ccm-cms-types-externallink ccm-cms-types-newsitem - - - - - jp-digital-snapshots - http://archiva.jp-digital.de/repository/jp-digital-snapshots/ - - false - - - true - - - - jp-digital-releases - http://archiva.jp-digital.de/repository/jp-digital-releases/ - - true - - - false - - - + true @@ -125,12 +102,12 @@ org.apache.maven.plugins maven-surefire-plugin - 2.18.1 + 2.19.1 org.apache.maven.plugins maven-assembly-plugin - 2.5.4 + 2.6 org.apache.maven.plugins @@ -150,11 +127,11 @@ org.apache.maven.plugins maven-pmd-plugin - 3.5 + 3.6 true utf-8 - 1.6 + 1.8 /rulesets/basic.xml /rulesets/braces.xml @@ -186,7 +163,7 @@ org.codehaus.mojo findbugs-maven-plugin - 3.0.1 + 3.0.3 true true @@ -203,7 +180,12 @@ de.jpdigital hibernate4-ddl-maven-plugin - 1.0.0-beta.2 + 1.0.0 + + + org.jacoco + jacoco-maven-plugin + 0.7.5.201505241946