diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml
index 85083180e..b23d24c57 100644
--- a/ccm-core/pom.xml
+++ b/ccm-core/pom.xml
@@ -990,7 +990,15 @@
org.apache.maven.plugins
- maven-surefire-plugin
+ maven-failsafe-plugin
+
+
+
+ integration-test
+ verify
+
+
+
always
999
@@ -999,10 +1007,6 @@
org.jboss.logmanager.LogManager
false
-
- org.libreccm.tests.categories.UnitTest,
- org.libreccm.tests.categories.IntegrationTest
-
false
@@ -1033,11 +1037,10 @@
subsystem=datasources,data-source=ccm-core-testdb-h2-mem
true
-
jdbc:h2:mem:ccm-core-testdb
- jndi-name="java:/comp/env/jdbc/org/libreccm/ccm-core/h2-mem
+ java:/comp/env/jdbc/org/libreccm/ccm-core/h2-mem
true
sa
sa
@@ -1048,6 +1051,13 @@
+
+ shutdown-test-env
+
+ shutdown
+
+ post-integration-test
+
diff --git a/ccm-core/src/main/java/org/libreccm/categorization/CategoryTreeModelLite.java b/ccm-core/src/main/java/org/libreccm/categorization/CategoryTreeModelLite.java
index 2b18331ef..eac08056f 100755
--- a/ccm-core/src/main/java/org/libreccm/categorization/CategoryTreeModelLite.java
+++ b/ccm-core/src/main/java/org/libreccm/categorization/CategoryTreeModelLite.java
@@ -25,7 +25,6 @@ import com.arsdigita.bebop.tree.TreeNode;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.libreccm.cdi.utils.CdiUtil;
-import org.libreccm.l10n.GlobalizationHelper;
import java.util.Iterator;
import java.util.Objects;
diff --git a/ccm-core/src/test/java/com/arsdigita/kernel/security/SecurityConfigTest.java b/ccm-core/src/test/java/com/arsdigita/kernel/security/SecurityConfigTest.java
deleted file mode 100644
index 4092ef135..000000000
--- a/ccm-core/src/test/java/com/arsdigita/kernel/security/SecurityConfigTest.java
+++ /dev/null
@@ -1,154 +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 com.arsdigita.kernel.security;
-
-import com.arsdigita.util.JavaPropertyReader;
-import com.arsdigita.util.parameter.AbstractParameter;
-import com.arsdigita.web.CCMApplicationContextListener;
-import com.arsdigita.xml.XML;
-import com.arsdigita.xml.formatters.DateFormatter;
-
-import static org.hamcrest.Matchers.*;
-
-import org.jboss.arquillian.container.test.api.Deployment;
-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.junit.After;
-import org.junit.AfterClass;
-
-import static org.junit.Assert.*;
-
-import static org.libreccm.testutils.DependenciesHelpers.*;
-
-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.UriConverter;
-import org.libreccm.l10n.LocalizedString;
-import org.libreccm.security.PermissionChecker;
-import org.libreccm.tests.categories.IntegrationTest;
-import org.libreccm.web.ApplicationRepository;
-import org.libreccm.workflow.Workflow;
-
-import java.util.List;
-
-/**
- *
- * @author Jens Pelzetter
- */
-@RunWith(Arquillian.class)
-//@Category(IntegrationTest.class)
-public class SecurityConfigTest {
-
- public SecurityConfigTest() {
-
- }
-
- @BeforeClass
- public static void setUpClass() {
- }
-
- @AfterClass
- public static void tearDownClass() {
- }
-
- @Before
- public void setUp() {
- }
-
- @After
- public void tearDown() {
- }
-
- @Deployment
- public static WebArchive createDeployment() {
- return ShrinkWrap
- .create(WebArchive.class,
- "LibreCCM-com.arsdigita.kernel.security.SecurityConfigTest.war")
- .addPackage(CcmObject.class.getPackage())
- .addPackage(Categorization.class.getPackage())
- .addPackage(PermissionChecker.class.getPackage())
- .addPackage(LocalizedString.class.getPackage())
- .addPackage(Workflow.class.getPackage())
- .addPackage(UriConverter.class.getPackage())
- .addPackage(ApplicationRepository.class.getPackage())
- .addPackage(EntityManagerProducer.class.getPackage())
- .addPackage(SecurityConfig.class.getPackage())
- .addPackage(AbstractParameter.class.getPackage())
- .addPackage(JavaPropertyReader.class.getPackage())
- .addPackage(CCMApplicationContextListener.class.getPackage())
- .addPackage(XML.class.getPackage())
- .addPackage(DateFormatter.class.getPackage())
- .addPackage(IntegrationTest.class.getPackage())
- .addAsLibraries(getModuleDependencies())
- .addAsResource(
- "configs/com/arsdigita/kernel/security/SecurityConfigTest/ccm-core.config",
- "ccm-core.config")
- .addAsWebInfResource(
- "configs/com/arsdigita/kernel/security/SecurityConfigTest/registry.properties",
- "conf/registry/registry.properties")
- .addAsWebInfResource(
- "configs/com/arsdigita/kernel/security/SecurityConfigTest/kernel.properties",
- "conf/registry/ccm-core/kernel.properties")
- .addAsWebInfResource(
- "configs/com/arsdigita/kernel/security/SecurityConfigTest/security.properties",
- "conf/registry/ccm-core/security.properties")
- .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")
- .addAsResource("test-persistence.xml",
- "META-INF/persistence.xml")
- .addAsWebInfResource("test-web.xml", "WEB-INF/web.xml")
- .addAsResource("configs/shiro.ini", "shiro.ini")
- .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
- }
-
- @Test
- public void verifySecurityConfig() {
- final SecurityConfig securityConfig = SecurityConfig.getConfig();
-
- final List excludedExtensions = securityConfig
- .getExcludedExtensions();
- assertThat(excludedExtensions.size(), is(4));
- assertThat(excludedExtensions.get(0), is(equalTo(".jpg")));
- assertThat(excludedExtensions.get(1), is(equalTo(".gif")));
- assertThat(excludedExtensions.get(2), is(equalTo(".png")));
- assertThat(excludedExtensions.get(3), is(equalTo(".pdf")));
-
- assertThat(securityConfig.isAutoRegistrationEnabled(), is(false));
-
- assertThat(securityConfig.isPasswordRecoveryEnabled(), is(true));
-
- assertThat(securityConfig.getHashAlgorithm(), is(equalTo("SHA-512")));
-
- assertThat(securityConfig.getSaltLength(), is(256));
-
- assertThat(securityConfig.getHashIterations(), is(50000));
- }
-
-}
diff --git a/ccm-core/src/test/java/org/libreccm/categorization/CategoryManagerTest.java b/ccm-core/src/test/java/org/libreccm/categorization/CategoryManagerIT.java
similarity index 98%
rename from ccm-core/src/test/java/org/libreccm/categorization/CategoryManagerTest.java
rename to ccm-core/src/test/java/org/libreccm/categorization/CategoryManagerIT.java
index a2521c6d5..4a3d68c22 100644
--- a/ccm-core/src/test/java/org/libreccm/categorization/CategoryManagerTest.java
+++ b/ccm-core/src/test/java/org/libreccm/categorization/CategoryManagerIT.java
@@ -42,7 +42,6 @@ import org.junit.runner.RunWith;
import org.libreccm.core.CcmObject;
import org.libreccm.core.CcmObjectRepository;
import org.libreccm.security.Shiro;
-import org.libreccm.tests.categories.IntegrationTest;
import java.util.List;
import java.util.Map;
@@ -66,7 +65,6 @@ import org.jboss.arquillian.persistence.TestExecutionPhase;
*
* @author Jens Pelzetter
*/
-@org.junit.experimental.categories.Category(IntegrationTest.class)
@RunWith(Arquillian.class)
@PersistenceTest
@Transactional(TransactionMode.COMMIT)
@@ -75,7 +73,7 @@ import org.jboss.arquillian.persistence.TestExecutionPhase;
"003_init_hibernate_sequence.sql"})
@CleanupUsingScript(value = {"999_cleanup.sql"},
phase = TestExecutionPhase.BEFORE)
-public class CategoryManagerTest {
+public class CategoryManagerIT {
@Inject
private CategoryRepository categoryRepo;
@@ -101,7 +99,7 @@ public class CategoryManagerTest {
@PersistenceContext(name = "LibreCCM")
private EntityManager entityManager;
- public CategoryManagerTest() {
+ public CategoryManagerIT() {
}
@BeforeClass
@@ -139,8 +137,6 @@ public class CategoryManagerTest {
.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(org.libreccm.cdi.utils.CdiUtil.class.getPackage())
diff --git a/ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryIT.java
similarity index 97%
rename from ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryTest.java
rename to ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryIT.java
index 88e0d38c7..037dd89a5 100644
--- a/ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryTest.java
+++ b/ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryIT.java
@@ -45,7 +45,6 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.libreccm.security.Shiro;
-import org.libreccm.tests.categories.IntegrationTest;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
@@ -55,13 +54,13 @@ import static org.libreccm.testutils.DependenciesHelpers.*;
import org.jboss.arquillian.persistence.CleanupUsingScript;
import java.util.Optional;
+
import org.jboss.arquillian.persistence.TestExecutionPhase;
/**
*
* @author Jens Pelzetter
*/
-@org.junit.experimental.categories.Category(IntegrationTest.class)
@RunWith(Arquillian.class)
@PersistenceTest
@Transactional(TransactionMode.COMMIT)
@@ -70,7 +69,7 @@ import org.jboss.arquillian.persistence.TestExecutionPhase;
"003_init_hibernate_sequence.sql"})
@CleanupUsingScript(value = {"999_cleanup.sql"},
phase = TestExecutionPhase.BEFORE)
-public class CategoryRepositoryTest {
+public class CategoryRepositoryIT {
@Inject
private CategoryRepository categoryRepo;
@@ -87,7 +86,7 @@ public class CategoryRepositoryTest {
@PersistenceContext(name = "LibreCCM")
private EntityManager entityManager;
- public CategoryRepositoryTest() {
+ public CategoryRepositoryIT() {
}
@BeforeClass
@@ -125,8 +124,6 @@ public class CategoryRepositoryTest {
.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(org.libreccm.cdi.utils.CdiUtil.class.getPackage())
diff --git a/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerTest.java b/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerIT.java
similarity index 96%
rename from ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerTest.java
rename to ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerIT.java
index ce623b11a..03aa83484 100644
--- a/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerTest.java
+++ b/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerIT.java
@@ -40,10 +40,8 @@ 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.libreccm.security.Shiro;
-import org.libreccm.tests.categories.IntegrationTest;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
@@ -58,7 +56,6 @@ import org.jboss.arquillian.persistence.TestExecutionPhase;
*
* @author Jens Pelzetter
*/
-@Category(IntegrationTest.class)
@RunWith(Arquillian.class)
@PersistenceTest
@Transactional(TransactionMode.COMMIT)
@@ -67,7 +64,7 @@ import org.jboss.arquillian.persistence.TestExecutionPhase;
"003_init_hibernate_sequence.sql"})
@CleanupUsingScript(value = {"999_cleanup.sql"},
phase = TestExecutionPhase.BEFORE)
-public class ConfigurationManagerTest {
+public class ConfigurationManagerIT {
@Inject
private ConfigurationManager configurationManager;
@@ -75,7 +72,7 @@ public class ConfigurationManagerTest {
@Inject
private Shiro shiro;
- public ConfigurationManagerTest() {
+ public ConfigurationManagerIT() {
}
@@ -115,8 +112,6 @@ public class ConfigurationManagerTest {
.addPackage(org.libreccm.security.Permission.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())
.addClass(com.example.TestConfiguration.class)
diff --git a/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryIT.java
similarity index 97%
rename from ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java
rename to ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryIT.java
index 4a91e29f7..2517d05b8 100644
--- a/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java
+++ b/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryIT.java
@@ -38,9 +38,7 @@ 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.libreccm.tests.categories.IntegrationTest;
import java.util.List;
@@ -55,6 +53,7 @@ import static org.libreccm.testutils.DependenciesHelpers.*;
import org.jboss.arquillian.persistence.CleanupUsingScript;
import java.util.Optional;
+
import org.jboss.arquillian.persistence.TestExecutionPhase;
/**
@@ -63,7 +62,6 @@ import org.jboss.arquillian.persistence.TestExecutionPhase;
*
* @author Jens Pelzetter
*/
-@Category(IntegrationTest.class)
@RunWith(Arquillian.class)
@PersistenceTest
@Transactional(TransactionMode.COMMIT)
@@ -72,7 +70,7 @@ import org.jboss.arquillian.persistence.TestExecutionPhase;
"003_init_hibernate_sequence.sql"})
@CleanupUsingScript(value = {"999_cleanup.sql"},
phase = TestExecutionPhase.BEFORE)
-public class CcmObjectRepositoryTest {
+public class CcmObjectRepositoryIT {
@Inject
private CcmObjectRepository ccmObjectRepository;
@@ -80,7 +78,7 @@ public class CcmObjectRepositoryTest {
@PersistenceContext(name = "LibreCCM")
private EntityManager entityManager;
- public CcmObjectRepositoryTest() {
+ public CcmObjectRepositoryIT() {
}
@BeforeClass
@@ -127,8 +125,6 @@ public class CcmObjectRepositoryTest {
.addPackage(org.libreccm.cdi.utils.CdiUtil.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.security.SecurityConfig.class
diff --git a/ccm-core/src/test/java/org/libreccm/imexport/GroupImportTest.java b/ccm-core/src/test/java/org/libreccm/imexport/GroupImportIT.java
similarity index 97%
rename from ccm-core/src/test/java/org/libreccm/imexport/GroupImportTest.java
rename to ccm-core/src/test/java/org/libreccm/imexport/GroupImportIT.java
index bfdaaa20c..478f19318 100644
--- a/ccm-core/src/test/java/org/libreccm/imexport/GroupImportTest.java
+++ b/ccm-core/src/test/java/org/libreccm/imexport/GroupImportIT.java
@@ -44,7 +44,6 @@ import org.libreccm.configuration.ConfigurationManager;
import org.libreccm.core.UnexpectedErrorException;
import org.libreccm.files.CcmFilesConfiguration;
import org.libreccm.security.Shiro;
-import org.libreccm.tests.categories.IntegrationTest;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -68,7 +67,6 @@ import static org.junit.Assert.*;
*
* @author Jens Pelzetter
*/
-@Category(IntegrationTest.class)
@RunWith(Arquillian.class)
@PersistenceTest
@Transactional(TransactionMode.COMMIT)
@@ -77,7 +75,7 @@ import static org.junit.Assert.*;
"003_init_hibernate_sequence.sql"})
@CleanupUsingScript(value = {"999_cleanup.sql"},
phase = TestExecutionPhase.BEFORE)
-public class GroupImportTest {
+public class GroupImportIT {
private static final String IMPORT_MANIFEST_SOURCE = "/imports"
+ "/org.libreccm.imexport.GroupImportTest"
@@ -108,7 +106,7 @@ public class GroupImportTest {
@Inject
private Shiro shiro;
- public GroupImportTest() {
+ public GroupImportIT() {
}
@@ -135,7 +133,7 @@ public class GroupImportTest {
if (Files.exists(ccmTestsDirPath)) {
Files.walkFileTree(ccmTestsDirPath,
- new GroupImportTest.DeleteDirectoryVisitor());
+ new GroupImportIT.DeleteDirectoryVisitor());
}
Files.createDirectory(ccmTestsDirPath);
@@ -229,8 +227,6 @@ public class GroupImportTest {
.addPackage(org.libreccm.workflow.Workflow.class.getPackage())
.addPackage(org.libreccm.testutils.EqualsVerifier.class
.getPackage())
- .addPackage(org.libreccm.tests.categories.IntegrationTest.class
- .getPackage())
.addClass(com.arsdigita.kernel.security.SecurityConfig.class)
.addClass(com.arsdigita.kernel.KernelConfig.class)
.addAsLibraries(getModuleDependencies())
diff --git a/ccm-core/src/test/java/org/libreccm/imexport/GroupMembershipImportTest.java b/ccm-core/src/test/java/org/libreccm/imexport/GroupMembershipImportIT.java
similarity index 97%
rename from ccm-core/src/test/java/org/libreccm/imexport/GroupMembershipImportTest.java
rename to ccm-core/src/test/java/org/libreccm/imexport/GroupMembershipImportIT.java
index 50da38183..2698e374b 100644
--- a/ccm-core/src/test/java/org/libreccm/imexport/GroupMembershipImportTest.java
+++ b/ccm-core/src/test/java/org/libreccm/imexport/GroupMembershipImportIT.java
@@ -44,7 +44,6 @@ import org.libreccm.configuration.ConfigurationManager;
import org.libreccm.core.UnexpectedErrorException;
import org.libreccm.files.CcmFilesConfiguration;
import org.libreccm.security.Shiro;
-import org.libreccm.tests.categories.IntegrationTest;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -68,7 +67,6 @@ import static org.junit.Assert.*;
*
* @author Jens Pelzetter
*/
-@Category(IntegrationTest.class)
@RunWith(Arquillian.class)
@PersistenceTest
@Transactional(TransactionMode.COMMIT)
@@ -77,7 +75,7 @@ import static org.junit.Assert.*;
"003_init_hibernate_sequence.sql"})
@CleanupUsingScript(value = {"999_cleanup.sql"},
phase = TestExecutionPhase.BEFORE)
-public class GroupMembershipImportTest {
+public class GroupMembershipImportIT {
private static final String IMPORT_MANIFEST_SOURCE = "/imports"
+ "/org.libreccm.imexport.GroupMembershipImportTest"
@@ -109,7 +107,7 @@ public class GroupMembershipImportTest {
@Inject
private Shiro shiro;
- public GroupMembershipImportTest() {
+ public GroupMembershipImportIT() {
}
@@ -233,8 +231,6 @@ public class GroupMembershipImportTest {
.addPackage(org.libreccm.workflow.Workflow.class.getPackage())
.addPackage(org.libreccm.testutils.EqualsVerifier.class
.getPackage())
- .addPackage(org.libreccm.tests.categories.IntegrationTest.class
- .getPackage())
.addClass(com.arsdigita.kernel.security.SecurityConfig.class)
.addClass(com.arsdigita.kernel.KernelConfig.class)
.addAsLibraries(getModuleDependencies())
diff --git a/ccm-core/src/test/java/org/libreccm/imexport/UserImportTest.java b/ccm-core/src/test/java/org/libreccm/imexport/UserImportIT.java
similarity index 97%
rename from ccm-core/src/test/java/org/libreccm/imexport/UserImportTest.java
rename to ccm-core/src/test/java/org/libreccm/imexport/UserImportIT.java
index 0d6f828a8..692066f08 100644
--- a/ccm-core/src/test/java/org/libreccm/imexport/UserImportTest.java
+++ b/ccm-core/src/test/java/org/libreccm/imexport/UserImportIT.java
@@ -44,7 +44,6 @@ import org.libreccm.configuration.ConfigurationManager;
import org.libreccm.core.UnexpectedErrorException;
import org.libreccm.files.CcmFilesConfiguration;
import org.libreccm.security.Shiro;
-import org.libreccm.tests.categories.IntegrationTest;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -68,7 +67,6 @@ import static org.junit.Assert.*;
*
* @author Jens Pelzetter
*/
-@Category(IntegrationTest.class)
@RunWith(Arquillian.class)
@PersistenceTest
@Transactional(TransactionMode.COMMIT)
@@ -77,7 +75,7 @@ import static org.junit.Assert.*;
"003_init_hibernate_sequence.sql"})
@CleanupUsingScript(value = {"999_cleanup.sql"},
phase = TestExecutionPhase.BEFORE)
-public class UserImportTest {
+public class UserImportIT {
private static final String IMPORT_MANIFEST_SOURCE = "/imports"
+ "/org.libreccm.imexport.UserImportTest"
@@ -108,7 +106,7 @@ public class UserImportTest {
@Inject
private Shiro shiro;
- public UserImportTest() {
+ public UserImportIT() {
}
@@ -228,8 +226,6 @@ public class UserImportTest {
.addPackage(org.libreccm.workflow.Workflow.class.getPackage())
.addPackage(org.libreccm.testutils.EqualsVerifier.class
.getPackage())
- .addPackage(org.libreccm.tests.categories.IntegrationTest.class
- .getPackage())
.addClass(com.arsdigita.kernel.security.SecurityConfig.class)
.addClass(com.arsdigita.kernel.KernelConfig.class)
.addAsLibraries(getModuleDependencies())
diff --git a/pom.xml b/pom.xml
index b4c0c7429..d051b2c04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -242,6 +242,11 @@
maven-release-plugin
2.5.3
+
+ org.apache.maven.plugins
+ maven-failsafe-plugin
+ 3.0.0-M5
+
org.apache.maven.plugins
maven-surefire-plugin