From 85fabbf29e43b8db438f5fcd8e3d2af2131f0dd9 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sat, 23 May 2020 16:43:27 +0200 Subject: [PATCH] Missing classes for integration tests added to deployment Former-commit-id: 0b50f2508ed7a90aa904d174c503f6ea60ab2076 --- .../libreccm/categorization/CategoryManagerTest.java | 1 + .../categorization/CategoryRepositoryTest.java | 1 + .../configuration/ConfigurationManagerTest.java | 1 + .../org/libreccm/core/CcmObjectRepositoryTest.java | 1 + .../java/org/libreccm/imexport/GroupImportTest.java | 1 + .../libreccm/imexport/GroupMembershipImportTest.java | 1 + .../java/org/libreccm/imexport/UserImportTest.java | 1 + .../libreccm/modules/ConfigurationLoaderTest.java | 1 + .../security/AuthorizationInterceptorTest.java | 1 + .../org/libreccm/security/ChallengeManagerTest.java | 1 + .../java/org/libreccm/security/GroupManagerTest.java | 1 + .../org/libreccm/security/GroupRepositoryTest.java | 1 + .../libreccm/security/OneTimeAuthManagerTest.java | 1 + .../org/libreccm/security/PartyRepositoryTest.java | 1 + .../org/libreccm/security/PermissionCheckerTest.java | 1 + .../org/libreccm/security/PermissionManagerTest.java | 1 + .../java/org/libreccm/security/RoleManagerTest.java | 1 + .../org/libreccm/security/RoleRepositoryTest.java | 12 ++++++++---- .../org/libreccm/security/SecuredCollectionTest.java | 1 + .../org/libreccm/security/SecuredIteratorTest.java | 1 + .../java/org/libreccm/security/UserManagerTest.java | 1 + .../org/libreccm/security/UserRepositoryTest.java | 1 + 22 files changed, 29 insertions(+), 4 deletions(-) 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 a70de5285..ea54311e3 100644 --- a/ccm-core/src/test/java/org/libreccm/categorization/CategoryManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/categorization/CategoryManagerTest.java @@ -153,6 +153,7 @@ public class CategoryManagerTest { .addClass( org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) + .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.xml", 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 207448473..5732a8657 100644 --- a/ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryTest.java @@ -139,6 +139,7 @@ public class CategoryRepositoryTest { .addClass( org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) + .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.xml", 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 62612f0c9..18950de18 100644 --- a/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerTest.java @@ -130,6 +130,7 @@ public class ConfigurationManagerTest { .addClass( org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) + .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.xml", 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 8b57eb0c8..c1d2dbe24 100644 --- a/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java @@ -148,6 +148,7 @@ public class CcmObjectRepositoryTest { .addClass( org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) + .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/imexport/GroupImportTest.java b/ccm-core/src/test/java/org/libreccm/imexport/GroupImportTest.java index 3a155283d..d78e4fe82 100644 --- a/ccm-core/src/test/java/org/libreccm/imexport/GroupImportTest.java +++ b/ccm-core/src/test/java/org/libreccm/imexport/GroupImportTest.java @@ -245,6 +245,7 @@ public class GroupImportTest { .addClass( org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) + .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("imports", "imports") diff --git a/ccm-core/src/test/java/org/libreccm/imexport/GroupMembershipImportTest.java b/ccm-core/src/test/java/org/libreccm/imexport/GroupMembershipImportTest.java index 0505477e0..15450c9ba 100644 --- a/ccm-core/src/test/java/org/libreccm/imexport/GroupMembershipImportTest.java +++ b/ccm-core/src/test/java/org/libreccm/imexport/GroupMembershipImportTest.java @@ -249,6 +249,7 @@ public class GroupMembershipImportTest { .addClass( org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) + .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("imports", "imports") diff --git a/ccm-core/src/test/java/org/libreccm/imexport/UserImportTest.java b/ccm-core/src/test/java/org/libreccm/imexport/UserImportTest.java index 9b0b6b78a..932935a5b 100644 --- a/ccm-core/src/test/java/org/libreccm/imexport/UserImportTest.java +++ b/ccm-core/src/test/java/org/libreccm/imexport/UserImportTest.java @@ -244,6 +244,7 @@ public class UserImportTest { .addClass( org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) + .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("imports", "imports") diff --git a/ccm-core/src/test/java/org/libreccm/modules/ConfigurationLoaderTest.java b/ccm-core/src/test/java/org/libreccm/modules/ConfigurationLoaderTest.java index 8e729894b..8d9e91700 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/ConfigurationLoaderTest.java +++ b/ccm-core/src/test/java/org/libreccm/modules/ConfigurationLoaderTest.java @@ -107,6 +107,7 @@ public class ConfigurationLoaderTest { .addClass( org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) + .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.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 ae5fb3c1b..722078fbb 100644 --- a/ccm-core/src/test/java/org/libreccm/security/AuthorizationInterceptorTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/AuthorizationInterceptorTest.java @@ -139,6 +139,7 @@ public class AuthorizationInterceptorTest { .addClass( org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) + .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.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 0929afb3f..69efff23b 100644 --- a/ccm-core/src/test/java/org/libreccm/security/ChallengeManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/ChallengeManagerTest.java @@ -142,6 +142,7 @@ public class ChallengeManagerTest { .addClass( org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) + .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.xml", 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 f389f1f04..9a3fc30a1 100644 --- a/ccm-core/src/test/java/org/libreccm/security/GroupManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/GroupManagerTest.java @@ -132,6 +132,7 @@ public class GroupManagerTest { .addClass( org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) + .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") 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 8de2e0a69..cf1fd45ed 100644 --- a/ccm-core/src/test/java/org/libreccm/security/GroupRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/GroupRepositoryTest.java @@ -132,6 +132,7 @@ public class GroupRepositoryTest { .addClass( org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) + .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.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 30f95b9c8..113c981ef 100644 --- a/ccm-core/src/test/java/org/libreccm/security/OneTimeAuthManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/OneTimeAuthManagerTest.java @@ -136,6 +136,7 @@ public class OneTimeAuthManagerTest { .addClass( org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) + .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.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 074a4929e..46859d060 100644 --- a/ccm-core/src/test/java/org/libreccm/security/PartyRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/PartyRepositoryTest.java @@ -137,6 +137,7 @@ public class PartyRepositoryTest { .addClass( org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) + .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.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 3a6732ec8..993bcfd27 100644 --- a/ccm-core/src/test/java/org/libreccm/security/PermissionCheckerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/PermissionCheckerTest.java @@ -140,6 +140,7 @@ public class PermissionCheckerTest { .addClass( org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) + .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.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 32eab24d8..69d1ec666 100644 --- a/ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java @@ -141,6 +141,7 @@ public class PermissionManagerTest { .addClass( org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) + .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.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 552817fa3..c156ed3c0 100644 --- a/ccm-core/src/test/java/org/libreccm/security/RoleManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/RoleManagerTest.java @@ -129,6 +129,7 @@ public class RoleManagerTest { .addClass( org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) + .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.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 defd43dbf..3d73761af 100644 --- a/ccm-core/src/test/java/org/libreccm/security/RoleRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/RoleRepositoryTest.java @@ -69,15 +69,17 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"001_create_schema.sql", - "002_create_ccm_core_tables.sql", +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", "003_init_hibernate_sequence.sql"}) @CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) public class RoleRepositoryTest { private static final String ADMINISTRATOR = "administrator"; + private static final String USER = "user"; + private static final String READER = "reader"; @Inject @@ -119,7 +121,7 @@ public class RoleRepositoryTest { .getPackage()) .addPackage( org.libreccm.configuration.ConfigurationManager.class - .getPackage()) + .getPackage()) .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()). addPackage(org.libreccm.web.CcmApplication.class.getPackage()) .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) @@ -138,6 +140,7 @@ public class RoleRepositoryTest { .addClass( org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) + .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.xml", @@ -210,7 +213,8 @@ public class RoleRepositoryTest { @UsingDataSet("datasets/org/libreccm/security/RoleRepositoryTest/data.yml") @InSequence(200) public void findRoleByName() { - final Optional administrator = roleRepository.findByName(ADMINISTRATOR); + final Optional administrator = roleRepository.findByName( + ADMINISTRATOR); final Optional user = roleRepository.findByName(USER); final Optional reader = roleRepository.findByName(READER); 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 26264180f..ba8152f11 100644 --- a/ccm-core/src/test/java/org/libreccm/security/SecuredCollectionTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/SecuredCollectionTest.java @@ -156,6 +156,7 @@ public class SecuredCollectionTest { org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) .addClass(org.libreccm.imexport.Exportable.class) + .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.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 7b3cedaa7..5909879d4 100644 --- a/ccm-core/src/test/java/org/libreccm/security/SecuredIteratorTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/SecuredIteratorTest.java @@ -158,6 +158,7 @@ public class SecuredIteratorTest { .addClass( org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) + .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) .addAsLibraries(getModuleDependencies()) .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 7455ce1ff..93e236f57 100644 --- a/ccm-core/src/test/java/org/libreccm/security/UserManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/UserManagerTest.java @@ -132,6 +132,7 @@ public class UserManagerTest { .addClass( org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) + .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.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 0e5163a0e..4f7aa4b58 100644 --- a/ccm-core/src/test/java/org/libreccm/security/UserRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/UserRepositoryTest.java @@ -137,6 +137,7 @@ public class UserRepositoryTest { .addClass( org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) + .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.xml",