From 6949d6f496ceb400ba01db3e3a6bf269ec215699 Mon Sep 17 00:00:00 2001 From: jensp Date: Sat, 28 Jan 2017 20:23:15 +0000 Subject: [PATCH] CCM NG/ccm-cms: Fixed typo in after-add-role dataset. CCM NG/ccm-shortcuts: - Necssary changes due to changed permission behaviour (only in the test datasets). - ccm-shortcuts now uses standard cleanup procedure between integratio tests git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4542 8810af33-2d31-482b-a856-94f89814c4df Former-commit-id: f74bfb2618cd91b82c8b03b43050cff60abae705 --- .../after-add-role.xml | 21 ++++++++++ .../shortcuts/ShortcutManagerTest.java | 2 + .../shortcuts/ShortcutRepositoryTest.java | 2 + .../arquillian.xml | 6 +-- .../scripts/cleanup.sql | 39 +++++++++++++++++++ .../scripts/create_ccm_shortcuts_schema.sql | 1 - .../arquillian.xml | 8 ++-- .../scripts/cleanup.sql | 39 +++++++++++++++++++ .../scripts/create_ccm_shortcuts_schema.sql | 2 +- .../ShortcutManagerTest/after-create.xml | 5 ++- .../shortcuts/ShortcutManagerTest/data.xml | 3 +- 11 files changed, 116 insertions(+), 12 deletions(-) create mode 100644 ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/scripts/cleanup.sql create mode 100644 ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/cleanup.sql diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-role.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-role.xml index 76fad3d47..10144de6c 100644 --- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-role.xml +++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-role.xml @@ -927,5 +927,26 @@ creation_date="2016-07-15" inherited="true" inherited_from_id="-1100" /> + + + \ No newline at end of file diff --git a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutManagerTest.java b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutManagerTest.java index 5ee38a026..cbc0a1d34 100644 --- a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutManagerTest.java +++ b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutManagerTest.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.CleanupUsingScript; import org.jboss.arquillian.persistence.CreateSchema; import org.jboss.arquillian.persistence.PersistenceTest; import org.jboss.arquillian.persistence.ShouldMatchDataSet; @@ -62,6 +63,7 @@ import static org.junit.Assert.*; @PersistenceTest @Transactional(TransactionMode.COMMIT) @CreateSchema({"create_ccm_shortcuts_schema.sql"}) +@CleanupUsingScript({"cleanup.sql"}) public class ShortcutManagerTest { @Inject diff --git a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutRepositoryTest.java b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutRepositoryTest.java index 0ba9d209b..2ba9143bc 100644 --- a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutRepositoryTest.java +++ b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutRepositoryTest.java @@ -23,6 +23,7 @@ import static org.libreccm.testutils.DependenciesHelpers.*; 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.CleanupUsingScript; import org.jboss.arquillian.persistence.CreateSchema; import org.jboss.arquillian.persistence.PersistenceTest; import org.jboss.arquillian.persistence.UsingDataSet; @@ -58,6 +59,7 @@ import static org.junit.Assert.*; @PersistenceTest @Transactional(TransactionMode.COMMIT) @CreateSchema({"create_ccm_shortcuts_schema.sql"}) +@CleanupUsingScript({"cleanup.sql"}) public class ShortcutRepositoryTest { @Inject diff --git a/ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/arquillian.xml b/ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/arquillian.xml index 0a0f22043..7482e7fd2 100644 --- a/ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/arquillian.xml +++ b/ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/arquillian.xml @@ -19,7 +19,7 @@ Disable automatic cleanup, does not work because of referential integrity constrains. --> - NONE + true target @@ -32,9 +32,9 @@ true - + diff --git a/ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/scripts/cleanup.sql b/ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/scripts/cleanup.sql new file mode 100644 index 000000000..5d987d7f9 --- /dev/null +++ b/ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/scripts/cleanup.sql @@ -0,0 +1,39 @@ +DELETE FROM ccm_shortcuts.shortcuts; + +DELETE FROM ccm_core.settings_string_list; + +DELETE FROM ccm_core.settings_l10n_str_values; + +DELETE FROM ccm_core.settings_enum_values; + +DELETE FROM ccm_core.settings_enum_values; + +DELETE FROM ccm_core.settings; + +DELETE FROM ccm_core.categorizations; + +DELETE FROM ccm_core.category_domains; + +DELETE FROM ccm_core.categories; + +DELETE FROM ccm_core.permissions; + +DELETE FROM ccm_core.ccm_objects; + +DELETE FROM ccm_core.role_memberships; + +DELETE FROM ccm_core.group_memberships; + +DELETE FROM ccm_core.groups; + +DELETE FROM ccm_core.one_time_auth_tokens; + +DELETE FROM ccm_core.users; + +DELETE FROM ccm_core.user_email_addresses; + +DELETE FROM ccm_core.parties; + +DELETE FROM ccm_core.ccm_roles; + +ALTER SEQUENCE hibernate_sequence RESTART WITH 1; diff --git a/ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_shortcuts_schema.sql b/ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_shortcuts_schema.sql index 467caf733..bdeb5aeca 100644 --- a/ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_shortcuts_schema.sql +++ b/ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_shortcuts_schema.sql @@ -1246,4 +1246,3 @@ create sequence hibernate_sequence start with 1 increment by 1; alter table CCM_SHORTCUTS.SHORTCUTS add constraint UK_4otuwtog6qqdbg4e6p8xdpw8h unique (URL_KEY); -create sequence hibernate_sequence start with 1 increment by 1; diff --git a/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/arquillian.xml b/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/arquillian.xml index 3e2edace9..31b7fdbdc 100644 --- a/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/arquillian.xml +++ b/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/arquillian.xml @@ -18,7 +18,7 @@ Disable automatic cleanup, does not work because of referential integrity constrains. --> - NONE + true target @@ -26,14 +26,14 @@ json - + org.dbunit.ext.postgresql.PostgresqlDataTypeFactory true true - + diff --git a/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/cleanup.sql b/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/cleanup.sql new file mode 100644 index 000000000..e000a8b98 --- /dev/null +++ b/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/cleanup.sql @@ -0,0 +1,39 @@ +DELETE FROM ccm_shortcuts.shortcuts; + +DELETE FROM ccm_core.settings_string_list; + +DELETE FROM ccm_core.settings_l10n_str_values; + +DELETE FROM ccm_core.settings_enum_values; + +DELETE FROM ccm_core.settings_enum_values; + +DELETE FROM ccm_core.settings; + +DELETE FROM ccm_core.categorizations; + +DELETE FROM ccm_core.category_domains; + +DELETE FROM ccm_core.categories; + +DELETE FROM ccm_core.permissions; + +DELETE FROM ccm_core.ccm_objects; + +DELETE FROM ccm_core.role_memberships; + +DELETE FROM ccm_core.group_memberships; + +DELETE FROM ccm_core.groups; + +DELETE FROM ccm_core.one_time_auth_tokens; + +DELETE FROM ccm_core.users; + +DELETE FROM ccm_core.user_email_addresses; + +DELETE FROM ccm_core.parties; + +DELETE FROM ccm_core.ccm_roles; + +ALTER SEQUENCE hibernate_sequence RESTART; diff --git a/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_shortcuts_schema.sql b/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_shortcuts_schema.sql index 7d45fb264..3df7c4e76 100644 --- a/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_shortcuts_schema.sql +++ b/ccm-shortcuts/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_shortcuts_schema.sql @@ -1246,4 +1246,4 @@ create sequence hibernate_sequence start 1 increment 1; alter table CCM_SHORTCUTS.SHORTCUTS add constraint UK_4otuwtog6qqdbg4e6p8xdpw8h unique (URL_KEY); - create sequence hibernate_sequence start 1 increment 1; + diff --git a/ccm-shortcuts/src/test/resources/datasets/org/libreccm/shortcuts/ShortcutManagerTest/after-create.xml b/ccm-shortcuts/src/test/resources/datasets/org/libreccm/shortcuts/ShortcutManagerTest/after-create.xml index 53da6deef..b3185182b 100644 --- a/ccm-shortcuts/src/test/resources/datasets/org/libreccm/shortcuts/ShortcutManagerTest/after-create.xml +++ b/ccm-shortcuts/src/test/resources/datasets/org/libreccm/shortcuts/ShortcutManagerTest/after-create.xml @@ -32,8 +32,9 @@ member_id="-110" /> + granted_privilege="manage_shortcuts" + grantee_id="-200" + inherited="false" /> + grantee_id="-200" + inherited="false" />