diff --git a/ccm-core/src/main/java/org/libreccm/l10n/LocalizedString.java b/ccm-core/src/main/java/org/libreccm/l10n/LocalizedString.java index c636d4fb7..caa4c7045 100644 --- a/ccm-core/src/main/java/org/libreccm/l10n/LocalizedString.java +++ b/ccm-core/src/main/java/org/libreccm/l10n/LocalizedString.java @@ -62,7 +62,7 @@ public class LocalizedString implements Serializable { */ @ElementCollection(fetch = FetchType.EAGER) @MapKeyColumn(name = "LOCALE") - @Column(name = "LOCALIZED_VALUES") + @Column(name = "LOCALIZED_VALUE") @Basic @Lob @Type(type = "org.hibernate.type.TextType") diff --git a/ccm-core/src/test/java/org/libreccm/categorization/CategoryManagerTest.java b/ccm-core/src/test/java/org/libreccm/categorization/CategoryManagerTest.java index b36c608c7..6cabce9d5 100644 --- a/ccm-core/src/test/java/org/libreccm/categorization/CategoryManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/categorization/CategoryManagerTest.java @@ -137,6 +137,7 @@ public class CategoryManagerTest { .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) + .addClass(org.libreccm.portation.Portable.class) .addClass(com.arsdigita.kernel.KernelConfig.class) .addClass(com.arsdigita.kernel.security.SecurityConfig.class) .addAsLibraries(getModuleDependencies()) diff --git a/ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryTest.java index f537d8f61..d83ef4a57 100644 --- a/ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryTest.java @@ -120,6 +120,7 @@ public class CategoryRepositoryTest { .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) + .addClass(org.libreccm.portation.Portable.class) .addClass(com.arsdigita.kernel.KernelConfig.class) .addClass(com.arsdigita.kernel.security.SecurityConfig.class) .addAsLibraries(getModuleDependencies()) 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 eedb0642e..61efed6bb 100644 --- a/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerTest.java @@ -105,6 +105,7 @@ public class ConfigurationManagerTest { .getPackage()) .addPackage(org.libreccm.l10n.LocalizedString.class .getPackage()) + .addClass(org.libreccm.portation.Portable.class) .addPackage(org.libreccm.security.Permission.class.getPackage()) .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) diff --git a/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java index efb67b76d..44b20488e 100644 --- a/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java @@ -113,6 +113,7 @@ public class CcmObjectRepositoryTest { .getPackage()) .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) + .addClass(org.libreccm.portation.Portable.class) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/modules/DatasetsTest.java b/ccm-core/src/test/java/org/libreccm/modules/DatasetsTest.java index 0a872b3c3..fa7b0955b 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/DatasetsTest.java +++ b/ccm-core/src/test/java/org/libreccm/modules/DatasetsTest.java @@ -24,7 +24,6 @@ import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; -import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -35,7 +34,6 @@ import org.libreccm.testutils.DatasetsVerifier; import java.util.Arrays; import java.util.Collection; -import static org.junit.Assert.*; /** * diff --git a/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerCycleTest.java b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerCycleTest.java index 188102355..892a8778f 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerCycleTest.java +++ b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerCycleTest.java @@ -94,6 +94,7 @@ public class DependencyTreeManagerCycleTest { .addClass(org.libreccm.modules.IntegrationException.class) .addClass(TreeNode.class) .addClass(org.libreccm.modules.CcmModule.class) + .addClass(org.libreccm.modules.ModuleEvent.class) .addClass(org.libreccm.modules.ModuleInfo.class) .addClass(org.libreccm.modules.ModuleStatus.class) .addClass(org.libreccm.modules.Module.class) @@ -110,6 +111,7 @@ public class DependencyTreeManagerCycleTest { org.libreccm.modules.dependencytree.test.cycle.TestModuleB.class) .addClass( org.libreccm.modules.dependencytree.test.cycle.TestModuleC.class) + .addPackage(org.libreccm.pagemodel.PageModel.class.getPackage()) .addClass(org.libreccm.web.ApplicationType.class) .addAsLibraries(getModuleDependencies()) .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") diff --git a/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerTest.java b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerTest.java index f26ef0632..7bf0df080 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerTest.java @@ -30,8 +30,6 @@ import org.jboss.arquillian.junit.Arquillian; 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; @@ -44,7 +42,6 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.libreccm.tests.categories.IntegrationTest; -import java.io.File; import java.util.ArrayList; import java.util.List; @@ -110,6 +107,7 @@ public class DependencyTreeManagerTest { .addClass(org.libreccm.modules.IntegrationException.class) .addClass(org.libreccm.modules.TreeNode.class) .addClass(org.libreccm.modules.CcmModule.class) + .addClass(org.libreccm.modules.ModuleEvent.class) .addClass(org.libreccm.modules.ModuleInfo.class) .addClass(org.libreccm.modules.ModuleStatus.class) .addClass(org.libreccm.modules.Module.class) @@ -126,6 +124,8 @@ public class DependencyTreeManagerTest { org.libreccm.modules.dependencytree.test.valid.TestModuleB.class) .addClass( org.libreccm.modules.dependencytree.test.valid.TestModuleC.class) +// .addClass(org.libreccm.portation.Portable.class) + .addPackage(org.libreccm.pagemodel.PageModel.class.getPackage()) .addClass(org.libreccm.web.ApplicationType.class) .addAsLibraries(getModuleDependencies()) .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") 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 5f96022f3..b8d16e56c 100644 --- a/ccm-core/src/test/java/org/libreccm/security/AuthorizationInterceptorTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/AuthorizationInterceptorTest.java @@ -126,6 +126,7 @@ public class AuthorizationInterceptorTest { .addPackage(com.arsdigita.xml.formatters.DateTimeFormatter.class .getPackage()) .addClass(com.arsdigita.kernel.KernelConfig.class) + .addClass(org.libreccm.portation.Portable.class) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/security/ChallengeManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/ChallengeManagerTest.java index c8da265e8..7a014812c 100644 --- a/ccm-core/src/test/java/org/libreccm/security/ChallengeManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/ChallengeManagerTest.java @@ -125,6 +125,7 @@ public class ChallengeManagerTest { .addPackage(org.libreccm.tests.categories.IntegrationTest.class .getPackage()) .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) + .addClass(org.libreccm.portation.Portable.class) .addClass(com.arsdigita.kernel.KernelConfig.class) .addClass(com.arsdigita.kernel.security.SecurityConfig.class) .addAsLibraries(getModuleDependencies()) 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 6bd4cf790..1d1201f45 100644 --- a/ccm-core/src/test/java/org/libreccm/security/GroupManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/GroupManagerTest.java @@ -20,7 +20,6 @@ package org.libreccm.security; import org.apache.shiro.subject.ExecutionException; - import javax.inject.Inject; import org.jboss.arquillian.container.test.api.Deployment; @@ -93,39 +92,40 @@ public class GroupManagerTest { @Deployment public static WebArchive createDeployment() { return ShrinkWrap - .create(WebArchive.class, - "LibreCCM-org.libreccm.security.GroupManagerTest.war") - .addPackage(org.libreccm.categorization.Categorization.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.security.SecurityConfig.class - .getPackage()) - .addPackage(com.arsdigita.util.UncheckedWrapperException.class - .getPackage()) - .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) - .addClass(com.arsdigita.kernel.KernelConfig.class) - .addClass(com.arsdigita.kernel.security.SecurityConfig.class) - .addAsLibraries(getModuleDependencies()) - .addAsResource("test-persistence.xml", - "META-INF/persistence.xml") - .addAsWebInfResource("test-web.xml", "web.xml") - .addAsResource("configs/shiro.ini", "shiro.ini") - .addAsWebInfResource("META-INF/beans.xml", "beans.xml"); + .create(WebArchive.class, + "LibreCCM-org.libreccm.security.GroupManagerTest.war") + .addPackage(org.libreccm.categorization.Categorization.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.security.SecurityConfig.class + .getPackage()) + .addPackage(com.arsdigita.util.UncheckedWrapperException.class + .getPackage()) + .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) + .addClass(com.arsdigita.kernel.KernelConfig.class) + .addClass(com.arsdigita.kernel.security.SecurityConfig.class) + .addClass(org.libreccm.portation.Portable.class) + .addAsLibraries(getModuleDependencies()) + .addAsResource("test-persistence.xml", + "META-INF/persistence.xml") + .addAsWebInfResource("test-web.xml", "web.xml") + .addAsResource("configs/shiro.ini", "shiro.ini") + .addAsWebInfResource("META-INF/beans.xml", "beans.xml"); } @Test @@ -149,8 +149,8 @@ public class GroupManagerTest { @Test @UsingDataSet("datasets/org/libreccm/security/GroupManagerTest/data.yml") @ShouldMatchDataSet( - value = "datasets/org/libreccm/security/GroupManagerTest/after-add.yml", - excludeColumns = {"membership_id"}) + value = "datasets/org/libreccm/security/GroupManagerTest/after-add.yml", + excludeColumns = {"membership_id"}) @InSequence(200) public void addUserToGroup() { final Group admins = groupRepository.findByName("admins"); @@ -174,7 +174,7 @@ public class GroupManagerTest { try { shiro.getSystemUser().execute( - () -> groupManager.addMemberToGroup(null, admins)); + () -> groupManager.addMemberToGroup(null, admins)); } catch (ExecutionException ex) { throw ex.getCause(); } @@ -189,7 +189,7 @@ public class GroupManagerTest { try { shiro.getSystemUser().execute( - () -> groupManager.addMemberToGroup(jdoe, null)); + () -> groupManager.addMemberToGroup(jdoe, null)); } catch (ExecutionException ex) { throw ex.getCause(); } @@ -198,20 +198,20 @@ public class GroupManagerTest { @Test @UsingDataSet("datasets/org/libreccm/security/GroupManagerTest/data.yml") @ShouldMatchDataSet( - value = "datasets/org/libreccm/security/GroupManagerTest/data.yml") + value = "datasets/org/libreccm/security/GroupManagerTest/data.yml") @InSequence(230) public void addUserToGroupAgain() { final Group admins = groupRepository.findByName("admins"); final User jdoe = userRepository.findByName("jdoe"); shiro.getSystemUser().execute( - () -> groupManager.addMemberToGroup(jdoe, admins)); + () -> groupManager.addMemberToGroup(jdoe, admins)); } @Test @UsingDataSet("datasets/org/libreccm/security/GroupManagerTest/data.yml") @ShouldMatchDataSet("datasets/org/libreccm/security/GroupManagerTest/" - + "after-remove.yml") + + "after-remove.yml") @InSequence(300) public void removeUserFromGroup() { final Group admins = groupRepository.findByName("admins"); @@ -238,7 +238,7 @@ public class GroupManagerTest { try { shiro.getSystemUser().execute( - () -> groupManager.removeMemberFromGroup(null, admins)); + () -> groupManager.removeMemberFromGroup(null, admins)); } catch (ExecutionException ex) { throw ex.getCause(); } @@ -253,7 +253,7 @@ public class GroupManagerTest { try { shiro.getSystemUser().execute( - () -> groupManager.removeMemberFromGroup(jdoe, null)); + () -> groupManager.removeMemberFromGroup(jdoe, null)); } catch (ExecutionException ex) { throw ex.getCause(); } @@ -262,14 +262,14 @@ public class GroupManagerTest { @Test @UsingDataSet("datasets/org/libreccm/security/GroupManagerTest/data.yml") @ShouldMatchDataSet( - value = "datasets/org/libreccm/security/GroupManagerTest/data.yml") + value = "datasets/org/libreccm/security/GroupManagerTest/data.yml") @InSequence(330) public void removeUserGroupNotAMember() { final Group admins = groupRepository.findByName("admins"); final User mmuster = userRepository.findByName("mmuster"); shiro.getSystemUser().execute( - () -> groupManager.removeMemberFromGroup(mmuster, admins)); + () -> groupManager.removeMemberFromGroup(mmuster, admins)); } } diff --git a/ccm-core/src/test/java/org/libreccm/security/GroupRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/security/GroupRepositoryTest.java index d3967e667..f47b3e529 100644 --- a/ccm-core/src/test/java/org/libreccm/security/GroupRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/GroupRepositoryTest.java @@ -116,6 +116,7 @@ public class GroupRepositoryTest { .getPackage()) .addPackage(org.libreccm.tests.categories.IntegrationTest.class .getPackage()) + .addClass(org.libreccm.portation.Portable.class) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.xml", diff --git a/ccm-core/src/test/java/org/libreccm/security/OneTimeAuthManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/OneTimeAuthManagerTest.java index 29a0607a3..68077df25 100644 --- a/ccm-core/src/test/java/org/libreccm/security/OneTimeAuthManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/OneTimeAuthManagerTest.java @@ -121,6 +121,7 @@ public class OneTimeAuthManagerTest { .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) .addClass(com.arsdigita.kernel.KernelConfig.class) .addClass(com.arsdigita.kernel.security.SecurityConfig.class) + .addClass(org.libreccm.portation.Portable.class) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.xml", diff --git a/ccm-core/src/test/java/org/libreccm/security/PartyRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/security/PartyRepositoryTest.java index e90331182..a2f201ed8 100644 --- a/ccm-core/src/test/java/org/libreccm/security/PartyRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/PartyRepositoryTest.java @@ -122,6 +122,7 @@ public class PartyRepositoryTest { .addClass(com.arsdigita.kernel.security.SecurityConfig.class) .addClass(com.arsdigita.kernel.KernelConfig.class) .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) + .addClass(org.libreccm.portation.Portable.class) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.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 f59a8e0e2..a4466f0de 100644 --- a/ccm-core/src/test/java/org/libreccm/security/PermissionCheckerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/PermissionCheckerTest.java @@ -127,6 +127,7 @@ public class PermissionCheckerTest { .getPackage()) .addPackage(com.arsdigita.util.UncheckedWrapperException.class .getPackage()) + .addClass(org.libreccm.portation.Portable.class) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") 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 0b39e9992..694cb7dfc 100644 --- a/ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java @@ -130,6 +130,7 @@ public class PermissionManagerTest { .addPackage(com.arsdigita.util.UncheckedWrapperException.class .getPackage()) .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) + .addClass(org.libreccm.portation.Portable.class) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.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 fabee2cb1..2080725f9 100644 --- a/ccm-core/src/test/java/org/libreccm/security/RoleManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/RoleManagerTest.java @@ -31,8 +31,6 @@ 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.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; @@ -42,12 +40,11 @@ import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.libreccm.tests.categories.IntegrationTest; -import java.io.File; - import javax.inject.Inject; import static org.hamcrest.Matchers.*; import static org.junit.Assert.*; + import static org.libreccm.testutils.DependenciesHelpers.*; /** @@ -120,6 +117,7 @@ public class RoleManagerTest { .addPackage(com.arsdigita.util.UncheckedWrapperException.class .getPackage()) .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) + .addClass(org.libreccm.portation.Portable.class) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/security/RoleRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/security/RoleRepositoryTest.java index 83e2f320d..5ce500b07 100644 --- a/ccm-core/src/test/java/org/libreccm/security/RoleRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/RoleRepositoryTest.java @@ -120,6 +120,7 @@ public class RoleRepositoryTest { getPackage()) .addPackage(org.libreccm.tests.categories.IntegrationTest.class .getPackage()) + .addClass(org.libreccm.portation.Portable.class) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.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 cbbb1dcbd..742e52c46 100644 --- a/ccm-core/src/test/java/org/libreccm/security/SecuredCollectionTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/SecuredCollectionTest.java @@ -143,6 +143,7 @@ public class SecuredCollectionTest { .getPackage()) .addPackage(com.arsdigita.util.UncheckedWrapperException.class .getPackage()) + .addClass(org.libreccm.portation.Portable.class) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.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 e67f626e6..13bc66a07 100644 --- a/ccm-core/src/test/java/org/libreccm/security/SecuredIteratorTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/SecuredIteratorTest.java @@ -145,6 +145,7 @@ public class SecuredIteratorTest { .addPackage(com.arsdigita.kernel.KernelConfig.class.getPackage()) .addPackage(com.arsdigita.util.UncheckedWrapperException.class .getPackage()) + .addClass(org.libreccm.portation.Portable.class) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.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 8f6f2b564..f333ee4a0 100644 --- a/ccm-core/src/test/java/org/libreccm/security/ShiroTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/ShiroTest.java @@ -116,6 +116,7 @@ public class ShiroTest { .addPackage(com.arsdigita.kernel.KernelConfig.class.getPackage()) .addPackage(com.arsdigita.kernel.security.SecurityConfig.class .getPackage()) + .addClass(org.libreccm.portation.Portable.class) .addClass(org.libreccm.security.authorization.LabBean.class) .addAsLibraries(getModuleDependencies()) .addAsResource("test-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 580f3890b..47e17d7cc 100644 --- a/ccm-core/src/test/java/org/libreccm/security/UserManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/UserManagerTest.java @@ -20,8 +20,6 @@ package org.libreccm.security; import org.apache.shiro.subject.ExecutionException; -import java.io.File; - import javax.inject.Inject; import org.hibernate.exception.ConstraintViolationException; @@ -41,8 +39,6 @@ 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.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; @@ -53,6 +49,7 @@ import org.junit.runner.RunWith; import org.libreccm.tests.categories.IntegrationTest; import static org.junit.Assert.*; + import static org.libreccm.testutils.DependenciesHelpers.*; /** @@ -123,6 +120,7 @@ public class UserManagerTest { .addPackage(com.arsdigita.util.UncheckedWrapperException.class .getPackage()) .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) + .addClass(org.libreccm.portation.Portable.class) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/security/UserRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/security/UserRepositoryTest.java index 33a525a69..4b8cb9d72 100644 --- a/ccm-core/src/test/java/org/libreccm/security/UserRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/UserRepositoryTest.java @@ -33,14 +33,12 @@ 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 static org.junit.Assert.*; + import static org.libreccm.testutils.DependenciesHelpers.*; import org.junit.Before; @@ -50,7 +48,6 @@ import org.junit.runner.RunWith; import org.libreccm.core.EmailAddress; import org.libreccm.tests.categories.IntegrationTest; -import java.io.File; import java.util.List; import javax.inject.Inject; @@ -126,6 +123,7 @@ public class UserRepositoryTest { .addClass(com.arsdigita.kernel.security.SecurityConfig.class) .addClass(com.arsdigita.kernel.KernelConfig.class) .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) + .addClass(org.libreccm.portation.Portable.class) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.xml",