From ad6dce5df8cf53e0b39af2b35fed8d4138131fb1 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Wed, 15 Jul 2020 11:07:22 +0200 Subject: [PATCH] All integration test in ccm-core now work with the maven-failsafe-plugin Former-commit-id: 25739692fe0ee84e954f0e34dc5016d837ee4a79 --- .../modules/DependencyTreeManagerCycleIT.java | 1 + .../modules/DependencyTreeManagerIT.java | 2 ++ .../java/org/libreccm/security/ShiroIT.java | 26 +------------------ 3 files changed, 4 insertions(+), 25 deletions(-) diff --git a/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerCycleIT.java b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerCycleIT.java index da544e68d..c906598ff 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerCycleIT.java +++ b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerCycleIT.java @@ -86,6 +86,7 @@ public class DependencyTreeManagerCycleIT { "LibreCCM-org.libreccm.modules.dependencytree.DependencyTreeManagerCycleTest.war") .addPackages(true, "com.arsdigita", "org.libreccm") .addAsLibraries(getModuleDependencies()) + .addAsResource("test-persistence.xml", "META-INF/persistence.xml") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") .addAsResource( "module-info/dependency-tree-manager-cycle-test/module-root.properties", diff --git a/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerIT.java b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerIT.java index 291cd1349..430a53d2e 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerIT.java +++ b/ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerIT.java @@ -99,6 +99,8 @@ public class DependencyTreeManagerIT { "LibreCCM-org.libreccm.modules.dependencytree.DependencyTreeManagerTest.war") .addPackages(true, "com.arsdigita", "org.libreccm") .addAsLibraries(getModuleDependencies()) + .addAsResource("test-persistence.xml", + "META-INF/persistence.xml") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") .addAsResource( "module-info/dependency-tree-manager-test/module-root.properties", diff --git a/ccm-core/src/test/java/org/libreccm/security/ShiroIT.java b/ccm-core/src/test/java/org/libreccm/security/ShiroIT.java index e9d02352d..4f2fca536 100644 --- a/ccm-core/src/test/java/org/libreccm/security/ShiroIT.java +++ b/ccm-core/src/test/java/org/libreccm/security/ShiroIT.java @@ -95,31 +95,7 @@ public class ShiroIT { return ShrinkWrap .create(WebArchive.class, "LibreCCM-org.libreccm.security.ShiroTest.war") - .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()) - .addClass(org.libreccm.modules.CcmModule.class) - .addClass(org.libreccm.modules.ModuleEvent.class) - .addClass(org.libreccm.modules.InitEvent.class) - .addClass(org.libreccm.modules.InstallEvent.class) - .addClass(org.libreccm.modules.UnInstallEvent.class) - .addClass(org.libreccm.modules.ShutdownEvent.class) - .addPackage(org.libreccm.security.User.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()) - .addClass(org.libreccm.security.authorization.LabBean.class) - .addClass(org.libreccm.imexport.Exportable.class) + .addPackages(true, "com.arsdigita", "org.libreccm") .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml")