diff --git a/ccm-core/src/main/java/org/libreccm/core/authentication/AbstractPasswordLoginModule.java b/ccm-core/src/main/java/org/libreccm/core/authentication/AbstractPasswordLoginModule.java index 4e3d18528..0e3f9fe29 100644 --- a/ccm-core/src/main/java/org/libreccm/core/authentication/AbstractPasswordLoginModule.java +++ b/ccm-core/src/main/java/org/libreccm/core/authentication/AbstractPasswordLoginModule.java @@ -43,9 +43,9 @@ import javax.security.auth.spi.LoginModule; * the shared data for use by other {@code LoginModule}s. * * This class in a reworked version of - * {@code org.arsdigita.kernel.security.AbstractPasswordLoginModule} developed by Sameer - * Ajmani (according to the JavaDoc). The main differences is that the new - * version uses generics and multi-catch for exceptions. Also the code, + * {@code org.arsdigita.kernel.security.AbstractPasswordLoginModule} developed + * by Sameer Ajmani (according to the JavaDoc). The main differences is that the + * new version uses generics and multi-catch for exceptions. Also the code, * especially if clauses have been reworked to match the conventions enforced by * PMD and other style checkers. Also the methods {@code getPassword} and * {@code getUsername} have been renamed to {@code retrievePassword} and @@ -61,7 +61,8 @@ import javax.security.auth.spi.LoginModule; */ public abstract class AbstractPasswordLoginModule implements LoginModule { - private static final Logger LOGGER = LogManager.getLogger(AbstractPasswordLoginModule.class); + private static final Logger LOGGER = LogManager.getLogger( + AbstractPasswordLoginModule.class); /** * Key for username in shared data map. */ diff --git a/ccm-core/src/main/java/org/libreccm/formbuilder/Component.java b/ccm-core/src/main/java/org/libreccm/formbuilder/Component.java index 511d5a8db..f0b604098 100644 --- a/ccm-core/src/main/java/org/libreccm/formbuilder/Component.java +++ b/ccm-core/src/main/java/org/libreccm/formbuilder/Component.java @@ -57,6 +57,7 @@ public class Component extends CcmObject implements Serializable { @AssociationOverride( name = "values", joinTable = @JoinTable(name = "formbuilder_component_descriptions", + schema = "ccm_core", joinColumns = { @JoinColumn(name = "component_id")})) private LocalizedString description; diff --git a/ccm-core/src/main/java/org/libreccm/formbuilder/Option.java b/ccm-core/src/main/java/org/libreccm/formbuilder/Option.java index 1be6a3e15..830195056 100644 --- a/ccm-core/src/main/java/org/libreccm/formbuilder/Option.java +++ b/ccm-core/src/main/java/org/libreccm/formbuilder/Option.java @@ -43,12 +43,12 @@ public class Option extends Component implements Serializable { @Column(name = "parameter_value") private String parameterValue; - @AssociationOverride(name = "values", - joinTable = @JoinTable(name - = "formbuilder_option_labels", - joinColumns = { - @JoinColumn(name - = "option_id")})) + @AssociationOverride( + name = "values", + joinTable = @JoinTable(name = "formbuilder_option_labels", + schema = "ccm_core", + joinColumns = { + @JoinColumn(name = "option_id")})) private LocalizedString label; public String getParameterValue() { @@ -80,11 +80,11 @@ public class Option extends Component implements Serializable { if (obj == null) { return false; } - + if (!super.equals(obj)) { return false; } - + if (!(obj instanceof Option)) { return false; } @@ -103,7 +103,7 @@ public class Option extends Component implements Serializable { public boolean canEqual(final Object obj) { return obj instanceof Option; } - + @Override public String toString(final String data) { return super.toString(String.format(", parameterValue = \"%s\", " diff --git a/ccm-core/src/main/java/org/libreccm/formbuilder/PersistentDataQuery.java b/ccm-core/src/main/java/org/libreccm/formbuilder/PersistentDataQuery.java index 1524dd3e9..f301ac6c5 100644 --- a/ccm-core/src/main/java/org/libreccm/formbuilder/PersistentDataQuery.java +++ b/ccm-core/src/main/java/org/libreccm/formbuilder/PersistentDataQuery.java @@ -46,20 +46,20 @@ public class PersistentDataQuery extends CcmObject implements Serializable { @AssociationOverride( name = "values", - joinTable = @JoinTable(name - = "formbuilder_data_query_names", - joinColumns = { - @JoinColumn(name - = "data_query_id")})) + joinTable = @JoinTable( + name = "formbuilder_data_query_names", + schema = "ccm_core", + joinColumns = { + @JoinColumn(name = "data_query_id")})) private LocalizedString name; @AssociationOverride( name = "values", - joinTable = @JoinTable(name - = "formbuilder_data_query_descriptions", - joinColumns = { - @JoinColumn(name - = "data_query_id")})) + joinTable = @JoinTable( + name = "formbuilder_data_query_descriptions", + schema = "ccm_core", + joinColumns = { + @JoinColumn(name = "data_query_id")})) private LocalizedString description; public String getQueryId() { @@ -100,11 +100,11 @@ public class PersistentDataQuery extends CcmObject implements Serializable { if (obj == null) { return false; } - + if (!super.equals(obj)) { return false; } - + if (!(obj instanceof PersistentDataQuery)) { return false; } diff --git a/ccm-core/src/main/java/org/libreccm/formbuilder/ProcessListener.java b/ccm-core/src/main/java/org/libreccm/formbuilder/ProcessListener.java index 158a434c4..de3348b18 100644 --- a/ccm-core/src/main/java/org/libreccm/formbuilder/ProcessListener.java +++ b/ccm-core/src/main/java/org/libreccm/formbuilder/ProcessListener.java @@ -44,20 +44,20 @@ public class ProcessListener extends CcmObject implements Serializable { @AssociationOverride( name = "values", - joinTable = @JoinTable(name - = "formbuilder_process_listener_names", - joinColumns = { - @JoinColumn(name - = "process_listener_id")})) + joinTable = @JoinTable( + name = "formbuilder_process_listener_names", + schema = "ccm_core", + joinColumns = { + @JoinColumn(name = "process_listener_id")})) private LocalizedString name; @AssociationOverride( name = "values", - joinTable = @JoinTable(name - = "formbuilder_process_listener_descriptions", - joinColumns = { - @JoinColumn(name - = "process_listener_id")})) + joinTable = @JoinTable( + name = "formbuilder_process_listener_descriptions", + schema = "ccm_core", + joinColumns = { + @JoinColumn(name = "process_listener_id")})) private LocalizedString description; @@ -128,11 +128,11 @@ public class ProcessListener extends CcmObject implements Serializable { if (obj == null) { return false; } - + if (!super.equals(obj)) { return false; } - + if (!(obj instanceof ProcessListener)) { return false; } diff --git a/ccm-core/src/main/java/org/libreccm/workflow/Task.java b/ccm-core/src/main/java/org/libreccm/workflow/Task.java index 76afb28f5..e29a2a99d 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/Task.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/Task.java @@ -70,6 +70,7 @@ public class Task implements Serializable { @AssociationOverride( name = "values", joinTable = @JoinTable(name = "workflow_task_labels", + schema = "ccm_core", joinColumns = { @JoinColumn(name = "task_id")})) private LocalizedString label; @@ -78,6 +79,7 @@ public class Task implements Serializable { @AssociationOverride( name = "values", joinTable = @JoinTable(name = "workflow_tasks_descriptions", + schema = "ccm_core", joinColumns = { @JoinColumn(name = "task_id")})) private LocalizedString description; @@ -97,6 +99,7 @@ public class Task implements Serializable { @ManyToMany @JoinTable(name = "workflow_task_dependencies", + schema = "ccm_core", joinColumns = { @JoinColumn(name = "depends_on_task_id")}, inverseJoinColumns = { @@ -105,6 +108,7 @@ public class Task implements Serializable { @ElementCollection @JoinTable(name = "workflow_task_comments", + schema = "ccm_core", joinColumns = { @JoinColumn(name = "task_id")}) @Column(name = "comment") diff --git a/ccm-core/src/main/java/org/libreccm/workflow/UserTask.java b/ccm-core/src/main/java/org/libreccm/workflow/UserTask.java index b64c052a2..e8382adbe 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/UserTask.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/UserTask.java @@ -77,6 +77,7 @@ public class UserTask extends Task implements Serializable { @OneToMany @JoinTable(name = "workflow_user_task_assigned_users", + schema = "ccm_core", joinColumns = { @JoinColumn(name = "user_task_id")}, inverseJoinColumns = { @@ -85,6 +86,7 @@ public class UserTask extends Task implements Serializable { @OneToMany @JoinTable(name = "workflow_user_task_assigned_groups", + schema = "ccm_core", joinColumns = { @JoinColumn(name = "user_task_id")}, inverseJoinColumns = { diff --git a/ccm-core/src/main/java/org/libreccm/workflow/Workflow.java b/ccm-core/src/main/java/org/libreccm/workflow/Workflow.java index f7f48ac82..9f4e0ee89 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/Workflow.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/Workflow.java @@ -57,6 +57,7 @@ public class Workflow implements Serializable { @AssociationOverride( name = "values", joinTable = @JoinTable(name = "workflow_names", + schema = "ccm_core", joinColumns = { @JoinColumn(name = "workflow_id")})) private LocalizedString name; @@ -65,6 +66,7 @@ public class Workflow implements Serializable { @AssociationOverride( name = "values", joinTable = @JoinTable(name = "workflow_descriptions", + schema = "ccm_core", joinColumns = { @JoinColumn(name = "workflow_id") })) 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 01dd14790..0b95c6893 100644 --- a/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java @@ -18,7 +18,6 @@ */ package org.libreccm.core; -import org.dbunit.database.DatabaseConnection; import static org.hamcrest.CoreMatchers.*; @@ -30,7 +29,6 @@ import org.jboss.arquillian.persistence.CreateSchema; import org.jboss.arquillian.persistence.PersistenceTest; import org.jboss.arquillian.persistence.ShouldMatchDataSet; import org.jboss.arquillian.persistence.UsingDataSet; -import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.transaction.api.annotation.TransactionMode; import org.jboss.arquillian.transaction.api.annotation.Transactional; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -64,7 +62,7 @@ import static org.junit.Assert.*; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -//@CreateSchema({"scripts/create_ccm_core_schema.sql"}) +@CreateSchema({"create_ccm_core_schema.sql"}) public class CcmObjectRepositoryTest { @Inject @@ -109,7 +107,7 @@ public class CcmObjectRepositoryTest { return ShrinkWrap .create(WebArchive.class, "LibreCCM-org.libreccm.core.CcmObjectRepositoryTest.war"). - addPackage(CcmObject.class.getPackage()) + addPackages(false, CcmObject.class.getPackage()) .addPackage(org.libreccm.web.Application.class.getPackage()) .addPackage(org.libreccm.categorization.Category.class. getPackage()) @@ -130,26 +128,28 @@ public class CcmObjectRepositoryTest { } @Test + @InSequence(1) public void repoIsInjected() { assertThat(ccmObjectRepository, is(not((nullValue())))); } @Test + @InSequence(2) public void entityManagerIsInjected() { assertThat(entityManager, is(not((nullValue())))); } @Test @UsingDataSet( - "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.json") - @InSequence(4) + "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml") + @InSequence(3) public void datasetOnly() { System.out.println("Dataset loaded successfully."); } @Test @UsingDataSet( - "datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-changed.json") + "datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-changed.yml") @InSequence(4) public void datasetOnly2() { System.out.println("Dataset loaded successfully."); @@ -157,7 +157,7 @@ public class CcmObjectRepositoryTest { @Test @UsingDataSet( - "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.json") + "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml") @InSequence(5) public void entityManagerFindCcmObjectByLongPrimitive() { final CcmObject obj1 = entityManager.find(CcmObject.class, -10L); @@ -182,7 +182,7 @@ public class CcmObjectRepositoryTest { @Test @UsingDataSet( - "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.json") + "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml") @InSequence(6) public void entityManagerFindCcmObjectByLongClass() { final CcmObject obj1 = entityManager.find(CcmObject.class, @@ -211,7 +211,7 @@ public class CcmObjectRepositoryTest { @Test @UsingDataSet( - "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.json") + "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml") @InSequence(10) public void findCcmObjectById() { final CcmObject obj1 = ccmObjectRepository.findById(-10L); @@ -236,7 +236,7 @@ public class CcmObjectRepositoryTest { @Test @UsingDataSet( - "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.json") + "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml") @InSequence(10) public void findAllCcmObjects() { final List objects = ccmObjectRepository.findAll(); @@ -246,9 +246,9 @@ public class CcmObjectRepositoryTest { @Test @UsingDataSet( - "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.json") + "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml") @ShouldMatchDataSet(value - = "datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-new.json", + = "datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-new.yml", excludeColumns = {"object_id"}) @InSequence(300) public void saveNewCcmObject() { @@ -260,9 +260,9 @@ public class CcmObjectRepositoryTest { @Test @UsingDataSet( - "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.json") + "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml") @ShouldMatchDataSet(value - = "datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-changed.json", + = "datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-changed.yml", excludeColumns = {"object_id"}) @InSequence(400) public void saveChangedCcmObject() { @@ -281,9 +281,9 @@ public class CcmObjectRepositoryTest { @Test @UsingDataSet( - "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.json") + "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml") @ShouldMatchDataSet(value - = "datasets/org/libreccm/core/CcmObjectRepositoryTest/after-delete.json", + = "datasets/org/libreccm/core/CcmObjectRepositoryTest/after-delete.yml", excludeColumns = {"object_id"}) @InSequence(600) public void deleteCcmObject() { diff --git a/ccm-core/src/test/java/org/libreccm/core/GroupManagerTest.java b/ccm-core/src/test/java/org/libreccm/core/GroupManagerTest.java index 556874983..f83c656ae 100644 --- a/ccm-core/src/test/java/org/libreccm/core/GroupManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/GroupManagerTest.java @@ -24,6 +24,7 @@ import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; 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.ShouldMatchDataSet; import org.jboss.arquillian.persistence.UsingDataSet; @@ -58,6 +59,7 @@ import javax.inject.Inject; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) +@CreateSchema({"create_ccm_core_schema.sql"}) public class GroupManagerTest { @Inject @@ -133,7 +135,7 @@ public class GroupManagerTest { @Test @InSequence(10) @UsingDataSet("datasets/org/libreccm/core/GroupManagerTest/" - + "users-groups.json") + + "users-groups.yml") public void isMemberOfGroup() { final User jdoe = userRepository.findByScreenName("jdoe"); final Group admins = groupRepository.findByGroupName("admins"); @@ -154,7 +156,7 @@ public class GroupManagerTest { @Test(expected = IllegalArgumentException.class) @InSequence(20) @UsingDataSet("datasets/org/libreccm/core/GroupManagerTest/" - + "users-groups.json") + + "users-groups.yml") @ShouldThrowException(IllegalArgumentException.class) public void isMemberOfGroupNullUser() { final Group admins = groupRepository.findByGroupName("admins"); @@ -171,7 +173,7 @@ public class GroupManagerTest { @Test(expected = IllegalArgumentException.class) @InSequence(30) @UsingDataSet("datasets/org/libreccm/core/GroupManagerTest/" - + "users-groups.json") + + "users-groups.yml") @ShouldThrowException(IllegalArgumentException.class) public void isMemberOfGroupNullGroup() { final User jdoe = userRepository.findByScreenName("jdoe"); @@ -188,9 +190,9 @@ public class GroupManagerTest { @Test @InSequence(40) @UsingDataSet("datasets/org/libreccm/core/GroupManagerTest/" - + "users-groups.json") + + "users-groups.yml") @ShouldMatchDataSet(value = "datasets/org/libreccm/core/GroupManagerTest/" - + "after-add-to-group.json", + + "after-add-to-group.yml", excludeColumns = {"membership_id"}) public void addUserToGroup() { final User jdoe = userRepository.findByScreenName("jdoe"); @@ -210,9 +212,9 @@ public class GroupManagerTest { @Test(expected = IllegalArgumentException.class) @InSequence(50) @UsingDataSet("datasets/org/libreccm/core/GroupManagerTest/" - + "users-groups.json") + + "users-groups.yml") @ShouldMatchDataSet(value = "datasets/org/libreccm/core/GroupManagerTest/" - + "users-groups.json", + + "users-groups.yml", excludeColumns = {"membership_id"}) @ShouldThrowException(IllegalArgumentException.class) public void addUserToGroupNullUser() { @@ -230,9 +232,9 @@ public class GroupManagerTest { @Test(expected = IllegalArgumentException.class) @InSequence(60) @UsingDataSet("datasets/org/libreccm/core/GroupManagerTest/" - + "users-groups.json") + + "users-groups.yml") @ShouldMatchDataSet(value = "datasets/org/libreccm/core/GroupManagerTest/" - + "users-groups.json", + + "users-groups.yml", excludeColumns = {"membership_id"}) @ShouldThrowException(IllegalArgumentException.class) public void addUserToGroupNullGroup() { @@ -250,9 +252,9 @@ public class GroupManagerTest { @Test @InSequence(70) @UsingDataSet("datasets/org/libreccm/core/GroupManagerTest/" - + "users-groups.json") + + "users-groups.yml") @ShouldMatchDataSet(value = "datasets/org/libreccm/core/GroupManagerTest/" - + "users-groups.json", + + "users-groups.yml", excludeColumns = {"membership_id"}) public void addUserToGroupAlreadyMember() { final User jdoe = userRepository.findByScreenName("jdoe"); @@ -270,9 +272,9 @@ public class GroupManagerTest { @Test @InSequence(80) @UsingDataSet("datasets/org/libreccm/core/GroupManagerTest/" - + "users-groups.json") + + "users-groups.yml") @ShouldMatchDataSet(value = "datasets/org/libreccm/core/GroupManagerTest/" - + "after-remove-from-group.json", + + "after-remove-from-group.yml", excludeColumns = {"membership_id"}) public void removeUserFromGroup() { final User jdoe = userRepository.findByScreenName("jdoe"); @@ -292,9 +294,9 @@ public class GroupManagerTest { @Test(expected = IllegalArgumentException.class) @InSequence(90) @UsingDataSet("datasets/org/libreccm/core/GroupManagerTest/" - + "users-groups.json") + + "users-groups.yml") @ShouldMatchDataSet(value = "datasets/org/libreccm/core/GroupManagerTest/" - + "users-groups.json", + + "users-groups.yml", excludeColumns = {"membership_id"}) @ShouldThrowException(IllegalArgumentException.class) public void removeUserFromGroupNullUser() { @@ -312,9 +314,9 @@ public class GroupManagerTest { @Test(expected = IllegalArgumentException.class) @InSequence(100) @UsingDataSet("datasets/org/libreccm/core/GroupManagerTest/" - + "users-groups.json") + + "users-groups.yml") @ShouldMatchDataSet(value = "datasets/org/libreccm/core/GroupManagerTest/" - + "users-groups.json", + + "users-groups.yml", excludeColumns = {"membership_id"}) @ShouldThrowException(IllegalArgumentException.class) public void removeUserFromGroupNullGroup() { @@ -332,9 +334,9 @@ public class GroupManagerTest { @Test @InSequence(110) @UsingDataSet("datasets/org/libreccm/core/GroupManagerTest/" - + "users-groups.json") + + "users-groups.yml") @ShouldMatchDataSet(value = "datasets/org/libreccm/core/GroupManagerTest/" - + "users-groups.json", + + "users-groups.yml", excludeColumns = {"membership_id"}) public void removeUserFromGroupNotMember() { final User jdoe = userRepository.findByScreenName("jdoe"); diff --git a/ccm-core/src/test/java/org/libreccm/core/GroupRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/core/GroupRepositoryTest.java index f70d6344a..ccbde9774 100644 --- a/ccm-core/src/test/java/org/libreccm/core/GroupRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/GroupRepositoryTest.java @@ -24,6 +24,7 @@ import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; 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.ShouldMatchDataSet; import org.jboss.arquillian.persistence.UsingDataSet; @@ -58,6 +59,7 @@ import javax.inject.Inject; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) +@CreateSchema({"create_ccm_core_schema.sql"}) public class GroupRepositoryTest { @Inject @@ -138,7 +140,7 @@ public class GroupRepositoryTest { @Test @InSequence - @UsingDataSet("datasets/org/libreccm/core/GroupRepositoryTest/data.json") + @UsingDataSet("datasets/org/libreccm/core/GroupRepositoryTest/data.yml") public void findGroupById() { final Group admins = groupRepository.findById(-10L); final Group users = groupRepository.findById(-20L); @@ -150,7 +152,7 @@ public class GroupRepositoryTest { @Test @InSequence(20) - @UsingDataSet("datasets/org/libreccm/core/GroupRepositoryTest/data.json") + @UsingDataSet("datasets/org/libreccm/core/GroupRepositoryTest/data.yml") public void findGroupByName() { final Group admins = groupRepository.findByGroupName("admins"); final Group users = groupRepository.findByGroupName("users"); @@ -162,9 +164,9 @@ public class GroupRepositoryTest { @Test @InSequence(30) - @UsingDataSet("datasets/org/libreccm/core/GroupRepositoryTest/data.json") + @UsingDataSet("datasets/org/libreccm/core/GroupRepositoryTest/data.yml") @ShouldMatchDataSet(value - = "datasets/org/libreccm/core/GroupRepositoryTest/after-save-new.json", + = "datasets/org/libreccm/core/GroupRepositoryTest/after-save-new.yml", excludeColumns = "subject_id") public void saveNewGroup() { final Group publishers = new Group(); @@ -175,9 +177,9 @@ public class GroupRepositoryTest { @Test @InSequence(40) - @UsingDataSet("datasets/org/libreccm/core/GroupRepositoryTest/data.json") + @UsingDataSet("datasets/org/libreccm/core/GroupRepositoryTest/data.yml") @ShouldMatchDataSet(value - = "datasets/org/libreccm/core/GroupRepositoryTest/after-save-changed.json", + = "datasets/org/libreccm/core/GroupRepositoryTest/after-save-changed.yml", excludeColumns = {"subject_id"}) public void saveChangedGroup() { final Group group = groupRepository.findByGroupName("authors"); @@ -195,9 +197,9 @@ public class GroupRepositoryTest { @Test @InSequence(60) - @UsingDataSet("datasets/org/libreccm/core/GroupRepositoryTest/data.json") + @UsingDataSet("datasets/org/libreccm/core/GroupRepositoryTest/data.yml") @ShouldMatchDataSet( - "datasets/org/libreccm/core/GroupRepositoryTest/after-delete.json") + "datasets/org/libreccm/core/GroupRepositoryTest/after-delete.yml") public void deleteGroup() { final Group group = groupRepository.findByGroupName("users"); diff --git a/ccm-core/src/test/java/org/libreccm/core/PermissionManagerTest.java b/ccm-core/src/test/java/org/libreccm/core/PermissionManagerTest.java index ce4aee3a6..894ddbdd6 100644 --- a/ccm-core/src/test/java/org/libreccm/core/PermissionManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/PermissionManagerTest.java @@ -26,6 +26,7 @@ import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; 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.ShouldMatchDataSet; import org.jboss.arquillian.persistence.UsingDataSet; @@ -60,6 +61,7 @@ import static org.junit.Assert.*; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) +@CreateSchema({"create_ccm_core_schema.sql"}) public class PermissionManagerTest { private static final String TEST_OBJECT_1 = "Test Object 1"; @@ -201,7 +203,7 @@ public class PermissionManagerTest { @Test @UsingDataSet("datasets/org/libreccm/core/PermissionManagerTest/" - + "data.json") + + "data.yml") @InSequence(10) public void isPermittedWebmasterAdmin() { final User webmaster = userRepository.findByScreenName("webmaster"); @@ -223,7 +225,7 @@ public class PermissionManagerTest { @Test @UsingDataSet("datasets/org/libreccm/core/PermissionManagerTest/" - + "data.json") + + "data.yml") @InSequence(11) public void isPermittedWebmasterRead() { final User webmaster = userRepository.findByScreenName("webmaster"); @@ -245,7 +247,7 @@ public class PermissionManagerTest { @Test @UsingDataSet("datasets/org/libreccm/core/PermissionManagerTest/" - + "data.json") + + "data.yml") @InSequence(12) public void isPermittedWebmasterWrite() { final User webmaster = userRepository.findByScreenName("webmaster"); @@ -270,7 +272,7 @@ public class PermissionManagerTest { @Test @UsingDataSet("datasets/org/libreccm/core/PermissionManagerTest/" - + "data.json") + + "data.yml") @InSequence(20) public void isPermittedJdoe() { final User jdoe = userRepository.findByScreenName("jdoe"); @@ -303,7 +305,7 @@ public class PermissionManagerTest { @Test @UsingDataSet("datasets/org/libreccm/core/PermissionManagerTest/" - + "data.json") + + "data.yml") @InSequence(30) public void isPermittedMmuster() { final User mmuster = userRepository.findByScreenName("mmuster"); @@ -336,7 +338,7 @@ public class PermissionManagerTest { @Test @UsingDataSet("datasets/org/libreccm/core/PermissionManagerTest/" - + "data.json") + + "data.yml") @InSequence(40) public void isPermittedPublicUser() { final User publicUser = userRepository.findByScreenName("public-user"); @@ -369,7 +371,7 @@ public class PermissionManagerTest { @Test @UsingDataSet("datasets/org/libreccm/core/PermissionManagerTest/" - + "data.json") + + "data.yml") @InSequence(50) public void isPermittedUsers() { final Group users = groupRepository.findByGroupName("users"); @@ -402,7 +404,7 @@ public class PermissionManagerTest { @Test @UsingDataSet("datasets/org/libreccm/core/PermissionManagerTest/" - + "data.json") + + "data.yml") @InSequence(60) public void isPermittedAuthors() { final Group authors = groupRepository.findByGroupName("authors"); @@ -435,7 +437,7 @@ public class PermissionManagerTest { @Test(expected = IllegalArgumentException.class) @UsingDataSet("datasets/org/libreccm/core/PermissionManagerTest/" - + "data.json") + + "data.yml") @ShouldThrowException(IllegalArgumentException.class) @InSequence(70) public void isPermittedNullPrivilege() { @@ -447,7 +449,7 @@ public class PermissionManagerTest { @Test @UsingDataSet("datasets/org/libreccm/core/PermissionManagerTest/" - + "data.json") + + "data.yml") @InSequence(80) public void isPermittedNullObject() { final Privilege privilege = privilegeRepository @@ -459,7 +461,7 @@ public class PermissionManagerTest { @Test @UsingDataSet("datasets/org/libreccm/core/PermissionManagerTest/" - + "data.json") + + "data.yml") @InSequence(100) public void checkPermissionValid() throws UnauthorizedAcccessException { final Privilege privilege = privilegeRepository @@ -472,7 +474,7 @@ public class PermissionManagerTest { @Test(expected = UnauthorizedAcccessException.class) @UsingDataSet("datasets/org/libreccm/core/PermissionManagerTest/" - + "data.json") + + "data.yml") @ShouldThrowException(UnauthorizedAcccessException.class) @InSequence(110) public void checkPermissionInValid() throws UnauthorizedAcccessException { @@ -486,7 +488,7 @@ public class PermissionManagerTest { @Test(expected = IllegalArgumentException.class) @UsingDataSet("datasets/org/libreccm/core/PermissionManagerTest/" - + "data.json") + + "data.yml") @ShouldThrowException(IllegalArgumentException.class) @InSequence(120) public void checkPermissionNullPrivilege() throws @@ -499,7 +501,7 @@ public class PermissionManagerTest { @Test @UsingDataSet("datasets/org/libreccm/core/PermissionManagerTest/" - + "data.json") + + "data.yml") @InSequence(130) public void checkPermissionNullObject() throws UnauthorizedAcccessException { final Privilege privilege = privilegeRepository @@ -511,7 +513,7 @@ public class PermissionManagerTest { @Test @UsingDataSet("datasets/org/libreccm/core/PermissionManagerTest/" - + "data.json") + + "data.yml") @InSequence(140) public void checkPermissionNullSubject() throws UnauthorizedAcccessException { final Privilege privilege = privilegeRepository @@ -523,9 +525,9 @@ public class PermissionManagerTest { @Test @UsingDataSet("datasets/org/libreccm/core/PermissionManagerTest/" - + "data.json") + + "data.yml") @ShouldMatchDataSet(value = "datasets/org/libreccm/core/" - + "PermissionManagerTest/after-grant.json", + + "PermissionManagerTest/after-grant.yml", excludeColumns = {"permission_id"}) @InSequence(150) public void grantPermission() { @@ -546,9 +548,9 @@ public class PermissionManagerTest { @Test @UsingDataSet("datasets/org/libreccm/core/PermissionManagerTest/" - + "data.json") + + "data.yml") @ShouldMatchDataSet(value = "datasets/org/libreccm/core/" - + "PermissionManagerTest/after-grant-wildcard.json", + + "PermissionManagerTest/after-grant-wildcard.yml", excludeColumns = {"permission_id"}) @InSequence(160) public void grantWildcardPermission() { @@ -560,7 +562,7 @@ public class PermissionManagerTest { @Test(expected = IllegalArgumentException.class) @UsingDataSet("datasets/org/libreccm/core/PermissionManagerTest/" - + "data.json") + + "data.yml") @ShouldThrowException(IllegalArgumentException.class) @InSequence(170) public void grantPermissionNullPrivilege() { @@ -572,7 +574,7 @@ public class PermissionManagerTest { @Test(expected = IllegalArgumentException.class) @UsingDataSet("datasets/org/libreccm/core/PermissionManagerTest/" - + "data.json") + + "data.yml") @ShouldThrowException(IllegalArgumentException.class) @InSequence(180) public void grantPermissionNullSubject() { @@ -584,9 +586,9 @@ public class PermissionManagerTest { @Test @UsingDataSet("datasets/org/libreccm/core/PermissionManagerTest/" - + "data.json") + + "data.yml") @ShouldMatchDataSet(value = "datasets/org/libreccm/core/" - + "PermissionManagerTest/after-revoke.json", + + "PermissionManagerTest/after-revoke.yml", excludeColumns = {"permission_id"}) @InSequence(190) public void revokePermission() { @@ -605,7 +607,7 @@ public class PermissionManagerTest { @Test(expected = IllegalArgumentException.class) @UsingDataSet("datasets/org/libreccm/core/PermissionManagerTest/" - + "data.json") + + "data.yml") @ShouldThrowException(IllegalArgumentException.class) @InSequence(200) public void revokePermissionNullPrivilege() { @@ -617,7 +619,7 @@ public class PermissionManagerTest { @Test(expected = IllegalArgumentException.class) @UsingDataSet("datasets/org/libreccm/core/PermissionManagerTest/" - + "data.json") + + "data.yml") @ShouldThrowException(IllegalArgumentException.class) @InSequence(210) public void revokePermissionNullSubject() { diff --git a/ccm-core/src/test/java/org/libreccm/core/PermissionRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/core/PermissionRepositoryTest.java index 9bdde6f73..cdf87d3c0 100644 --- a/ccm-core/src/test/java/org/libreccm/core/PermissionRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/PermissionRepositoryTest.java @@ -55,6 +55,7 @@ import javax.persistence.EntityManager; import javax.persistence.TypedQuery; import org.jboss.arquillian.container.test.api.ShouldThrowException; +import org.jboss.arquillian.persistence.CreateSchema; import org.jboss.arquillian.persistence.ShouldMatchDataSet; import java.util.Collections; @@ -67,6 +68,7 @@ import java.util.Collections; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) +@CreateSchema({"create_ccm_core_schema.sql"}) public class PermissionRepositoryTest { @Inject @@ -142,7 +144,7 @@ public class PermissionRepositoryTest { @Test @UsingDataSet("datasets/org/libreccm/core/PermissionRepositoryTest/" - + "data.json") + + "data.yml") @InSequence(10) public void findPermissionsForSubject() { final User jdoe = userRepository.findByScreenName("jdoe"); @@ -202,7 +204,7 @@ public class PermissionRepositoryTest { @Test(expected = IllegalArgumentException.class) @UsingDataSet( - "datasets/org/libreccm/core/PermissionRepositoryTest/data.json") + "datasets/org/libreccm/core/PermissionRepositoryTest/data.yml") @ShouldThrowException(IllegalArgumentException.class) @InSequence(11) public void findPermissionsForNullSubject() { @@ -211,7 +213,7 @@ public class PermissionRepositoryTest { @Test @UsingDataSet( - "datasets/org/libreccm/core/PermissionRepositoryTest/data.json") + "datasets/org/libreccm/core/PermissionRepositoryTest/data.yml") @InSequence(20) public void findPermissionsForUser() { final User jdoe = userRepository.findByScreenName("jdoe"); @@ -278,7 +280,7 @@ public class PermissionRepositoryTest { @Test(expected = IllegalArgumentException.class) @UsingDataSet( - "datasets/org/libreccm/core/PermissionRepositoryTest/data.json") + "datasets/org/libreccm/core/PermissionRepositoryTest/data.yml") @ShouldThrowException(IllegalArgumentException.class) @InSequence(21) public void findPermissionsForNullUser() { @@ -287,7 +289,7 @@ public class PermissionRepositoryTest { @Test @UsingDataSet( - "datasets/org/libreccm/core/PermissionRepositoryTest/data.json") + "datasets/org/libreccm/core/PermissionRepositoryTest/data.yml") @InSequence(30) public void findPermissionsForCcmObject() { final CcmObject object1 = ccmObjectRepository.findById(-10L); @@ -348,7 +350,7 @@ public class PermissionRepositoryTest { @Test(expected = IllegalArgumentException.class) @UsingDataSet( - "datasets/org/libreccm/core/PermissionRepositoryTest/data.json") + "datasets/org/libreccm/core/PermissionRepositoryTest/data.yml") @ShouldThrowException(IllegalArgumentException.class) @InSequence(31) public void findPermissionsForNullObject() { @@ -357,9 +359,9 @@ public class PermissionRepositoryTest { @Test @UsingDataSet( - "datasets/org/libreccm/core/PermissionRepositoryTest/data.json") + "datasets/org/libreccm/core/PermissionRepositoryTest/data.yml") @ShouldMatchDataSet(value = "datasets/org/libreccm/core/" - + "PermissionRepositoryTest/after-save-new.json", + + "PermissionRepositoryTest/after-save-new.yml", excludeColumns = {"permission_id"}) @InSequence(40) public void saveNewPermission() { @@ -405,9 +407,9 @@ public class PermissionRepositoryTest { @Test @UsingDataSet( - "datasets/org/libreccm/core/PermissionRepositoryTest/data.json") + "datasets/org/libreccm/core/PermissionRepositoryTest/data.yml") @ShouldMatchDataSet(value = "datasets/org/libreccm/core/" - + "PermissionRepositoryTest/after-save-changed.json", + + "PermissionRepositoryTest/after-save-changed.yml", excludeColumns = {"permission_id"}) @InSequence(50) public void saveChangedPermission() { @@ -424,9 +426,9 @@ public class PermissionRepositoryTest { @Test @UsingDataSet( - "datasets/org/libreccm/core/PermissionRepositoryTest/data.json") + "datasets/org/libreccm/core/PermissionRepositoryTest/data.yml") @ShouldMatchDataSet(value = "datasets/org/libreccm/core/" - + "PermissionRepositoryTest/after-delete.json", + + "PermissionRepositoryTest/after-delete.yml", excludeColumns = {"permission_id"}) @InSequence(60) public void deletePermission() { diff --git a/ccm-core/src/test/java/org/libreccm/core/PrivilegeRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/core/PrivilegeRepositoryTest.java index 7bc0facda..903d148ac 100644 --- a/ccm-core/src/test/java/org/libreccm/core/PrivilegeRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/PrivilegeRepositoryTest.java @@ -24,6 +24,7 @@ import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; 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.ShouldMatchDataSet; import org.jboss.arquillian.persistence.UsingDataSet; @@ -57,6 +58,7 @@ import static org.junit.Assert.*; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) +@CreateSchema({"create_ccm_core_schema.sql"}) public class PrivilegeRepositoryTest { @Inject @@ -120,7 +122,7 @@ public class PrivilegeRepositoryTest { @Test @UsingDataSet("datasets/org/libreccm/core/PrivilegeRepositoryTest/" - + "data.json") + + "data.yml") @InSequence(10) public void retrievePrivilege() { final Privilege admin = privilegeRepository.retrievePrivilege("admin"); @@ -138,7 +140,7 @@ public class PrivilegeRepositoryTest { @Test(expected = UnknownPrivilegeException.class) @UsingDataSet("datasets/org/libreccm/core/PrivilegeRepositoryTest/" - + "data.json") + + "data.yml") @ShouldThrowException(UnknownPrivilegeException.class) @InSequence(20) public void retrieveNotExitingPrivilege() { @@ -147,9 +149,9 @@ public class PrivilegeRepositoryTest { @Test @UsingDataSet("datasets/org/libreccm/core/PrivilegeRepositoryTest/" - + "data.json") + + "data.yml") @ShouldMatchDataSet(value = "datasets/org/libreccm/core/" - + "PrivilegeRepositoryTest/after-create.json", + + "PrivilegeRepositoryTest/after-create.yml", excludeColumns = {"privilege_id"}) @InSequence(30) public void createNewPrivilege() { @@ -158,9 +160,9 @@ public class PrivilegeRepositoryTest { @Test @UsingDataSet("datasets/org/libreccm/core/PrivilegeRepositoryTest/" - + "data.json") + + "data.yml") @ShouldMatchDataSet(value = "datasets/org/libreccm/core/" - + "PrivilegeRepositoryTest/after-delete.json", + + "PrivilegeRepositoryTest/after-delete.yml", excludeColumns = {"privilege_id"}) @InSequence(40) public void deletePrivilege() { @@ -169,7 +171,7 @@ public class PrivilegeRepositoryTest { @Test(expected = UnknownPrivilegeException.class) @UsingDataSet("datasets/org/libreccm/core/PrivilegeRepositoryTest/" - + "data.json") + + "data.yml") @ShouldThrowException(UnknownPrivilegeException.class) @InSequence(41) public void deleteNullPrivilege() { @@ -178,7 +180,7 @@ public class PrivilegeRepositoryTest { @Test @UsingDataSet("datasets/org/libreccm/core/PermissionRepositoryTest/" - + "data.json") + + "data.yml") @InSequence(50) public void checkIsPermissionInUse() { assertThat(privilegeRepository.isPrivilegeInUse("admin"), is(true)); @@ -189,7 +191,7 @@ public class PrivilegeRepositoryTest { @Test(expected = IllegalArgumentException.class) @UsingDataSet("datasets/org/libreccm/core/PermissionRepositoryTest/" - + "data.json") + + "data.yml") @ShouldThrowException(IllegalArgumentException.class) @InSequence(60) public void deleteInUsePrivilege() { diff --git a/ccm-core/src/test/java/org/libreccm/core/RoleRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/core/RoleRepositoryTest.java index c8449d327..36d59d1a2 100644 --- a/ccm-core/src/test/java/org/libreccm/core/RoleRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/RoleRepositoryTest.java @@ -24,6 +24,7 @@ import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; 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.ShouldMatchDataSet; import org.jboss.arquillian.persistence.UsingDataSet; @@ -59,6 +60,7 @@ import javax.inject.Inject; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) +@CreateSchema({"create_ccm_core_schema.sql"}) public class RoleRepositoryTest { @Inject @@ -201,7 +203,7 @@ public class RoleRepositoryTest { @Test @InSequence(10) - @UsingDataSet("datasets/org/libreccm/core/RoleRepositoryTest/data.json") + @UsingDataSet("datasets/org/libreccm/core/RoleRepositoryTest/data.yml") public void findRoleById() { final Role author = roleRepository.findById(-10L); final Role editor = roleRepository.findById(-20L); @@ -222,7 +224,7 @@ public class RoleRepositoryTest { @Test @InSequence(20) - @UsingDataSet("datasets/org/libreccm/core/RoleRepositoryTest/data.json") + @UsingDataSet("datasets/org/libreccm/core/RoleRepositoryTest/data.yml") public void findRoleByName() { final List authors = roleRepository.findRolesForName("Author"); final List editors = roleRepository.findRolesForName("Editor"); @@ -263,7 +265,7 @@ public class RoleRepositoryTest { @Test @InSequence(30) - @UsingDataSet("datasets/org/libreccm/core/RoleRepositoryTest/data.json") + @UsingDataSet("datasets/org/libreccm/core/RoleRepositoryTest/data.yml") public void findRolesForSourceGroup() { final Group group = groupRepository.findByGroupName( "info Administration"); @@ -283,7 +285,7 @@ public class RoleRepositoryTest { @Test @InSequence(40) - @UsingDataSet("datasets/org/libreccm/core/RoleRepositoryTest/data.json") + @UsingDataSet("datasets/org/libreccm/core/RoleRepositoryTest/data.yml") public void findRolesForImplicitGroup() { final Group authorsGroup = groupRepository.findByGroupName( "info Administration Author"); @@ -312,9 +314,9 @@ public class RoleRepositoryTest { @Test @InSequence(50) - @UsingDataSet("datasets/org/libreccm/core/RoleRepositoryTest/data.json") + @UsingDataSet("datasets/org/libreccm/core/RoleRepositoryTest/data.yml") @ShouldMatchDataSet(value = "datasets/org/libreccm/core/RoleRepositoryTest/" - + "after-save-new.json", + + "after-save-new.yml", excludeColumns = {"role_id"}) public void saveNewRole() { final Group infoAdmin = groupRepository.findByGroupName( @@ -333,9 +335,9 @@ public class RoleRepositoryTest { @Test @InSequence(60) - @UsingDataSet("datasets/org/libreccm/core/RoleRepositoryTest/data.json") + @UsingDataSet("datasets/org/libreccm/core/RoleRepositoryTest/data.yml") @ShouldMatchDataSet(value = "datasets/org/libreccm/core/RoleRepositoryTest/" - + "after-save-changed.json", + + "after-save-changed.yml", excludeColumns = {"role_id"}) public void saveChangedRole() { final Role role = roleRepository.findById(-60L); @@ -347,16 +349,16 @@ public class RoleRepositoryTest { @Test(expected = IllegalArgumentException.class) @ShouldThrowException(IllegalArgumentException.class) @InSequence(70) - @UsingDataSet("datasets/org/libreccm/core/RoleRepositoryTest/data.json") + @UsingDataSet("datasets/org/libreccm/core/RoleRepositoryTest/data.yml") public void saveNullValue() { roleRepository.save(null); } @Test @InSequence(80) - @UsingDataSet("datasets/org/libreccm/core/RoleRepositoryTest/data.json") + @UsingDataSet("datasets/org/libreccm/core/RoleRepositoryTest/data.yml") @ShouldMatchDataSet("datasets/org/libreccm/core/RoleRepositoryTest/" - + "after-delete.json") + + "after-delete.yml") public void deleteRole() { final Role role = roleRepository.findById(-50L); diff --git a/ccm-core/src/test/java/org/libreccm/core/UserManagerTest.java b/ccm-core/src/test/java/org/libreccm/core/UserManagerTest.java index ecee2375d..fa1a83ea2 100644 --- a/ccm-core/src/test/java/org/libreccm/core/UserManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/UserManagerTest.java @@ -43,6 +43,7 @@ import org.junit.runner.RunWith; import org.apache.commons.codec.binary.Base64; import org.jboss.arquillian.container.test.api.ShouldThrowException; +import org.jboss.arquillian.persistence.CreateSchema; import org.libreccm.tests.categories.IntegrationTest; import java.io.File; @@ -65,6 +66,7 @@ import static org.junit.Assert.*; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) +@CreateSchema({"create_ccm_core_schema.sql"}) public class UserManagerTest { @Inject @@ -152,7 +154,7 @@ public class UserManagerTest { } @Test - @UsingDataSet("datasets/org/libreccm/core/UserRepositoryTest/data.json") + @UsingDataSet("datasets/org/libreccm/core/UserRepositoryTest/data.yml") @InSequence(100) public void updatePassword() throws NoSuchAlgorithmException, UnsupportedEncodingException { @@ -198,7 +200,7 @@ public class UserManagerTest { @Test @UsingDataSet( - "datasets/org/libreccm/core/UserManagerTest/verify-password.json") + "datasets/org/libreccm/core/UserManagerTest/verify-password.yml") @InSequence(200) public void verifyPasswordForUser() { final User user = userRepository.findById(-10L); @@ -211,7 +213,7 @@ public class UserManagerTest { @Test @UsingDataSet( - "datasets/org/libreccm/core/UserManagerTest/verify-password.json") + "datasets/org/libreccm/core/UserManagerTest/verify-password.yml") @InSequence(300) public void verifyPasswordForScreenname() throws UserNotFoundException { final boolean result = userManager.verifyPasswordForScreenname( @@ -222,7 +224,7 @@ public class UserManagerTest { @Test @UsingDataSet( - "datasets/org/libreccm/core/UserManagerTest/verify-password.json") + "datasets/org/libreccm/core/UserManagerTest/verify-password.yml") @InSequence(400) public void verifyPasswordForEmail() throws UserNotFoundException { final boolean result = userManager.verifyPasswordForEmail( @@ -233,7 +235,7 @@ public class UserManagerTest { @Test @UsingDataSet( - "datasets/org/libreccm/core/UserManagerTest/verify-password.json") + "datasets/org/libreccm/core/UserManagerTest/verify-password.yml") @InSequence(500) public void verifyPasswordForUserWrongPassword() { final User user = userRepository.findById(-10L); @@ -245,7 +247,7 @@ public class UserManagerTest { @Test @UsingDataSet( - "datasets/org/libreccm/core/UserManagerTest/verify-password.json") + "datasets/org/libreccm/core/UserManagerTest/verify-password.yml") @InSequence(600) public void verifyPasswordForScreennameWrongPassword() throws UserNotFoundException { @@ -257,7 +259,7 @@ public class UserManagerTest { @Test @UsingDataSet( - "datasets/org/libreccm/core/UserManagerTest/verify-password.json") + "datasets/org/libreccm/core/UserManagerTest/verify-password.yml") @InSequence(400) public void verifyPasswordForEmailWrongPassword() throws UserNotFoundException { @@ -270,7 +272,7 @@ public class UserManagerTest { @Test(expected = UserNotFoundException.class) @ShouldThrowException(UserNotFoundException.class) @UsingDataSet( - "datasets/org/libreccm/core/UserManagerTest/verify-password.json") + "datasets/org/libreccm/core/UserManagerTest/verify-password.yml") @InSequence(700) public void verifyPasswordForScreennameNoUser() throws UserNotFoundException { userManager.verifyPasswordForScreenname("nobody", "foobar"); @@ -279,7 +281,7 @@ public class UserManagerTest { @Test(expected = UserNotFoundException.class) @ShouldThrowException(UserNotFoundException.class) @UsingDataSet( - "datasets/org/libreccm/core/UserManagerTest/verify-password.json") + "datasets/org/libreccm/core/UserManagerTest/verify-password.yml") @InSequence(800) public void verifyPasswordForEmailNoUser() throws UserNotFoundException { userManager.verifyPasswordForEmail("nobody@example.com", "foobar"); diff --git a/ccm-core/src/test/java/org/libreccm/core/UserRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/core/UserRepositoryTest.java index 71178b48d..1c8e7aad6 100644 --- a/ccm-core/src/test/java/org/libreccm/core/UserRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/UserRepositoryTest.java @@ -32,6 +32,7 @@ import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.ShouldThrowException; 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.ShouldMatchDataSet; import org.jboss.arquillian.persistence.UsingDataSet; @@ -64,6 +65,7 @@ import java.util.List; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) +@CreateSchema({"create_ccm_core_schema.sql"}) public class UserRepositoryTest { private static final String NOBODY = "nobody"; @@ -185,7 +187,7 @@ public class UserRepositoryTest { @Test @UsingDataSet( - "datasets/org/libreccm/core/UserRepositoryTest/data.json") + "datasets/org/libreccm/core/UserRepositoryTest/data.yml") @InSequence(100) public void findUserById() { final User jdoe = userRepository.findById(-10L); @@ -197,7 +199,7 @@ public class UserRepositoryTest { } @Test - @UsingDataSet("datasets/org/libreccm/core/UserRepositoryTest/data.json") + @UsingDataSet("datasets/org/libreccm/core/UserRepositoryTest/data.yml") @InSequence(200) public void findUserByScreenName() { final User jdoe = userRepository.findByScreenName(JDOE); @@ -209,7 +211,7 @@ public class UserRepositoryTest { } @Test - @UsingDataSet("datasets/org/libreccm/core/UserRepositoryTest/data.json") + @UsingDataSet("datasets/org/libreccm/core/UserRepositoryTest/data.yml") @InSequence(300) public void findUserByEmail() { final User jdoe = userRepository.findByEmailAddress( @@ -231,14 +233,14 @@ public class UserRepositoryTest { @Test(expected = MultipleMatchingUserException.class) @ShouldThrowException(MultipleMatchingUserException.class) @UsingDataSet( - "datasets/org/libreccm/core/UserRepositoryTest/data-email-duplicate.json") + "datasets/org/libreccm/core/UserRepositoryTest/data-email-duplicate.yml") @InSequence(350) public void findByEmailAddressDuplicate() { userRepository.findByEmailAddress("max.mustermann@example.org"); } @Test - @UsingDataSet("datasets/org/libreccm/core/UserRepositoryTest/data.json") + @UsingDataSet("datasets/org/libreccm/core/UserRepositoryTest/data.yml") @InSequence(400) public void findAllUsers() { final List users = userRepository.findAll(); @@ -247,9 +249,9 @@ public class UserRepositoryTest { } @Test - @UsingDataSet("datasets/org/libreccm/core/UserRepositoryTest/data.json") + @UsingDataSet("datasets/org/libreccm/core/UserRepositoryTest/data.yml") @ShouldMatchDataSet(value - = "datasets/org/libreccm/core/UserRepositoryTest/after-save-new.json", + = "datasets/org/libreccm/core/UserRepositoryTest/after-save-new.yml", excludeColumns = {"subject_id", "user_id"}) @InSequence(500) public void saveNewUser() { @@ -279,9 +281,9 @@ public class UserRepositoryTest { } @Test - @UsingDataSet("datasets/org/libreccm/core/UserRepositoryTest/data.json") + @UsingDataSet("datasets/org/libreccm/core/UserRepositoryTest/data.yml") @ShouldMatchDataSet(value - = "datasets/org/libreccm/core/UserRepositoryTest/after-save-changed.json", + = "datasets/org/libreccm/core/UserRepositoryTest/after-save-changed.yml", excludeColumns = {"subject_id"}) @InSequence(600) public void saveChangedUser() { @@ -314,9 +316,9 @@ public class UserRepositoryTest { } @Test - @UsingDataSet("datasets/org/libreccm/core/UserRepositoryTest/data.json") + @UsingDataSet("datasets/org/libreccm/core/UserRepositoryTest/data.yml") @ShouldMatchDataSet(value - = "datasets/org/libreccm/core/UserRepositoryTest/after-delete.json", + = "datasets/org/libreccm/core/UserRepositoryTest/after-delete.yml", excludeColumns = {"subject_id"}) @InSequence(800) public void deleteUser() { diff --git a/ccm-core/src/test/java/org/libreccm/core/authentication/LoginManagerTest.java b/ccm-core/src/test/java/org/libreccm/core/authentication/LoginManagerTest.java index c713784e0..dde1fe0a9 100644 --- a/ccm-core/src/test/java/org/libreccm/core/authentication/LoginManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/authentication/LoginManagerTest.java @@ -23,6 +23,7 @@ import static org.hamcrest.Matchers.*; 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; @@ -63,6 +64,7 @@ import javax.security.auth.login.LoginException; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) +@CreateSchema({"create_ccm_core_schema.sql"}) public class LoginManagerTest { @Inject @@ -172,7 +174,7 @@ public class LoginManagerTest { @Test @UsingDataSet( - "datasets/org/libreccm/core/authentication/LoginManagerTest/data.json") + "datasets/org/libreccm/core/authentication/LoginManagerTest/data.yml") @InSequence(10) public void loginValidCredentials() throws LoginException { loginManager.login("jdoe@example.com", "foobar"); @@ -192,7 +194,7 @@ public class LoginManagerTest { @Test @UsingDataSet( - "datasets/org/libreccm/core/authentication/LoginManagerTest/data.json") + "datasets/org/libreccm/core/authentication/LoginManagerTest/data.yml") @InSequence(20) public void loginWrongCredentials() throws LoginException { try { @@ -207,7 +209,7 @@ public class LoginManagerTest { @Test @UsingDataSet( - "datasets/org/libreccm/core/authentication/LoginManagerTest/data.json") + "datasets/org/libreccm/core/authentication/LoginManagerTest/data.yml") @InSequence(30) public void loginEmptyPassword() { try { @@ -222,7 +224,7 @@ public class LoginManagerTest { @Test @UsingDataSet( - "datasets/org/libreccm/core/authentication/LoginManagerTest/data.json") + "datasets/org/libreccm/core/authentication/LoginManagerTest/data.yml") @InSequence(40) public void loginEmptyUserName() { try { @@ -237,7 +239,7 @@ public class LoginManagerTest { @Test @UsingDataSet( - "datasets/org/libreccm/core/authentication/LoginManagerTest/data.json") + "datasets/org/libreccm/core/authentication/LoginManagerTest/data.yml") @InSequence(50) public void loginNullPassword() { try { @@ -252,7 +254,7 @@ public class LoginManagerTest { @Test @UsingDataSet( - "datasets/org/libreccm/core/authentication/LoginManagerTest/data.json") + "datasets/org/libreccm/core/authentication/LoginManagerTest/data.yml") @InSequence(60) public void loginNullUsername() { try { diff --git a/ccm-core/src/test/resources-wildfly8-remote-pgsql/arquillian.xml b/ccm-core/src/test/resources-wildfly8-remote-pgsql/arquillian.xml index af6b32bab..ef587df71 100644 --- a/ccm-core/src/test/resources-wildfly8-remote-pgsql/arquillian.xml +++ b/ccm-core/src/test/resources-wildfly8-remote-pgsql/arquillian.xml @@ -31,9 +31,9 @@ true - + diff --git a/ccm-core/src/test/resources-wildfly8-remote-pgsql/scripts/create_ccm_core_schema.sql b/ccm-core/src/test/resources-wildfly8-remote-pgsql/scripts/create_ccm_core_schema.sql index 24b858520..55f5e5365 100644 --- a/ccm-core/src/test/resources-wildfly8-remote-pgsql/scripts/create_ccm_core_schema.sql +++ b/ccm-core/src/test/resources-wildfly8-remote-pgsql/scripts/create_ccm_core_schema.sql @@ -1,22 +1,26 @@ -create schema ccm_core; +DROP SCHEMA IF EXISTS ccm_core CASCADE; + +DROP SEQUENCE IF EXISTS hibernate_sequence; + +CREATE SCHEMA ccm_core; create table ccm_core.application_types ( - resource_type_id bigint not null, - container_group_id bigint, - provider_app_type_id bigint, + resource_type_id int8 not null, + container_group_id int8, + provider_app_type_id int8, primary key (resource_type_id) ); create table ccm_core.applications ( primary_url varchar(1024) not null, - object_id bigint not null, - container_group_id bigint, + object_id int8 not null, + container_group_id int8, primary key (object_id) ); create table ccm_core.attachments ( - message_id bigint not null, - attachment_data blob, + message_id int8 not null, + attachment_data oid, description varchar(255), mime_type varchar(255), title varchar(255), @@ -25,29 +29,29 @@ create schema ccm_core; create table ccm_core.categories ( abstract_category boolean, - category_order bigint, + category_order int8, enabled boolean, name varchar(255) not null, unique_id varchar(255) not null, visible boolean, - object_id bigint not null, - parent_category_id bigint, + object_id int8 not null, + parent_category_id int8, primary key (object_id) ); create table ccm_core.categorizations ( - categorization_id bigint not null, - category_order bigint, + categorization_id int8 not null, + category_order int8, category_index boolean, - object_order bigint, - object_id bigint, - category_id bigint, + object_order int8, + object_id int8, + category_id int8, primary key (categorization_id) ); create table ccm_core.category_descriptions ( - object_id bigint not null, - localized_value clob, + object_id int8 not null, + localized_value text, locale varchar(255) not null, primary key (object_id, locale) ); @@ -57,50 +61,50 @@ create schema ccm_core; released timestamp, uri varchar(2048) not null, version varchar(255) not null, - object_id bigint not null, - root_category_id bigint, + object_id int8 not null, + root_category_id int8, primary key (object_id) ); create table ccm_core.category_titles ( - object_id bigint not null, - localized_value clob, + object_id int8 not null, + localized_value text, locale varchar(255) not null, primary key (object_id, locale) ); create table ccm_core.ccm_groups ( name varchar(512) not null, - subject_id bigint not null, + subject_id int8 not null, primary key (subject_id) ); create table ccm_core.ccm_objects ( - object_id bigint not null, + object_id int8 not null, display_name varchar(255), primary key (object_id) ); create table ccm_core.ccm_privileges ( - privilege_id bigint not null, + privilege_id int8 not null, label varchar(255) not null, - relevant_privilege_id bigint, + relevant_privilege_id int8, primary key (privilege_id) ); create table ccm_core.ccm_revisions ( - id integer not null, - timestamp bigint not null, + id int4 not null, + timestamp int8 not null, user_name varchar(255), primary key (id) ); create table ccm_core.ccm_roles ( - role_id bigint not null, + role_id int8 not null, description varchar(255), name varchar(512), - implicit_group_id bigint, - source_group_id bigint, + implicit_group_id int8, + source_group_id int8, primary key (role_id) ); @@ -119,95 +123,116 @@ create schema ccm_core; salt varchar(2048), screen_name varchar(255) not null, sso_login varchar(512), - subject_id bigint not null, + subject_id int8 not null, primary key (subject_id) ); create table ccm_core.digests ( - frequency integer, + frequency int4, header varchar(4096) not null, next_run timestamp, separator varchar(128) not null, signature varchar(4096) not null, subject varchar(255) not null, - object_id bigint not null, - from_party_id bigint, + object_id int8 not null, + from_party_id int8, primary key (object_id) ); create table ccm_core.domain_descriptions ( - object_id bigint not null, - localized_value clob, + object_id int8 not null, + localized_value text, locale varchar(255) not null, primary key (object_id, locale) ); create table ccm_core.domain_ownerships ( - ownership_id bigint not null, + ownership_id int8 not null, context varchar(255), - domain_order bigint, - owner_order bigint, - domain_object_id bigint not null, - owner_object_id bigint not null, + domain_order int8, + owner_order int8, + domain_object_id int8 not null, + owner_object_id int8 not null, primary key (ownership_id) ); create table ccm_core.domain_titles ( - object_id bigint not null, - localized_value clob, + object_id int8 not null, + localized_value text, locale varchar(255) not null, primary key (object_id, locale) ); + create table ccm_core.formbuilder_component_descriptions ( + component_id int8 not null, + localized_value text, + locale varchar(255) not null, + primary key (component_id, locale) + ); + create table ccm_core.formbuilder_components ( active boolean, admin_name varchar(255), attribute_string varchar(255), - component_order bigint, + component_order int8, selected boolean, - object_id bigint not null, - parentComponent_object_id bigint, + object_id int8 not null, + parentComponent_object_id int8, primary key (object_id) ); create table ccm_core.formbuilder_confirm_email_listener ( - body clob, + body text, from_email varchar(255), subject varchar(255), - object_id bigint not null, + object_id int8 not null, primary key (object_id) ); create table ccm_core.formbuilder_confirm_redirect_listeners ( url varchar(255), - object_id bigint not null, + object_id int8 not null, primary key (object_id) ); create table ccm_core.formbuilder_data_driven_selects ( multiple boolean, query varchar(255), - object_id bigint not null, + object_id int8 not null, primary key (object_id) ); create table ccm_core.formbuilder_data_queries ( query_id varchar(255), - object_id bigint not null, + object_id int8 not null, primary key (object_id) ); + create table ccm_core.formbuilder_data_query_descriptions ( + data_query_id int8 not null, + localized_value text, + locale varchar(255) not null, + primary key (data_query_id, locale) + ); + + create table ccm_core.formbuilder_data_query_names ( + data_query_id int8 not null, + localized_value text, + locale varchar(255) not null, + primary key (data_query_id, locale) + ); + create table ccm_core.formbuilder_formsections ( formsection_action varchar(255), - object_id bigint not null, + object_id int8 not null, primary key (object_id) ); create table ccm_core.formbuilder_listeners ( attribute_string varchar(255), class_name varchar(255), - object_id bigint not null, - widget_object_id bigint, + object_id int8 not null, + widget_object_id int8, primary key (object_id) ); @@ -216,55 +241,76 @@ create schema ccm_core; pretty_name varchar(255), pretty_plural varchar(255), properties_form varchar(255), - object_id bigint not null, + object_id int8 not null, primary key (object_id) ); create table ccm_core.formbuilder_object_types ( app_name varchar(255), class_name varchar(255), - object_id bigint not null, + object_id int8 not null, primary key (object_id) ); + create table ccm_core.formbuilder_option_labels ( + option_id int8 not null, + localized_value text, + locale varchar(255) not null, + primary key (option_id, locale) + ); + create table ccm_core.formbuilder_options ( parameter_value varchar(255), - object_id bigint not null, + object_id int8 not null, primary key (object_id) ); + create table ccm_core.formbuilder_process_listener_descriptions ( + process_listener_id int8 not null, + localized_value text, + locale varchar(255) not null, + primary key (process_listener_id, locale) + ); + + create table ccm_core.formbuilder_process_listener_names ( + process_listener_id int8 not null, + localized_value text, + locale varchar(255) not null, + primary key (process_listener_id, locale) + ); + create table ccm_core.formbuilder_process_listeners ( listener_class varchar(255), - process_listener_order bigint, - object_id bigint not null, - formSection_object_id bigint, + process_listener_order int8, + object_id int8 not null, + formSection_object_id int8, primary key (object_id) ); create table ccm_core.formbuilder_remote_server_post_listener ( remoteUrl varchar(255), - object_id bigint not null, + object_id int8 not null, primary key (object_id) ); create table ccm_core.formbuilder_simple_email_listeners ( recipient varchar(255), subject varchar(255), - object_id bigint not null, + object_id int8 not null, primary key (object_id) ); create table ccm_core.formbuilder_template_email_listeners ( - body clob, + body text, recipient varchar(255), subject varchar(255), - object_id bigint not null, + object_id int8 not null, primary key (object_id) ); create table ccm_core.formbuilder_widget_labels ( - object_id bigint not null, - widget_object_id bigint, + object_id int8 not null, + widget_object_id int8, primary key (object_id) ); @@ -272,46 +318,52 @@ create schema ccm_core; default_value varchar(255), parameter_model varchar(255), parameter_name varchar(255), - object_id bigint not null, - label_object_id bigint, + object_id int8 not null, + label_object_id int8, primary key (object_id) ); create table ccm_core.formbuilder_xml_email_listeners ( recipient varchar(255), subject varchar(255), - object_id bigint not null, + object_id int8 not null, primary key (object_id) ); create table ccm_core.group_memberships ( - membership_id bigint not null, - group_subject_id bigint, - user_subject_id bigint, + membership_id int8 not null, + group_subject_id int8, + user_subject_id int8, primary key (membership_id) ); create table ccm_core.hosts ( - host_id bigint not null, + host_id int8 not null, server_name varchar(512), - server_port bigint, + server_port int8, primary key (host_id) ); create table ccm_core.inits ( - initializer_id bigint not null, + initializer_id int8 not null, class_name varchar(255), - required_by_id bigint, + required_by_id int8, primary key (initializer_id) ); + create table ccm_core.installed_modules ( + module_class_name varchar(2048) not null, + status varchar(255), + primary key (module_class_name) + ); + create table ccm_core.lucene_documents ( - document_id bigint not null, - content clob, + document_id int8 not null, + content text, content_section varchar(512), country varchar(8), created timestamp, - dirty bigint, + dirty int8, document_language varchar(8), last_modified timestamp, summary varchar(4096), @@ -319,15 +371,15 @@ create schema ccm_core; title varchar(4096), type varchar(255), type_specific_info varchar(512), - created_by_party_id bigint, - last_modified_by bigint, + created_by_party_id int8, + last_modified_by int8, primary key (document_id) ); create table ccm_core.lucene_indexes ( - index_id bigint not null, - lucene_index_id bigint, - host_id bigint, + index_id int8 not null, + lucene_index_id int8, + host_id int8, primary key (index_id) ); @@ -336,9 +388,9 @@ create schema ccm_core; body_mime_type varchar(255), sent timestamp, subject varchar(255), - object_id bigint not null, - in_reply_to_id bigint, - sender_id bigint, + object_id int8 not null, + in_reply_to_id int8, + sender_id int8, primary key (object_id) ); @@ -348,77 +400,77 @@ create schema ccm_core; expunge_message boolean, fulfill_date timestamp, header varchar(4096), - max_retries bigint, + max_retries int8, request_date timestamp, signature varchar(4096), status varchar(32), - object_id bigint not null, - digest_id bigint, - message_id bigint, - receiver_id bigint, + object_id int8 not null, + digest_id int8, + message_id int8, + receiver_id int8, primary key (object_id) ); create table ccm_core.permissions ( - permission_id bigint not null, + permission_id int8 not null, creation_date timestamp, creation_ip varchar(255), - creation_user_id bigint, - granted_privilege_id bigint, - grantee_id bigint, - object_id bigint, + creation_user_id int8, + granted_privilege_id int8, + grantee_id int8, + object_id int8, primary key (permission_id) ); create table ccm_core.portals ( template boolean, - object_id bigint not null, + object_id int8 not null, primary key (object_id) ); create table ccm_core.portlets ( - cell_number bigint, - sort_key bigint, - object_id bigint not null, - portal_id bigint, + cell_number int8, + sort_key int8, + object_id int8 not null, + portal_id int8, primary key (object_id) ); create table ccm_core.queue_items ( - queue_item_id bigint not null, + queue_item_id int8 not null, header varchar(4096), receiver_address varchar(512), - retry_count bigint, + retry_count int8, signature varchar(4096), successful_sended boolean, - message_id bigint, - receiver_id bigint, + message_id int8, + receiver_id int8, primary key (queue_item_id) ); create table ccm_core.resource_descriptions ( - object_id bigint not null, - localized_value clob, + object_id int8 not null, + localized_value text, locale varchar(255) not null, primary key (object_id, locale) ); create table ccm_core.resource_titles ( - object_id bigint not null, - localized_value clob, + object_id int8 not null, + localized_value text, locale varchar(255) not null, primary key (object_id, locale) ); create table ccm_core.resource_type_descriptions ( - resource_type_id bigint not null, - localized_value clob, + resource_type_id int8 not null, + localized_value text, locale varchar(255) not null, primary key (resource_type_id, locale) ); create table ccm_core.resource_types ( - resource_type_id bigint not null, + resource_type_id int8 not null, singleton boolean, title varchar(254) not null, embedded_view boolean, @@ -429,147 +481,105 @@ create schema ccm_core; create table ccm_core.resources ( created timestamp, - object_id bigint not null, - parent_object_id bigint, - resourceType_resource_type_id bigint, + object_id int8 not null, + parent_object_id int8, + resourceType_resource_type_id int8, primary key (object_id) ); create table ccm_core.subjects ( - subject_id bigint not null, + subject_id int8 not null, primary key (subject_id) ); create table ccm_core.threads ( - object_id bigint not null, - root_id bigint, + object_id int8 not null, + root_id int8, primary key (object_id) ); create table ccm_core.user_email_addresses ( - user_id bigint not null, + user_id int8 not null, email_address varchar(512) not null, bouncing boolean, verified boolean ); + create table ccm_core.workflow_descriptions ( + workflow_id int8 not null, + localized_value text, + locale varchar(255) not null, + primary key (workflow_id, locale) + ); + + create table ccm_core.workflow_names ( + workflow_id int8 not null, + localized_value text, + locale varchar(255) not null, + primary key (workflow_id, locale) + ); + + create table ccm_core.workflow_task_comments ( + task_id int8 not null, + comment text + ); + + create table ccm_core.workflow_task_dependencies ( + depends_on_task_id int8 not null, + dependent_task_id int8 not null + ); + + create table ccm_core.workflow_task_labels ( + task_id int8 not null, + localized_value text, + locale varchar(255) not null, + primary key (task_id, locale) + ); + create table ccm_core.workflow_tasks ( - task_id bigint not null, + task_id int8 not null, active boolean, task_state varchar(512), - workflow_id bigint, + workflow_id int8, primary key (task_id) ); + create table ccm_core.workflow_tasks_descriptions ( + task_id int8 not null, + localized_value text, + locale varchar(255) not null, + primary key (task_id, locale) + ); + + create table ccm_core.workflow_user_task_assigned_groups ( + user_task_id int8 not null, + assigned_group_id int8 not null + ); + + create table ccm_core.workflow_user_task_assigned_users ( + user_task_id int8 not null, + assigned_user_id int8 not null + ); + create table ccm_core.workflow_user_tasks ( - task_id bigint not null, + task_id int8 not null, active boolean, task_state varchar(512), - workflow_id bigint, + workflow_id int8, due_date timestamp, - duration_minutes bigint, + duration_minutes int8, locked boolean, start_date timestamp, - locking_user_id bigint, - notification_sender bigint, + locking_user_id int8, + notification_sender int8, primary key (task_id) ); create table ccm_core.workflows ( - workflow_id bigint not null, + workflow_id int8 not null, primary key (workflow_id) ); - create table formbuilder_component_descriptions ( - component_id bigint not null, - localized_value clob, - locale varchar(255) not null, - primary key (component_id, locale) - ); - - create table formbuilder_data_query_descriptions ( - data_query_id bigint not null, - localized_value clob, - locale varchar(255) not null, - primary key (data_query_id, locale) - ); - - create table formbuilder_data_query_names ( - data_query_id bigint not null, - localized_value clob, - locale varchar(255) not null, - primary key (data_query_id, locale) - ); - - create table formbuilder_option_labels ( - option_id bigint not null, - localized_value clob, - locale varchar(255) not null, - primary key (option_id, locale) - ); - - create table formbuilder_process_listener_descriptions ( - process_listener_id bigint not null, - localized_value clob, - locale varchar(255) not null, - primary key (process_listener_id, locale) - ); - - create table formbuilder_process_listener_names ( - process_listener_id bigint not null, - localized_value clob, - locale varchar(255) not null, - primary key (process_listener_id, locale) - ); - - create table workflow_descriptions ( - workflow_id bigint not null, - localized_value clob, - locale varchar(255) not null, - primary key (workflow_id, locale) - ); - - create table workflow_names ( - workflow_id bigint not null, - localized_value clob, - locale varchar(255) not null, - primary key (workflow_id, locale) - ); - - create table workflow_task_comments ( - task_id bigint not null, - comment clob - ); - - create table workflow_task_dependencies ( - depends_on_task_id bigint not null, - dependent_task_id bigint not null - ); - - create table workflow_task_labels ( - task_id bigint not null, - localized_value clob, - locale varchar(255) not null, - primary key (task_id, locale) - ); - - create table workflow_tasks_descriptions ( - task_id bigint not null, - localized_value clob, - locale varchar(255) not null, - primary key (task_id, locale) - ); - - create table workflow_user_task_assigned_groups ( - user_task_id bigint not null, - assigned_group_id bigint not null - ); - - create table workflow_user_task_assigned_users ( - user_task_id bigint not null, - assigned_user_id bigint not null - ); - alter table ccm_core.category_domains add constraint UK_mrgij5fr1sglxyab9ryl1vx37 unique (domain_key); @@ -588,10 +598,10 @@ create schema ccm_core; alter table ccm_core.hosts add constraint UK_2m0m4m0dhx256d04x2cg3194s unique (server_name, server_port); - alter table workflow_user_task_assigned_groups + alter table ccm_core.workflow_user_task_assigned_groups add constraint UK_g58x45aybw2yjtwnr9b9itg6c unique (assigned_group_id); - alter table workflow_user_task_assigned_users + alter table ccm_core.workflow_user_task_assigned_users add constraint UK_h62r6cqjp2tdnhscfkgwfupwj unique (assigned_user_id); alter table ccm_core.application_types @@ -719,6 +729,11 @@ create schema ccm_core; foreign key (object_id) references ccm_core.category_domains; + alter table ccm_core.formbuilder_component_descriptions + add constraint FK_miw32na0kj3r3vx0yd9nmacu3 + foreign key (component_id) + references ccm_core.formbuilder_components; + alter table ccm_core.formbuilder_components add constraint FK_ompdvc6pul5xbhn5r2aqv7knb foreign key (parentComponent_object_id) @@ -749,6 +764,16 @@ create schema ccm_core; foreign key (object_id) references ccm_core.ccm_objects; + alter table ccm_core.formbuilder_data_query_descriptions + add constraint FK_6vi3n0g1gfjrxd3vvlarrn584 + foreign key (data_query_id) + references ccm_core.formbuilder_data_queries; + + alter table ccm_core.formbuilder_data_query_names + add constraint FK_tgnk7hsrmtqxnhvfcefe936v9 + foreign key (data_query_id) + references ccm_core.formbuilder_data_queries; + alter table ccm_core.formbuilder_formsections add constraint FK_endc2bmlb7orkk4l5x3fkmy2l foreign key (object_id) @@ -774,11 +799,26 @@ create schema ccm_core; foreign key (object_id) references ccm_core.ccm_objects; + alter table ccm_core.formbuilder_option_labels + add constraint FK_e8fy2g61cd7qn8ar1t48g7p1m + foreign key (option_id) + references ccm_core.formbuilder_options; + alter table ccm_core.formbuilder_options add constraint FK_f7fgwaysg76tnx2xtfjnpt8a3 foreign key (object_id) references ccm_core.formbuilder_components; + alter table ccm_core.formbuilder_process_listener_descriptions + add constraint FK_p1e4ygtc3ke9r4gotkc5k8dmv + foreign key (process_listener_id) + references ccm_core.formbuilder_process_listeners; + + alter table ccm_core.formbuilder_process_listener_names + add constraint FK_e3uy4vdqbely8oybcfc0ef7tn + foreign key (process_listener_id) + references ccm_core.formbuilder_process_listeners; + alter table ccm_core.formbuilder_process_listeners add constraint FK_8b4m881ppfw6m13clxu4cp1o0 foreign key (formSection_object_id) @@ -984,11 +1024,41 @@ create schema ccm_core; foreign key (user_id) references ccm_core.ccm_users; + alter table ccm_core.workflow_descriptions + add constraint FK_7grengdpx5d99jkyjlsa3pe6k + foreign key (workflow_id) + references ccm_core.workflows; + + alter table ccm_core.workflow_names + add constraint FK_sjqjarc88yvdrw3yd6swg7uqs + foreign key (workflow_id) + references ccm_core.workflows; + alter table ccm_core.workflow_tasks add constraint FK_mvuhbl6ikm44oxxtkv0s2y9iu foreign key (workflow_id) references ccm_core.workflows; + alter table ccm_core.workflow_user_task_assigned_groups + add constraint FK_g58x45aybw2yjtwnr9b9itg6c + foreign key (assigned_group_id) + references ccm_core.ccm_groups; + + alter table ccm_core.workflow_user_task_assigned_groups + add constraint FK_jiogatex4mifbgji1og4rri9o + foreign key (user_task_id) + references ccm_core.workflow_user_tasks; + + alter table ccm_core.workflow_user_task_assigned_users + add constraint FK_h62r6cqjp2tdnhscfkgwfupwj + foreign key (assigned_user_id) + references ccm_core.ccm_users; + + alter table ccm_core.workflow_user_task_assigned_users + add constraint FK_ltihq91dcigqixb6ulhkphrix + foreign key (user_task_id) + references ccm_core.workflow_user_tasks; + alter table ccm_core.workflow_user_tasks add constraint FK_5nryb3wmian7oqttwqpa3wwll foreign key (locking_user_id) @@ -1004,64 +1074,4 @@ create schema ccm_core; foreign key (workflow_id) references ccm_core.workflows; - alter table formbuilder_component_descriptions - add constraint FK_miw32na0kj3r3vx0yd9nmacu3 - foreign key (component_id) - references ccm_core.formbuilder_components; - - alter table formbuilder_data_query_descriptions - add constraint FK_6vi3n0g1gfjrxd3vvlarrn584 - foreign key (data_query_id) - references ccm_core.formbuilder_data_queries; - - alter table formbuilder_data_query_names - add constraint FK_tgnk7hsrmtqxnhvfcefe936v9 - foreign key (data_query_id) - references ccm_core.formbuilder_data_queries; - - alter table formbuilder_option_labels - add constraint FK_e8fy2g61cd7qn8ar1t48g7p1m - foreign key (option_id) - references ccm_core.formbuilder_options; - - alter table formbuilder_process_listener_descriptions - add constraint FK_p1e4ygtc3ke9r4gotkc5k8dmv - foreign key (process_listener_id) - references ccm_core.formbuilder_process_listeners; - - alter table formbuilder_process_listener_names - add constraint FK_e3uy4vdqbely8oybcfc0ef7tn - foreign key (process_listener_id) - references ccm_core.formbuilder_process_listeners; - - alter table workflow_descriptions - add constraint FK_7grengdpx5d99jkyjlsa3pe6k - foreign key (workflow_id) - references ccm_core.workflows; - - alter table workflow_names - add constraint FK_sjqjarc88yvdrw3yd6swg7uqs - foreign key (workflow_id) - references ccm_core.workflows; - - alter table workflow_user_task_assigned_groups - add constraint FK_g58x45aybw2yjtwnr9b9itg6c - foreign key (assigned_group_id) - references ccm_core.ccm_groups; - - alter table workflow_user_task_assigned_groups - add constraint FK_jiogatex4mifbgji1og4rri9o - foreign key (user_task_id) - references ccm_core.workflow_user_tasks; - - alter table workflow_user_task_assigned_users - add constraint FK_h62r6cqjp2tdnhscfkgwfupwj - foreign key (assigned_user_id) - references ccm_core.ccm_users; - - alter table workflow_user_task_assigned_users - add constraint FK_ltihq91dcigqixb6ulhkphrix - foreign key (user_task_id) - references ccm_core.workflow_user_tasks; - - create sequence hibernate_sequence start with 1 increment by 1; \ No newline at end of file + create sequence hibernate_sequence start 1 increment 1; \ No newline at end of file diff --git a/ccm-core/src/test/resources-wildfly8-remote-pgsql/test-persistence.xml b/ccm-core/src/test/resources-wildfly8-remote-pgsql/test-persistence.xml index 5126c7654..2b67615c3 100644 --- a/ccm-core/src/test/resources-wildfly8-remote-pgsql/test-persistence.xml +++ b/ccm-core/src/test/resources-wildfly8-remote-pgsql/test-persistence.xml @@ -22,7 +22,7 @@ java:/comp/env/jdbc/org/libreccm/ccm-core/pgsql - + diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-delete.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-delete.yml new file mode 100644 index 000000000..babe3cead --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-delete.yml @@ -0,0 +1,5 @@ +ccm_core.ccm_objects: + - object_id: -10 + display_name: Test Object 1 + - object_id: -30 + display_name: Test Object 3 \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-changed.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-changed.yml new file mode 100644 index 000000000..f43ab2965 --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-changed.yml @@ -0,0 +1,7 @@ +ccm_core.ccm_objects: + - object_id: -10 + display_name: Test Object 1 + - object_id: -20 + display_name: Second Test Object + - object_id: -30 + display_name: Test Object 3 \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-new.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-new.yml new file mode 100644 index 000000000..f267989e3 --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-new.yml @@ -0,0 +1,9 @@ +ccm_core.ccm_objects: + - object_id: -10 + display_name: Test Object 1 + - object_id: -20 + display_name: Test Object 2 + - object_id: -30 + display_name: Test Object 3 + - object_id: -40 + display_name: Test Object 4 \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/data.xml b/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/data.xml new file mode 100644 index 000000000..6e023b05d --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/data.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml new file mode 100644 index 000000000..be22757e5 --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml @@ -0,0 +1,7 @@ +ccm_core.ccm_objects: + - object_id: -10 + display_name: Test Object 1 + - object_id: -20 + display_name: Test Object 2 + - object_id: -30 + display_name: Test Object 3 \ No newline at end of file diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/after-add-to-group.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/after-add-to-group.yml new file mode 100644 index 000000000..dba188829 --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/after-add-to-group.yml @@ -0,0 +1,38 @@ +--- +ccm_core.subjects: +- subject_id: -10 +- subject_id: -20 +- subject_id: -30 +- subject_id: -40 +ccm_core.ccm_users: +- banned: false + hash_algorithm: SHA-512 + family_name: Doe + given_name: John + password: C+o2w6mp+eLrbluMEgKMVSdP50A9BMethXN8R3yihtkbzt7WfWsde2nmq/t5gq6im3J8i3jw4Y3YrKHou8JQ2A== + password_reset_required: false + salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== + screen_name: jdoe + subject_id: -10 +ccm_core.ccm_groups: +- name: admins + subject_id: -20 +- name: users + subject_id: -30 +- name: authors + subject_id: -40 +ccm_core.user_email_addresses: +- user_id: -10 + email_address: john.doe@example.com + bouncing: false + verified: true +ccm_core.group_memberships: +- membership_id: -10 + group_subject_id: -30 + user_subject_id: -10 +- membership_id: -20 + group_subject_id: -40 + user_subject_id: -10 +- membership_id: -30 + group_subject_id: -20 + user_subject_id: -10 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/after-remove-from-group.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/after-remove-from-group.yml new file mode 100644 index 000000000..c2b75f2a5 --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/after-remove-from-group.yml @@ -0,0 +1,32 @@ +--- +ccm_core.subjects: +- subject_id: -10 +- subject_id: -20 +- subject_id: -30 +- subject_id: -40 +ccm_core.ccm_users: +- banned: false + hash_algorithm: SHA-512 + family_name: Doe + given_name: John + password: C+o2w6mp+eLrbluMEgKMVSdP50A9BMethXN8R3yihtkbzt7WfWsde2nmq/t5gq6im3J8i3jw4Y3YrKHou8JQ2A== + password_reset_required: false + salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== + screen_name: jdoe + subject_id: -10 +ccm_core.ccm_groups: +- name: admins + subject_id: -20 +- name: users + subject_id: -30 +- name: authors + subject_id: -40 +ccm_core.user_email_addresses: +- user_id: -10 + email_address: john.doe@example.com + bouncing: false + verified: true +ccm_core.group_memberships: +- membership_id: -10 + group_subject_id: -30 + user_subject_id: -10 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/users-groups.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/users-groups.yml new file mode 100644 index 000000000..95b18a7d8 --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupManagerTest/users-groups.yml @@ -0,0 +1,35 @@ +--- +ccm_core.subjects: +- subject_id: -10 +- subject_id: -20 +- subject_id: -30 +- subject_id: -40 +ccm_core.ccm_users: +- banned: false + hash_algorithm: SHA-512 + family_name: Doe + given_name: John + password: C+o2w6mp+eLrbluMEgKMVSdP50A9BMethXN8R3yihtkbzt7WfWsde2nmq/t5gq6im3J8i3jw4Y3YrKHou8JQ2A== + password_reset_required: false + salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== + screen_name: jdoe + subject_id: -10 +ccm_core.ccm_groups: +- name: admins + subject_id: -20 +- name: users + subject_id: -30 +- name: authors + subject_id: -40 +ccm_core.user_email_addresses: +- user_id: -10 + email_address: john.doe@example.com + bouncing: false + verified: true +ccm_core.group_memberships: +- membership_id: -10 + group_subject_id: -30 + user_subject_id: -10 +- membership_id: -20 + group_subject_id: -40 + user_subject_id: -10 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-delete.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-delete.yml new file mode 100644 index 000000000..9789e6cc8 --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-delete.yml @@ -0,0 +1,9 @@ +--- +ccm_core.subjects: +- subject_id: -10 +- subject_id: -30 +ccm_core.ccm_groups: +- name: admins + subject_id: -10 +- name: authors + subject_id: -30 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-save-changed.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-save-changed.yml new file mode 100644 index 000000000..fc21721b1 --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-save-changed.yml @@ -0,0 +1,12 @@ +--- +ccm_core.subjects: +- subject_id: -10 +- subject_id: -20 +- subject_id: -30 +ccm_core.ccm_groups: +- name: admins + subject_id: -10 +- name: users + subject_id: -20 +- name: editors + subject_id: -30 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-save-new.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-save-new.yml new file mode 100644 index 000000000..4bf701f94 --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/after-save-new.yml @@ -0,0 +1,15 @@ +--- +ccm_core.subjects: +- subject_id: -10 +- subject_id: -20 +- subject_id: -30 +- subject_id: -40 +ccm_core.ccm_groups: +- name: admins + subject_id: -10 +- name: users + subject_id: -20 +- name: authors + subject_id: -30 +- name: publishers + subject_id: -40 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/data.yml new file mode 100644 index 000000000..dee056cc9 --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/GroupRepositoryTest/data.yml @@ -0,0 +1,12 @@ +--- +ccm_core.subjects: +- subject_id: -10 +- subject_id: -20 +- subject_id: -30 +ccm_core.ccm_groups: +- name: admins + subject_id: -10 +- name: users + subject_id: -20 +- name: authors + subject_id: -30 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-grant-wildcard.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-grant-wildcard.yml new file mode 100644 index 000000000..2b8579143 --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-grant-wildcard.yml @@ -0,0 +1,194 @@ +--- +ccm_core.ccm_objects: +- object_id: -10 + display_name: Test Object 1 +- object_id: -20 + display_name: Test Object 2 +- object_id: -30 + display_name: Test Object 3 +- object_id: -40 + display_name: Test Object 4 +- object_id: -50 + display_name: Test Object 5 +- object_id: -60 + display_name: Test Object 6 +- object_id: -70 + display_name: Test Object 7 +- object_id: -80 + display_name: Test Object 8 +ccm_core.ccm_privileges: +- privilege_id: -10 + label: admin +- privilege_id: -20 + label: read +- privilege_id: -30 + label: write +ccm_core.subjects: +- subject_id: -1 +- subject_id: -2 +- subject_id: -10 +- subject_id: -30 +- subject_id: -40 +- subject_id: -50 +ccm_core.ccm_users: +- banned: false + hash_algorithm: SHA-512 + family_name: webmaster + given_name: webmaster + password: C+o2w6mp+eLrbluMEgKMVSdP50A9BMethXN8R3yihtkbzt7WfWsde2nmq/t5gq6im3J8i3jw4Y3YrKHou8JQ2A== + password_reset_required: false + salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== + screen_name: webmaster + subject_id: -1 +- banned: false + hash_algorithm: SHA-512 + family_name: public-user + given_name: public-user + password: C+o2w6mp+eLrbluMEgKMVSdP50A9BMethXN8R3yihtkbzt7WfWsde2nmq/t5gq6im3J8i3jw4Y3YrKHou8JQ2A== + password_reset_required: false + salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== + screen_name: public-user + subject_id: -2 +- banned: false + hash_algorithm: SHA-512 + family_name: Doe + given_name: John + password: C+o2w6mp+eLrbluMEgKMVSdP50A9BMethXN8R3yihtkbzt7WfWsde2nmq/t5gq6im3J8i3jw4Y3YrKHou8JQ2A== + password_reset_required: false + salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== + screen_name: jdoe + subject_id: -10 +- banned: false + hash_algorithm: SHA-512 + family_name: Mustermann + given_name: Max + password: 1c9626af429a6291766d15cbfb38689bd8d49450520765973de70aecaf644b7d4fda711266ba9ec8fb6df30c8ab391d40330829aa85adf371bcde6b4c9bc01e6 + password_reset_required: false + salt: fjiajhigafgapoa + screen_name: mmuster + subject_id: -50 +ccm_core.ccm_groups: +- name: users + subject_id: -30 +- name: authors + subject_id: -40 +ccm_core.group_memberships: +- membership_id: -10 + group_subject_id: -40 + user_subject_id: -10 +- membership_id: -20 + group_subject_id: -40 + user_subject_id: -50 +- membership_id: -30 + group_subject_id: -30 + user_subject_id: -2 +- membership_id: -40 + group_subject_id: -30 + user_subject_id: -10 +- membership_id: -50 + group_subject_id: -30 + user_subject_id: -50 +ccm_core.user_email_addresses: +- user_id: -10 + email_address: john.doe@example.com + bouncing: false + verified: true +- user_id: -50 + email_address: max.mustermann@example.com + bouncing: false + verified: true +ccm_core.permissions: +- permission_id: -10 + grantee_id: -1 + granted_privilege_id: -10 +- permission_id: -20 + grantee_id: -2 + object_id: -50 + granted_privilege_id: -20 +- permission_id: -30 + grantee_id: -10 + object_id: -50 + granted_privilege_id: -20 +- permission_id: -40 + grantee_id: -50 + object_id: -50 + granted_privilege_id: -20 +- permission_id: -50 + grantee_id: -50 + object_id: -50 + granted_privilege_id: -30 +- permission_id: -60 + grantee_id: -50 + object_id: -60 + granted_privilege_id: -20 +- permission_id: -80 + grantee_id: -30 + object_id: -10 + granted_privilege_id: -20 +- permission_id: -90 + grantee_id: -30 + object_id: -20 + granted_privilege_id: -20 +- permission_id: -100 + grantee_id: -30 + object_id: -30 + granted_privilege_id: -20 +- permission_id: -110 + grantee_id: -30 + object_id: -40 + granted_privilege_id: -20 +- permission_id: -120 + grantee_id: -30 + object_id: -80 + granted_privilege_id: -20 +- permission_id: -130 + grantee_id: -40 + object_id: -10 + granted_privilege_id: -20 +- permission_id: -140 + grantee_id: -40 + object_id: -20 + granted_privilege_id: -20 +- permission_id: -150 + grantee_id: -40 + object_id: -30 + granted_privilege_id: -20 +- permission_id: -160 + grantee_id: -40 + object_id: -40 + granted_privilege_id: -20 +- permission_id: -170 + grantee_id: -40 + object_id: -80 + granted_privilege_id: -20 +- permission_id: -180 + grantee_id: -40 + object_id: -10 + granted_privilege_id: -30 +- permission_id: -190 + grantee_id: -40 + object_id: -20 + granted_privilege_id: -30 +- permission_id: -200 + grantee_id: -40 + object_id: -30 + granted_privilege_id: -30 +- permission_id: -220 + grantee_id: -40 + object_id: -40 + granted_privilege_id: -30 +- permission_id: -230 + grantee_id: -40 + object_id: -80 + granted_privilege_id: -30 +- permission_id: -250 + grantee_id: -50 + object_id: -60 + granted_privilege_id: -20 +- permission_id: -260 + grantee_id: -50 + object_id: -60 + granted_privilege_id: -30 +- permission_id: -270 + grantee_id: -10 + granted_privilege_id: -20 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-grant.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-grant.yml new file mode 100644 index 000000000..2c4546f0d --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-grant.yml @@ -0,0 +1,203 @@ +--- +ccm_core.ccm_objects: +- object_id: -10 + display_name: Test Object 1 +- object_id: -20 + display_name: Test Object 2 +- object_id: -30 + display_name: Test Object 3 +- object_id: -40 + display_name: Test Object 4 +- object_id: -50 + display_name: Test Object 5 +- object_id: -60 + display_name: Test Object 6 +- object_id: -70 + display_name: Test Object 7 +- object_id: -80 + display_name: Test Object 8 +ccm_core.ccm_privileges: +- privilege_id: -10 + label: admin +- privilege_id: -20 + label: read +- privilege_id: -30 + label: write +ccm_core.subjects: +- subject_id: -1 +- subject_id: -2 +- subject_id: -10 +- subject_id: -30 +- subject_id: -40 +- subject_id: -50 +ccm_core.ccm_users: +- banned: false + hash_algorithm: SHA-512 + family_name: webmaster + given_name: webmaster + password: C+o2w6mp+eLrbluMEgKMVSdP50A9BMethXN8R3yihtkbzt7WfWsde2nmq/t5gq6im3J8i3jw4Y3YrKHou8JQ2A== + password_reset_required: false + salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== + screen_name: webmaster + subject_id: -1 +- banned: false + hash_algorithm: SHA-512 + family_name: public-user + given_name: public-user + password: C+o2w6mp+eLrbluMEgKMVSdP50A9BMethXN8R3yihtkbzt7WfWsde2nmq/t5gq6im3J8i3jw4Y3YrKHou8JQ2A== + password_reset_required: false + salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== + screen_name: public-user + subject_id: -2 +- banned: false + hash_algorithm: SHA-512 + family_name: Doe + given_name: John + password: C+o2w6mp+eLrbluMEgKMVSdP50A9BMethXN8R3yihtkbzt7WfWsde2nmq/t5gq6im3J8i3jw4Y3YrKHou8JQ2A== + password_reset_required: false + salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== + screen_name: jdoe + subject_id: -10 +- banned: false + hash_algorithm: SHA-512 + family_name: Mustermann + given_name: Max + password: 1c9626af429a6291766d15cbfb38689bd8d49450520765973de70aecaf644b7d4fda711266ba9ec8fb6df30c8ab391d40330829aa85adf371bcde6b4c9bc01e6 + password_reset_required: false + salt: fjiajhigafgapoa + screen_name: mmuster + subject_id: -50 +ccm_core.ccm_groups: +- name: users + subject_id: -30 +- name: authors + subject_id: -40 +ccm_core.group_memberships: +- membership_id: -10 + group_subject_id: -40 + user_subject_id: -10 +- membership_id: -20 + group_subject_id: -40 + user_subject_id: -50 +- membership_id: -30 + group_subject_id: -30 + user_subject_id: -2 +- membership_id: -40 + group_subject_id: -30 + user_subject_id: -10 +- membership_id: -50 + group_subject_id: -30 + user_subject_id: -50 +ccm_core.user_email_addresses: +- user_id: -10 + email_address: john.doe@example.com + bouncing: false + verified: true +- user_id: -50 + email_address: max.mustermann@example.com + bouncing: false + verified: true +ccm_core.permissions: +- permission_id: -10 + grantee_id: -1 + granted_privilege_id: -10 +- permission_id: -20 + grantee_id: -2 + object_id: -50 + granted_privilege_id: -20 +- permission_id: -30 + grantee_id: -10 + object_id: -50 + granted_privilege_id: -20 +- permission_id: -40 + grantee_id: -50 + object_id: -50 + granted_privilege_id: -20 +- permission_id: -50 + grantee_id: -50 + object_id: -50 + granted_privilege_id: -30 +- permission_id: -60 + grantee_id: -50 + object_id: -60 + granted_privilege_id: -20 +- permission_id: -80 + grantee_id: -30 + object_id: -10 + granted_privilege_id: -20 +- permission_id: -90 + grantee_id: -30 + object_id: -20 + granted_privilege_id: -20 +- permission_id: -100 + grantee_id: -30 + object_id: -30 + granted_privilege_id: -20 +- permission_id: -110 + grantee_id: -30 + object_id: -40 + granted_privilege_id: -20 +- permission_id: -120 + grantee_id: -30 + object_id: -80 + granted_privilege_id: -20 +- permission_id: -130 + grantee_id: -40 + object_id: -10 + granted_privilege_id: -20 +- permission_id: -140 + grantee_id: -40 + object_id: -20 + granted_privilege_id: -20 +- permission_id: -150 + grantee_id: -40 + object_id: -30 + granted_privilege_id: -20 +- permission_id: -160 + grantee_id: -40 + object_id: -40 + granted_privilege_id: -20 +- permission_id: -170 + grantee_id: -40 + object_id: -80 + granted_privilege_id: -20 +- permission_id: -180 + grantee_id: -40 + object_id: -10 + granted_privilege_id: -30 +- permission_id: -190 + grantee_id: -40 + object_id: -20 + granted_privilege_id: -30 +- permission_id: -200 + grantee_id: -40 + object_id: -30 + granted_privilege_id: -30 +- permission_id: -220 + grantee_id: -40 + object_id: -40 + granted_privilege_id: -30 +- permission_id: -230 + grantee_id: -40 + object_id: -80 + granted_privilege_id: -30 +- permission_id: -250 + grantee_id: -50 + object_id: -60 + granted_privilege_id: -20 +- permission_id: -260 + grantee_id: -50 + object_id: -60 + granted_privilege_id: -30 +- permission_id: -270 + grantee_id: -10 + object_id: -60 + granted_privilege_id: -20 +- permission_id: -280 + grantee_id: -50 + object_id: -70 + granted_privilege_id: -20 +- permission_id: -290 + grantee_id: -50 + object_id: -70 + granted_privilege_id: -30 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-revoke.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-revoke.yml new file mode 100644 index 000000000..6f40885dc --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/after-revoke.yml @@ -0,0 +1,183 @@ +--- +ccm_core.ccm_objects: +- object_id: -10 + display_name: Test Object 1 +- object_id: -20 + display_name: Test Object 2 +- object_id: -30 + display_name: Test Object 3 +- object_id: -40 + display_name: Test Object 4 +- object_id: -50 + display_name: Test Object 5 +- object_id: -60 + display_name: Test Object 6 +- object_id: -70 + display_name: Test Object 7 +- object_id: -80 + display_name: Test Object 8 +ccm_core.ccm_privileges: +- privilege_id: -10 + label: admin +- privilege_id: -20 + label: read +- privilege_id: -30 + label: write +ccm_core.subjects: +- subject_id: -1 +- subject_id: -2 +- subject_id: -10 +- subject_id: -30 +- subject_id: -40 +- subject_id: -50 +ccm_core.ccm_users: +- banned: false + hash_algorithm: SHA-512 + family_name: webmaster + given_name: webmaster + password: C+o2w6mp+eLrbluMEgKMVSdP50A9BMethXN8R3yihtkbzt7WfWsde2nmq/t5gq6im3J8i3jw4Y3YrKHou8JQ2A== + password_reset_required: false + salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== + screen_name: webmaster + subject_id: -1 +- banned: false + hash_algorithm: SHA-512 + family_name: public-user + given_name: public-user + password: C+o2w6mp+eLrbluMEgKMVSdP50A9BMethXN8R3yihtkbzt7WfWsde2nmq/t5gq6im3J8i3jw4Y3YrKHou8JQ2A== + password_reset_required: false + salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== + screen_name: public-user + subject_id: -2 +- banned: false + hash_algorithm: SHA-512 + family_name: Doe + given_name: John + password: C+o2w6mp+eLrbluMEgKMVSdP50A9BMethXN8R3yihtkbzt7WfWsde2nmq/t5gq6im3J8i3jw4Y3YrKHou8JQ2A== + password_reset_required: false + salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== + screen_name: jdoe + subject_id: -10 +- banned: false + hash_algorithm: SHA-512 + family_name: Mustermann + given_name: Max + password: 1c9626af429a6291766d15cbfb38689bd8d49450520765973de70aecaf644b7d4fda711266ba9ec8fb6df30c8ab391d40330829aa85adf371bcde6b4c9bc01e6 + password_reset_required: false + salt: fjiajhigafgapoa + screen_name: mmuster + subject_id: -50 +ccm_core.ccm_groups: +- name: users + subject_id: -30 +- name: authors + subject_id: -40 +ccm_core.group_memberships: +- membership_id: -10 + group_subject_id: -40 + user_subject_id: -10 +- membership_id: -20 + group_subject_id: -40 + user_subject_id: -50 +- membership_id: -30 + group_subject_id: -30 + user_subject_id: -2 +- membership_id: -40 + group_subject_id: -30 + user_subject_id: -10 +- membership_id: -50 + group_subject_id: -30 + user_subject_id: -50 +ccm_core.user_email_addresses: +- user_id: -10 + email_address: john.doe@example.com + bouncing: false + verified: true +- user_id: -50 + email_address: max.mustermann@example.com + bouncing: false + verified: true +ccm_core.permissions: +- permission_id: -10 + grantee_id: -1 + granted_privilege_id: -10 +- permission_id: -20 + grantee_id: -2 + object_id: -50 + granted_privilege_id: -20 +- permission_id: -40 + grantee_id: -50 + object_id: -50 + granted_privilege_id: -20 +- permission_id: -50 + grantee_id: -50 + object_id: -50 + granted_privilege_id: -30 +- permission_id: -60 + grantee_id: -50 + object_id: -60 + granted_privilege_id: -20 +- permission_id: -80 + grantee_id: -30 + object_id: -10 + granted_privilege_id: -20 +- permission_id: -90 + grantee_id: -30 + object_id: -20 + granted_privilege_id: -20 +- permission_id: -100 + grantee_id: -30 + object_id: -30 + granted_privilege_id: -20 +- permission_id: -110 + grantee_id: -30 + object_id: -40 + granted_privilege_id: -20 +- permission_id: -120 + grantee_id: -30 + object_id: -80 + granted_privilege_id: -20 +- permission_id: -130 + grantee_id: -40 + object_id: -10 + granted_privilege_id: -20 +- permission_id: -140 + grantee_id: -40 + object_id: -20 + granted_privilege_id: -20 +- permission_id: -150 + grantee_id: -40 + object_id: -30 + granted_privilege_id: -20 +- permission_id: -160 + grantee_id: -40 + object_id: -40 + granted_privilege_id: -20 +- permission_id: -170 + grantee_id: -40 + object_id: -80 + granted_privilege_id: -20 +- permission_id: -180 + grantee_id: -40 + object_id: -10 + granted_privilege_id: -30 +- permission_id: -190 + grantee_id: -40 + object_id: -20 + granted_privilege_id: -30 +- permission_id: -200 + grantee_id: -40 + object_id: -30 + granted_privilege_id: -30 +- permission_id: -220 + grantee_id: -40 + object_id: -40 + granted_privilege_id: -30 +- permission_id: -230 + grantee_id: -40 + object_id: -80 + granted_privilege_id: -30 +- permission_id: -250 + grantee_id: -50 + object_id: -60 + granted_privilege_id: -20 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/data.yml new file mode 100644 index 000000000..3c8b93f73 --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionManagerTest/data.yml @@ -0,0 +1,191 @@ +--- +ccm_core.ccm_objects: +- object_id: -10 + display_name: Test Object 1 +- object_id: -20 + display_name: Test Object 2 +- object_id: -30 + display_name: Test Object 3 +- object_id: -40 + display_name: Test Object 4 +- object_id: -50 + display_name: Test Object 5 +- object_id: -60 + display_name: Test Object 6 +- object_id: -70 + display_name: Test Object 7 +- object_id: -80 + display_name: Test Object 8 +ccm_core.ccm_privileges: +- privilege_id: -10 + label: admin +- privilege_id: -20 + label: read +- privilege_id: -30 + label: write +ccm_core.subjects: +- subject_id: -1 +- subject_id: -2 +- subject_id: -10 +- subject_id: -30 +- subject_id: -40 +- subject_id: -50 +ccm_core.ccm_users: +- banned: false + hash_algorithm: SHA-512 + family_name: webmaster + given_name: webmaster + password: C+o2w6mp+eLrbluMEgKMVSdP50A9BMethXN8R3yihtkbzt7WfWsde2nmq/t5gq6im3J8i3jw4Y3YrKHou8JQ2A== + salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== + password_reset_required: false + screen_name: webmaster + subject_id: -1 +- banned: false + hash_algorithm: SHA-512 + family_name: public-user + given_name: public-user + password: C+o2w6mp+eLrbluMEgKMVSdP50A9BMethXN8R3yihtkbzt7WfWsde2nmq/t5gq6im3J8i3jw4Y3YrKHou8JQ2A== + salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== + password_reset_required: false + screen_name: public-user + subject_id: -2 +- banned: false + hash_algorithm: SHA-512 + family_name: Doe + given_name: John + password: C+o2w6mp+eLrbluMEgKMVSdP50A9BMethXN8R3yihtkbzt7WfWsde2nmq/t5gq6im3J8i3jw4Y3YrKHou8JQ2A== + password_reset_required: false + salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== + screen_name: jdoe + subject_id: -10 +- banned: false + hash_algorithm: SHA-512 + family_name: Mustermann + given_name: Max + password: 1c9626af429a6291766d15cbfb38689bd8d49450520765973de70aecaf644b7d4fda711266ba9ec8fb6df30c8ab391d40330829aa85adf371bcde6b4c9bc01e6 + password_reset_required: false + salt: fjiajhigafgapoa + screen_name: mmuster + subject_id: -50 +ccm_core.ccm_groups: +- name: users + subject_id: -30 +- name: authors + subject_id: -40 +ccm_core.group_memberships: +- membership_id: -10 + group_subject_id: -40 + user_subject_id: -10 +- membership_id: -20 + group_subject_id: -40 + user_subject_id: -50 +- membership_id: -30 + group_subject_id: -30 + user_subject_id: -2 +- membership_id: -40 + group_subject_id: -30 + user_subject_id: -10 +- membership_id: -50 + group_subject_id: -30 + user_subject_id: -50 +ccm_core.user_email_addresses: +- user_id: -10 + email_address: john.doe@example.com + bouncing: false + verified: true +- user_id: -50 + email_address: max.mustermann@example.com + bouncing: false + verified: true +ccm_core.permissions: +- permission_id: -10 + grantee_id: -1 + granted_privilege_id: -10 +- permission_id: -20 + grantee_id: -2 + object_id: -50 + granted_privilege_id: -20 +- permission_id: -30 + grantee_id: -10 + object_id: -50 + granted_privilege_id: -20 +- permission_id: -40 + grantee_id: -50 + object_id: -50 + granted_privilege_id: -20 +- permission_id: -50 + grantee_id: -50 + object_id: -50 + granted_privilege_id: -30 +- permission_id: -60 + grantee_id: -50 + object_id: -60 + granted_privilege_id: -20 +- permission_id: -80 + grantee_id: -30 + object_id: -10 + granted_privilege_id: -20 +- permission_id: -90 + grantee_id: -30 + object_id: -20 + granted_privilege_id: -20 +- permission_id: -100 + grantee_id: -30 + object_id: -30 + granted_privilege_id: -20 +- permission_id: -110 + grantee_id: -30 + object_id: -40 + granted_privilege_id: -20 +- permission_id: -120 + grantee_id: -30 + object_id: -80 + granted_privilege_id: -20 +- permission_id: -130 + grantee_id: -40 + object_id: -10 + granted_privilege_id: -20 +- permission_id: -140 + grantee_id: -40 + object_id: -20 + granted_privilege_id: -20 +- permission_id: -150 + grantee_id: -40 + object_id: -30 + granted_privilege_id: -20 +- permission_id: -160 + grantee_id: -40 + object_id: -40 + granted_privilege_id: -20 +- permission_id: -170 + grantee_id: -40 + object_id: -80 + granted_privilege_id: -20 +- permission_id: -180 + grantee_id: -40 + object_id: -10 + granted_privilege_id: -30 +- permission_id: -190 + grantee_id: -40 + object_id: -20 + granted_privilege_id: -30 +- permission_id: -200 + grantee_id: -40 + object_id: -30 + granted_privilege_id: -30 +- permission_id: -220 + grantee_id: -40 + object_id: -40 + granted_privilege_id: -30 +- permission_id: -230 + grantee_id: -40 + object_id: -80 + granted_privilege_id: -30 +- permission_id: -250 + grantee_id: -50 + object_id: -60 + granted_privilege_id: -20 +- permission_id: -260 + grantee_id: -50 + object_id: -60 + granted_privilege_id: -30 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-delete.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-delete.yml new file mode 100644 index 000000000..b5a04bebb --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-delete.yml @@ -0,0 +1,90 @@ +--- +ccm_core.subjects: +- subject_id: -10 +- subject_id: -20 +- subject_id: -30 +- subject_id: -40 +- subject_id: -50 +ccm_core.ccm_users: +- banned: false + hash_algorithm: SHA-512 + family_name: Doe + given_name: John + password: C+o2w6mp+eLrbluMEgKMVSdP50A9BMethXN8R3yihtkbzt7WfWsde2nmq/t5gq6im3J8i3jw4Y3YrKHou8JQ2A== + password_reset_required: false + salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== + screen_name: jdoe + subject_id: -10 +- banned: false + hash_algorithm: SHA-512 + family_name: Mustermann + given_name: Max + password: 1c9626af429a6291766d15cbfb38689bd8d49450520765973de70aecaf644b7d4fda711266ba9ec8fb6df30c8ab391d40330829aa85adf371bcde6b4c9bc01e6 + password_reset_required: false + salt: fjiajhigafgapoa + screen_name: mmuster + subject_id: -50 +ccm_core.ccm_groups: +- name: admins + subject_id: -20 +- name: users + subject_id: -30 +- name: authors + subject_id: -40 +ccm_core.user_email_addresses: +- user_id: -10 + email_address: john.doe@example.com + bouncing: false + verified: true +- user_id: -50 + email_address: max.mustermann@example.com + bouncing: false + verified: true +ccm_core.group_memberships: +- membership_id: -10 + group_subject_id: -30 + user_subject_id: -10 +- membership_id: -20 + group_subject_id: -40 + user_subject_id: -10 +- membership_id: -30 + group_subject_id: -20 + user_subject_id: -50 +ccm_core.ccm_privileges: +- privilege_id: -10 + label: admin +- privilege_id: -20 + label: read +- privilege_id: -30 + label: write +- privilege_id: -40 + label: unused +ccm_core.ccm_objects: +- object_id: -10 + display_name: Test Object 1 +- object_id: -20 + display_name: Test Object 2 +- object_id: -30 + display_name: Test Object 3 +- object_id: -40 + display_name: Test Object 4 +ccm_core.permissions: +- permission_id: -10 + creation_date: '2015-07-29 14:32:46' + granted_privilege_id: -10 + grantee_id: -20 +- permission_id: -20 + creation_date: '2015-07-29 14:34:30' + granted_privilege_id: -20 + grantee_id: -30 + object_id: -10 +- permission_id: -30 + creation_date: '2015-07-29 14:36:05' + granted_privilege_id: -30 + grantee_id: -40 + object_id: -10 +- permission_id: -40 + creation_date: '2015-07-29 14:37:22' + granted_privilege_id: -20 + grantee_id: -10 + object_id: -20 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-save-changed.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-save-changed.yml new file mode 100644 index 000000000..f1313d937 --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-save-changed.yml @@ -0,0 +1,95 @@ +--- +ccm_core.subjects: +- subject_id: -10 +- subject_id: -20 +- subject_id: -30 +- subject_id: -40 +- subject_id: -50 +ccm_core.ccm_users: +- banned: false + hash_algorithm: SHA-512 + family_name: Doe + given_name: John + password: C+o2w6mp+eLrbluMEgKMVSdP50A9BMethXN8R3yihtkbzt7WfWsde2nmq/t5gq6im3J8i3jw4Y3YrKHou8JQ2A== + password_reset_required: false + salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== + screen_name: jdoe + subject_id: -10 +- banned: false + hash_algorithm: SHA-512 + family_name: Mustermann + given_name: Max + password: 1c9626af429a6291766d15cbfb38689bd8d49450520765973de70aecaf644b7d4fda711266ba9ec8fb6df30c8ab391d40330829aa85adf371bcde6b4c9bc01e6 + password_reset_required: false + salt: fjiajhigafgapoa + screen_name: mmuster + subject_id: -50 +ccm_core.ccm_groups: +- name: admins + subject_id: -20 +- name: users + subject_id: -30 +- name: authors + subject_id: -40 +ccm_core.user_email_addresses: +- user_id: -10 + email_address: john.doe@example.com + bouncing: false + verified: true +- user_id: -50 + email_address: max.mustermann@example.com + bouncing: false + verified: true +ccm_core.group_memberships: +- membership_id: -10 + group_subject_id: -30 + user_subject_id: -10 +- membership_id: -20 + group_subject_id: -40 + user_subject_id: -10 +- membership_id: -30 + group_subject_id: -20 + user_subject_id: -50 +ccm_core.ccm_privileges: +- privilege_id: -10 + label: admin +- privilege_id: -20 + label: read +- privilege_id: -30 + label: write +- privilege_id: -40 + label: unused +ccm_core.ccm_objects: +- object_id: -10 + display_name: Test Object 1 +- object_id: -20 + display_name: Test Object 2 +- object_id: -30 + display_name: Test Object 3 +- object_id: -40 + display_name: Test Object 4 +ccm_core.permissions: +- permission_id: -10 + creation_date: '2015-07-29 14:32:46' + granted_privilege_id: -10 + grantee_id: -20 +- permission_id: -20 + creation_date: '2015-07-29 14:34:30' + granted_privilege_id: -20 + grantee_id: -30 + object_id: -10 +- permission_id: -30 + creation_date: '2015-07-29 14:36:05' + granted_privilege_id: -30 + grantee_id: -40 + object_id: -10 +- permission_id: -35 + creation_date: '2015-07-29 14:57:55' + granted_privilege_id: -20 + grantee_id: -40 + object_id: -10 +- permission_id: -40 + creation_date: '2015-07-29 14:37:22' + granted_privilege_id: -20 + grantee_id: -30 + object_id: -20 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-save-new.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-save-new.yml new file mode 100644 index 000000000..966dfb0c7 --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/after-save-new.yml @@ -0,0 +1,103 @@ +--- +ccm_core.subjects: +- subject_id: -10 +- subject_id: -20 +- subject_id: -30 +- subject_id: -40 +- subject_id: -50 +ccm_core.ccm_users: +- banned: false + hash_algorithm: SHA-512 + family_name: Doe + given_name: John + password: C+o2w6mp+eLrbluMEgKMVSdP50A9BMethXN8R3yihtkbzt7WfWsde2nmq/t5gq6im3J8i3jw4Y3YrKHou8JQ2A== + password_reset_required: false + salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== + screen_name: jdoe + subject_id: -10 +- banned: false + hash_algorithm: SHA-512 + family_name: Mustermann + given_name: Max + password: 1c9626af429a6291766d15cbfb38689bd8d49450520765973de70aecaf644b7d4fda711266ba9ec8fb6df30c8ab391d40330829aa85adf371bcde6b4c9bc01e6 + password_reset_required: false + salt: fjiajhigafgapoa + screen_name: mmuster + subject_id: -50 +ccm_core.ccm_groups: +- name: admins + subject_id: -20 +- name: users + subject_id: -30 +- name: authors + subject_id: -40 +ccm_core.user_email_addresses: +- user_id: -10 + email_address: john.doe@example.com + bouncing: false + verified: true +- user_id: -50 + email_address: max.mustermann@example.com + bouncing: false + verified: true +ccm_core.group_memberships: +- membership_id: -10 + group_subject_id: -30 + user_subject_id: -10 +- membership_id: -20 + group_subject_id: -40 + user_subject_id: -10 +- membership_id: -30 + group_subject_id: -20 + user_subject_id: -50 +ccm_core.ccm_privileges: +- privilege_id: -10 + label: admin +- privilege_id: -20 + label: read +- privilege_id: -30 + label: write +- privilege_id: -40 + label: unused +ccm_core.ccm_objects: +- object_id: -10 + display_name: Test Object 1 +- object_id: -20 + display_name: Test Object 2 +- object_id: -30 + display_name: Test Object 3 +- object_id: -40 + display_name: Test Object 4 +ccm_core.permissions: +- permission_id: -10 + creation_date: '2015-07-29 14:32:46' + granted_privilege_id: -10 + grantee_id: -20 +- permission_id: -20 + creation_date: '2015-07-29 14:34:30' + granted_privilege_id: -20 + grantee_id: -30 + object_id: -10 +- permission_id: -30 + creation_date: '2015-07-29 14:36:05' + granted_privilege_id: -30 + grantee_id: -40 + object_id: -10 +- permission_id: -35 + creation_date: '2015-07-29 14:57:55' + granted_privilege_id: -20 + grantee_id: -40 + object_id: -10 +- permission_id: -40 + creation_date: '2015-07-29 14:37:22' + granted_privilege_id: -20 + grantee_id: -10 + object_id: -20 +- permission_id: -50 + granted_privilege_id: -20 + grantee_id: -50 + object_id: -40 +- permission_id: -60 + granted_privilege_id: -30 + grantee_id: -50 + object_id: -40 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/data.yml new file mode 100644 index 000000000..035787cd6 --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PermissionRepositoryTest/data.yml @@ -0,0 +1,95 @@ +--- +ccm_core.subjects: +- subject_id: -10 +- subject_id: -20 +- subject_id: -30 +- subject_id: -40 +- subject_id: -50 +ccm_core.ccm_users: +- banned: false + hash_algorithm: SHA-512 + family_name: Doe + given_name: John + password: C+o2w6mp+eLrbluMEgKMVSdP50A9BMethXN8R3yihtkbzt7WfWsde2nmq/t5gq6im3J8i3jw4Y3YrKHou8JQ2A== + password_reset_required: false + salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== + screen_name: jdoe + subject_id: -10 +- banned: false + hash_algorithm: SHA-512 + family_name: Mustermann + given_name: Max + password: 1c9626af429a6291766d15cbfb38689bd8d49450520765973de70aecaf644b7d4fda711266ba9ec8fb6df30c8ab391d40330829aa85adf371bcde6b4c9bc01e6 + password_reset_required: false + salt: fjiajhigafgapoa + screen_name: mmuster + subject_id: -50 +ccm_core.ccm_groups: +- name: admins + subject_id: -20 +- name: users + subject_id: -30 +- name: authors + subject_id: -40 +ccm_core.user_email_addresses: +- user_id: -10 + email_address: john.doe@example.com + bouncing: false + verified: true +- user_id: -50 + email_address: max.mustermann@example.com + bouncing: false + verified: true +ccm_core.group_memberships: +- membership_id: -10 + group_subject_id: -30 + user_subject_id: -10 +- membership_id: -20 + group_subject_id: -40 + user_subject_id: -10 +- membership_id: -30 + group_subject_id: -20 + user_subject_id: -50 +ccm_core.ccm_privileges: +- privilege_id: -10 + label: admin +- privilege_id: -20 + label: read +- privilege_id: -30 + label: write +- privilege_id: -40 + label: unused +ccm_core.ccm_objects: +- object_id: -10 + display_name: Test Object 1 +- object_id: -20 + display_name: Test Object 2 +- object_id: -30 + display_name: Test Object 3 +- object_id: -40 + display_name: Test Object 4 +ccm_core.permissions: +- permission_id: -10 + creation_date: '2015-07-29 14:32:46' + granted_privilege_id: -10 + grantee_id: -20 +- permission_id: -20 + creation_date: '2015-07-29 14:34:30' + granted_privilege_id: -20 + grantee_id: -30 + object_id: -10 +- permission_id: -30 + creation_date: '2015-07-29 14:36:05' + granted_privilege_id: -30 + grantee_id: -40 + object_id: -10 +- permission_id: -35 + creation_date: '2015-07-29 14:57:55' + granted_privilege_id: -20 + grantee_id: -40 + object_id: -10 +- permission_id: -40 + creation_date: '2015-07-29 14:37:22' + granted_privilege_id: -20 + grantee_id: -10 + object_id: -20 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/after-create.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/after-create.yml new file mode 100644 index 000000000..4552f5710 --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/after-create.yml @@ -0,0 +1,10 @@ +--- +ccm_core.ccm_privileges: +- privilege_id: -10 + label: admin +- privilege_id: -20 + label: read +- privilege_id: -30 + label: write +- privilege_id: -40 + label: publish diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/after-delete.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/after-delete.yml new file mode 100644 index 000000000..3b097f8d0 --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/after-delete.yml @@ -0,0 +1,6 @@ +--- +ccm_core.ccm_privileges: +- privilege_id: -10 + label: admin +- privilege_id: -20 + label: read diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/data.yml new file mode 100644 index 000000000..fc3950f04 --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/PrivilegeRepositoryTest/data.yml @@ -0,0 +1,8 @@ +--- +ccm_core.ccm_privileges: +- privilege_id: -10 + label: admin +- privilege_id: -20 + label: read +- privilege_id: -30 + label: write diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-delete.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-delete.yml new file mode 100644 index 000000000..b0a327cc9 --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-delete.yml @@ -0,0 +1,64 @@ +--- +ccm_core.subjects: +- subject_id: -10 +- subject_id: -20 +- subject_id: -30 +- subject_id: -40 +- subject_id: -50 +- subject_id: -60 +- subject_id: -70 +- subject_id: -80 +- subject_id: -90 +- subject_id: -100 +ccm_core.ccm_groups: +- name: Site-wide Administrators + subject_id: -10 +- name: info Administration + subject_id: -20 +- name: info Viewers + subject_id: -30 +- name: info Administration Author + subject_id: -40 +- name: info Administration Editor + subject_id: -50 +- name: info Administration Publisher + subject_id: -60 +- name: info Administration Manager + subject_id: -70 +- name: info Administration Trusted User + subject_id: -80 +- name: info Viewers Content Reader + subject_id: -90 +- name: info Administration Alert Recipient + subject_id: -100 +ccm_core.ccm_roles: +- role_id: -10 + description: Creates new content + name: Author + implicit_group_id: -40 + source_group_id: -20 +- role_id: -20 + description: Reviews and approves the author's work + name: Editor + implicit_group_id: -50 + source_group_id: -20 +- role_id: -30 + description: Deploys the content to the web site + name: Publisher + implicit_group_id: -60 + source_group_id: -20 +- role_id: -40 + description: Manages the overall content section + name: Manager + implicit_group_id: -70 + source_group_id: -20 +- role_id: -60 + description: Can view published pages within this section + name: Content Reader + implicit_group_id: -90 + source_group_id: -30 +- role_id: -70 + description: Receive alerts regarding expiration of published content + name: Alert Recipient + implicit_group_id: -100 + source_group_id: -30 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-save-changed.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-save-changed.yml new file mode 100644 index 000000000..0c897b98a --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-save-changed.yml @@ -0,0 +1,69 @@ +--- +ccm_core.subjects: +- subject_id: -10 +- subject_id: -20 +- subject_id: -30 +- subject_id: -40 +- subject_id: -50 +- subject_id: -60 +- subject_id: -70 +- subject_id: -80 +- subject_id: -90 +- subject_id: -100 +ccm_core.ccm_groups: +- name: Site-wide Administrators + subject_id: -10 +- name: info Administration + subject_id: -20 +- name: info Viewers + subject_id: -30 +- name: info Administration Author + subject_id: -40 +- name: info Administration Editor + subject_id: -50 +- name: info Administration Publisher + subject_id: -60 +- name: info Administration Manager + subject_id: -70 +- name: info Administration Trusted User + subject_id: -80 +- name: info Viewers Content Reader + subject_id: -90 +- name: info Administration Alert Recipient + subject_id: -100 +ccm_core.ccm_roles: +- role_id: -10 + description: Creates new content + name: Author + implicit_group_id: -40 + source_group_id: -20 +- role_id: -20 + description: Reviews and approves the author's work + name: Editor + implicit_group_id: -50 + source_group_id: -20 +- role_id: -30 + description: Deploys the content to the web site + name: Publisher + implicit_group_id: -60 + source_group_id: -20 +- role_id: -40 + description: Manages the overall content section + name: Manager + implicit_group_id: -70 + source_group_id: -20 +- role_id: -50 + description: A trusted user is allowed to create and publish items without review + name: Trusted User + implicit_group_id: -80 + source_group_id: -20 +- role_id: -60 + description: Can view published pages within this section + name: Reader + implicit_group_id: -90 + source_group_id: -30 +- role_id: -70 + description: Receive alerts regarding expiration of published content + name: Alert Recipient + implicit_group_id: -100 + source_group_id: -30 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-save-new.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-save-new.yml new file mode 100644 index 000000000..8e8788e56 --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/after-save-new.yml @@ -0,0 +1,74 @@ +--- +ccm_core.subjects: +- subject_id: -10 +- subject_id: -20 +- subject_id: -30 +- subject_id: -40 +- subject_id: -50 +- subject_id: -60 +- subject_id: -70 +- subject_id: -80 +- subject_id: -90 +- subject_id: -100 +ccm_core.ccm_groups: +- name: Site-wide Administrators + subject_id: -10 +- name: info Administration + subject_id: -20 +- name: info Viewers + subject_id: -30 +- name: info Administration Author + subject_id: -40 +- name: info Administration Editor + subject_id: -50 +- name: info Administration Publisher + subject_id: -60 +- name: info Administration Manager + subject_id: -70 +- name: info Administration Trusted User + subject_id: -80 +- name: info Viewers Content Reader + subject_id: -90 +- name: info Administration Alert Recipient + subject_id: -100 +ccm_core.ccm_roles: +- role_id: -10 + description: Creates new content + name: Author + implicit_group_id: -40 + source_group_id: -20 +- role_id: -20 + description: Reviews and approves the author's work + name: Editor + implicit_group_id: -50 + source_group_id: -20 +- role_id: -30 + description: Deploys the content to the web site + name: Publisher + implicit_group_id: -60 + source_group_id: -20 +- role_id: -40 + description: Manages the overall content section + name: Manager + implicit_group_id: -70 + source_group_id: -20 +- role_id: -50 + description: A trusted user is allowed to create and publish items without review + name: Trusted User + implicit_group_id: -80 + source_group_id: -20 +- role_id: -60 + description: Can view published pages within this section + name: Content Reader + implicit_group_id: -90 + source_group_id: -30 +- role_id: -70 + description: Receive alerts regarding expiration of published content + name: Alert Recipient + implicit_group_id: -100 + source_group_id: -30 +- role_id: -80 + description: New role for testing + name: Test + implicit_group_id: -20 + source_group_id: -90 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/data.yml new file mode 100644 index 000000000..47bfe8d08 --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/RoleRepositoryTest/data.yml @@ -0,0 +1,69 @@ +--- +ccm_core.subjects: +- subject_id: -10 +- subject_id: -20 +- subject_id: -30 +- subject_id: -40 +- subject_id: -50 +- subject_id: -60 +- subject_id: -70 +- subject_id: -80 +- subject_id: -90 +- subject_id: -100 +ccm_core.ccm_groups: +- name: Site-wide Administrators + subject_id: -10 +- name: info Administration + subject_id: -20 +- name: info Viewers + subject_id: -30 +- name: info Administration Author + subject_id: -40 +- name: info Administration Editor + subject_id: -50 +- name: info Administration Publisher + subject_id: -60 +- name: info Administration Manager + subject_id: -70 +- name: info Administration Trusted User + subject_id: -80 +- name: info Viewers Content Reader + subject_id: -90 +- name: info Administration Alert Recipient + subject_id: -100 +ccm_core.ccm_roles: +- role_id: -10 + description: Creates new content + name: Author + implicit_group_id: -40 + source_group_id: -20 +- role_id: -20 + description: Reviews and approves the author's work + name: Editor + implicit_group_id: -50 + source_group_id: -20 +- role_id: -30 + description: Deploys the content to the web site + name: Publisher + implicit_group_id: -60 + source_group_id: -20 +- role_id: -40 + description: Manages the overall content section + name: Manager + implicit_group_id: -70 + source_group_id: -20 +- role_id: -50 + description: A trusted user is allowed to create and publish items without review + name: Trusted User + implicit_group_id: -80 + source_group_id: -20 +- role_id: -60 + description: Can view published pages within this section + name: Content Reader + implicit_group_id: -90 + source_group_id: -30 +- role_id: -70 + description: Receive alerts regarding expiration of published content + name: Alert Recipient + implicit_group_id: -100 + source_group_id: -30 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserManagerTest/verify-password.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserManagerTest/verify-password.yml new file mode 100644 index 000000000..3803fa986 --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserManagerTest/verify-password.yml @@ -0,0 +1,18 @@ +--- +ccm_core.subjects: +- subject_id: -10 +ccm_core.ccm_users: +- banned: false + hash_algorithm: SHA-512 + family_name: Doe + given_name: John + password: C+o2w6mp+eLrbluMEgKMVSdP50A9BMethXN8R3yihtkbzt7WfWsde2nmq/t5gq6im3J8i3jw4Y3YrKHou8JQ2A== + password_reset_required: false + salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== + screen_name: jdoe + subject_id: -10 +ccm_core.user_email_addresses: +- user_id: -10 + email_address: john.doe@example.com + bouncing: false + verified: true diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-delete.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-delete.yml new file mode 100644 index 000000000..d1c1f8609 --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-delete.yml @@ -0,0 +1,34 @@ +--- +ccm_core.subjects: +- subject_id: -10 +- subject_id: -30 +ccm_core.ccm_users: +- banned: false + hash_algorithm: MD5 + family_name: Doe + given_name: John + #foo123 + password: 604622dc8a888eb093454ebd77ca1675 + password_reset_required: false + salt: axg8ira8fa + screen_name: jdoe + subject_id: -10 +- banned: false + hash_algorithm: SHA-512 + family_name: Public + given_name: Joe + #foo123 + password: 4e39eba7f2927182a532cd8700bf251e58d4b0359fbb832e6af21db7501d7a49e6d8b950e0d4b15b1841af0f786c8edaa0c09ef7f474804254f7e895969d2975 + password_reset_required: false + salt: axg8ira8fa + screen_name: joe + subject_id: -30 +ccm_core.user_email_addresses: +- user_id: -10 + email_address: john.doe@example.com + bouncing: false + verified: true +- user_id: -30 + email_address: joe.public@example.com + bouncing: true + verified: false diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-save-changed.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-save-changed.yml new file mode 100644 index 000000000..66a095384 --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-save-changed.yml @@ -0,0 +1,54 @@ +--- +ccm_core.subjects: +- subject_id: -10 +- subject_id: -20 +- subject_id: -30 +ccm_core.ccm_users: +- banned: false + hash_algorithm: SHA-512 + family_name: Doe + given_name: John + title_pre: Dr. + #Een5vuwa + password: 19f69a0f8eab3e6124d1b40ca2ae1fc3ece311cf86dde4e9560521e881fb8f063817cf1da1234144825f40fc9b9acd1563cafcb35fb8533544a1b6c3615160e3 + password_reset_required: false + salt: fafjiaddfja0a + screen_name: jdoe + subject_id: -10 +- banned: false + hash_algorithm: SHA-512 + family_name: Mustermann + given_name: Max + #foo123 + password: 1c9626af429a6291766d15cbfb38689bd8d49450520765973de70aecaf644b7d4fda711266ba9ec8fb6df30c8ab391d40330829aa85adf371bcde6b4c9bc01e6 + password_reset_required: false + salt: fjiajhigafgapoa + screen_name: mmuster + subject_id: -20 +- banned: false + hash_algorithm: SHA-512 + family_name: Public + given_name: Joe + #foo123 + password: 4e39eba7f2927182a532cd8700bf251e58d4b0359fbb832e6af21db7501d7a49e6d8b950e0d4b15b1841af0f786c8edaa0c09ef7f474804254f7e895969d2975 + password_reset_required: false + salt: axg8ira8fa + screen_name: joe + subject_id: -30 +ccm_core.user_email_addresses: +- user_id: -10 + email_address: jd@example.com + bouncing: false + verified: true +- user_id: -20 + email_address: max.mustermann@example.org + bouncing: false + verified: true +- user_id: -20 + email_address: mm@example.com + bouncing: false + verified: true +- user_id: -30 + email_address: joe.public@example.com + bouncing: true + verified: false diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-save-new.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-save-new.yml new file mode 100644 index 000000000..afecdb5b1 --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/after-save-new.yml @@ -0,0 +1,70 @@ +--- +ccm_core.subjects: +- subject_id: -10 +- subject_id: -20 +- subject_id: -30 +- subject_id: -40 +ccm_core.ccm_users: +- banned: false + hash_algorithm: MD5 + family_name: Doe + given_name: John + #foo123 + password: 604622dc8a888eb093454ebd77ca1675 + password_reset_required: false + salt: axg8ira8fa + screen_name: jdoe + subject_id: -10 +- banned: false + hash_algorithm: SHA-512 + family_name: Mustermann + given_name: Max + #foo123 + password: 1c9626af429a6291766d15cbfb38689bd8d49450520765973de70aecaf644b7d4fda711266ba9ec8fb6df30c8ab391d40330829aa85adf371bcde6b4c9bc01e6 + password_reset_required: false + salt: fjiajhigafgapoa + screen_name: mmuster + subject_id: -20 +- banned: false + hash_algorithm: SHA-512 + family_name: Public + given_name: Joe + #foo123 + password: 4e39eba7f2927182a532cd8700bf251e58d4b0359fbb832e6af21db7501d7a49e6d8b950e0d4b15b1841af0f786c8edaa0c09ef7f474804254f7e895969d2975 + password_reset_required: false + salt: axg8ira8fa + screen_name: joe + subject_id: -30 +- banned: false + hash_algorithm: SHA-512 + family_name: Doe + given_name: Jane + middle_name: Anna + title_pre: Dr. + #bar123 + password: 32d2a830fb03f201bda975ae70a62c207716705a049e054cf6701de1cec546d3a9e03a094be2e98e4d125af996ebbfa5a7754754a1e9d2fe063a0d9921cb201d + password_reset_required: false + salt: maifgaoapafga9 + screen_name: jane + subject_id: -40 +ccm_core.user_email_addresses: +- user_id: -10 + email_address: john.doe@example.com + bouncing: false + verified: true +- user_id: -20 + email_address: max.mustermann@example.org + bouncing: false + verified: true +- user_id: -20 + email_address: mm@example.com + bouncing: false + verified: true +- user_id: -30 + email_address: joe.public@example.com + bouncing: true + verified: false +- user_id: -40 + email_address: jane.doe@example.org + bouncing: false + verified: false diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/data-email-duplicate.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/data-email-duplicate.yml new file mode 100644 index 000000000..f16b32d32 --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/data-email-duplicate.yml @@ -0,0 +1,50 @@ +--- +ccm_core.subjects: +- subject_id: -10 +- subject_id: -20 +- subject_id: -30 +ccm_core.ccm_users: +- banned: false + hash_algorithm: MD5 + family_name: Doe + given_name: John + password: 604622dc8a888eb093454ebd77ca1675 + password_reset_required: false + salt: axg8ira8fa + screen_name: jdoe + subject_id: -10 +- banned: false + hash_algorithm: SHA-512 + family_name: Mustermann + given_name: Max + password: 1c9626af429a6291766d15cbfb38689bd8d49450520765973de70aecaf644b7d4fda711266ba9ec8fb6df30c8ab391d40330829aa85adf371bcde6b4c9bc01e6 + password_reset_required: false + salt: fjiajhigafgapoa + screen_name: mmuster + subject_id: -20 +- banned: false + hash_algorithm: SHA-512 + family_name: Public + given_name: Joe + password: 4e39eba7f2927182a532cd8700bf251e58d4b0359fbb832e6af21db7501d7a49e6d8b950e0d4b15b1841af0f786c8edaa0c09ef7f474804254f7e895969d2975 + password_reset_required: false + salt: axg8ira8fa + screen_name: joe + subject_id: -30 +ccm_core.user_email_addresses: +- user_id: -10 + email_address: john.doe@example.com + bouncing: false + verified: true +- user_id: -20 + email_address: max.mustermann@example.org + bouncing: false + verified: true +- user_id: -20 + email_address: mm@example.com + bouncing: false + verified: true +- user_id: -30 + email_address: max.mustermann@example.org + bouncing: true + verified: false diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/data.yml new file mode 100644 index 000000000..fa555e356 --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/UserRepositoryTest/data.yml @@ -0,0 +1,53 @@ +--- +ccm_core.subjects: +- subject_id: -10 +- subject_id: -20 +- subject_id: -30 +ccm_core.ccm_users: +- banned: false + hash_algorithm: MD5 + family_name: Doe + given_name: John + #foo123 + password: 604622dc8a888eb093454ebd77ca1675 + password_reset_required: false + salt: axg8ira8fa + screen_name: jdoe + subject_id: -10 +- banned: false + hash_algorithm: SHA-512 + family_name: Mustermann + given_name: Max + #foo123 + password: 1c9626af429a6291766d15cbfb38689bd8d49450520765973de70aecaf644b7d4fda711266ba9ec8fb6df30c8ab391d40330829aa85adf371bcde6b4c9bc01e6 + password_reset_required: false + salt: fjiajhigafgapoa + screen_name: mmuster + subject_id: -20 +- banned: false + hash_algorithm: SHA-512 + family_name: Public + given_name: Joe + #foo123 + password: 4e39eba7f2927182a532cd8700bf251e58d4b0359fbb832e6af21db7501d7a49e6d8b950e0d4b15b1841af0f786c8edaa0c09ef7f474804254f7e895969d2975 + password_reset_required: false + salt: axg8ira8fa + screen_name: joe + subject_id: -30 +ccm_core.user_email_addresses: +- user_id: -10 + email_address: john.doe@example.com + bouncing: false + verified: true +- user_id: -20 + email_address: max.mustermann@example.org + bouncing: false + verified: true +- user_id: -20 + email_address: mm@example.com + bouncing: false + verified: true +- user_id: -30 + email_address: joe.public@example.com + bouncing: true + verified: false diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/core/authentication/LoginManagerTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/core/authentication/LoginManagerTest/data.yml new file mode 100644 index 000000000..e82d85bbb --- /dev/null +++ b/ccm-core/src/test/resources/datasets/org/libreccm/core/authentication/LoginManagerTest/data.yml @@ -0,0 +1,18 @@ +--- +ccm_core.subjects: +- subject_id: -10 +ccm_core.ccm_users: +- banned: false + hash_algorithm: SHA-512 + family_name: Doe + given_name: John + password: C+o2w6mp+eLrbluMEgKMVSdP50A9BMethXN8R3yihtkbzt7WfWsde2nmq/t5gq6im3J8i3jw4Y3YrKHou8JQ2A== + salt: Fu8FPgqAal4GZp1hDjkOB+t6ITRCcO7HBoN5Xqf29UnVj5NUdUFZRTyKYMBEx6JmZGmHcMDG9OGVCKcEM9oyScSRreJs4B51wM44NM6KeRwbCf+VhBn14DkBrl40ygraNf+AJacKpMyCpFI0O/Am7mMDWL4flskBsylkxaQn3vKfzgN5MVG2szW//I6Q6YEH9AuL8LauS6fKaVynMzzu3xzD8Hjqvvlnzym898eom2lqScPfg5g4e8Ww13HCHAYe6twupAW/BjUNax5HSioEisZN/P1UGrde8uFEj+hbbavrWYZuilPuEu25+/98jyXx6542agqrWN8j0SFYcIyOgA== + password_reset_required: false + screen_name: jdoe + subject_id: -10 +ccm_core.user_email_addresses: +- user_id: -10 + email_address: jdoe@example.com + bouncing: false + verified: true