From b1305b8d4cfff88a0e37b6163ca6e94c23a44ab1 Mon Sep 17 00:00:00 2001 From: jensp Date: Tue, 26 Mar 2019 20:39:10 +0000 Subject: [PATCH] Fixed some test failures git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5883 8810af33-2d31-482b-a856-94f89814c4df --- .../CategoryRepositoryTest.java | 1 + .../ConfigurationManagerTest.java | 1 + .../core/CcmObjectRepositoryTest.java | 46 +++++++++---------- .../AuthorizationInterceptorTest.java | 1 + .../libreccm/security/GroupManagerTest.java | 1 + .../security/GroupRepositoryTest.java | 1 + .../security/OneTimeAuthManagerTest.java | 1 + .../security/PartyRepositoryTest.java | 1 + .../security/PermissionCheckerTest.java | 1 + .../security/PermissionManagerTest.java | 7 +-- .../libreccm/security/RoleManagerTest.java | 1 + .../libreccm/security/RoleRepositoryTest.java | 1 + .../security/SecuredCollectionTest.java | 1 + .../security/SecuredIteratorTest.java | 1 + .../java/org/libreccm/security/ShiroTest.java | 1 + .../libreccm/security/UserManagerTest.java | 1 + .../libreccm/security/UserRepositoryTest.java | 1 + 17 files changed, 42 insertions(+), 26 deletions(-) diff --git a/ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryTest.java index f45902272..68b7e5756 100644 --- a/ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryTest.java @@ -130,6 +130,7 @@ public class CategoryRepositoryTest { .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) .addClass(com.arsdigita.kernel.KernelConfig.class) .addClass(com.arsdigita.kernel.security.SecurityConfig.class) + .addClass(org.libreccm.imexport.Exportable.class) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.xml", diff --git a/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerTest.java b/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerTest.java index a81ab8fdb..9a1143d0a 100644 --- a/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerTest.java @@ -120,6 +120,7 @@ public class ConfigurationManagerTest { .addClass(com.example.TestConfiguration.class) .addClass(com.arsdigita.kernel.KernelConfig.class) .addClass(com.arsdigita.kernel.security.SecurityConfig.class) + .addClass(org.libreccm.imexport.Exportable.class) .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") 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 3c7cde898..51578fdbc 100644 --- a/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java @@ -188,21 +188,21 @@ public class CcmObjectRepositoryTest { @UsingDataSet("datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml") @InSequence(5) public void entityManagerFindCcmObjectByLongPrimitive() { - final CcmObject obj1 = entityManager.find(CcmObject.class, -10L); - final CcmObject obj2 = entityManager.find(CcmObject.class, -20L); - final CcmObject obj3 = entityManager.find(CcmObject.class, -30L); - final CcmObject none = entityManager.find(CcmObject.class, -999L); + final CcmObject obj1 = entityManager.find(CcmObject.class, 10L); + final CcmObject obj2 = entityManager.find(CcmObject.class, 20L); + final CcmObject obj3 = entityManager.find(CcmObject.class, 30L); + final CcmObject none = entityManager.find(CcmObject.class, 999L); assertThat(obj1, is(not(nullValue()))); - assertThat(obj1.getObjectId(), is(-10L)); + assertThat(obj1.getObjectId(), is(10L)); assertThat(obj1.getDisplayName(), is(equalTo("Test Object 1"))); assertThat(obj2, is(not(nullValue()))); - assertThat(obj2.getObjectId(), is(-20L)); + assertThat(obj2.getObjectId(), is(20L)); assertThat(obj2.getDisplayName(), is(equalTo("Test Object 2"))); assertThat(obj3, is(not(nullValue()))); - assertThat(obj3.getObjectId(), is(-30L)); + assertThat(obj3.getObjectId(), is(30L)); assertThat(obj3.getDisplayName(), is(equalTo("Test Object 3"))); assertThat(none, is(nullValue())); @@ -217,10 +217,10 @@ public class CcmObjectRepositoryTest { @UsingDataSet("datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml") @InSequence(6) public void entityManagerFindCcmObjectByLongClass() { - final Long id1 = -10L; - final Long id2 = -20L; - final Long id3 = -30L; - final Long id4 = -999L; + final Long id1 = 10L; + final Long id2 = 20L; + final Long id3 = 30L; + final Long id4 = 999L; final CcmObject obj1 = entityManager.find(CcmObject.class, id1); final CcmObject obj2 = entityManager.find(CcmObject.class, id2); @@ -228,15 +228,15 @@ public class CcmObjectRepositoryTest { final CcmObject none = entityManager.find(CcmObject.class, id4); assertThat(obj1, is(not(nullValue()))); - assertThat(obj1.getObjectId(), is(-10L)); + assertThat(obj1.getObjectId(), is(10L)); assertThat(obj1.getDisplayName(), is(equalTo("Test Object 1"))); assertThat(obj2, is(not(nullValue()))); - assertThat(obj2.getObjectId(), is(-20L)); + assertThat(obj2.getObjectId(), is(20L)); assertThat(obj2.getDisplayName(), is(equalTo("Test Object 2"))); assertThat(obj3, is(not(nullValue()))); - assertThat(obj3.getObjectId(), is(-30L)); + assertThat(obj3.getObjectId(), is(30L)); assertThat(obj3.getDisplayName(), is(equalTo("Test Object 3"))); assertThat(none, is(nullValue())); @@ -246,21 +246,21 @@ public class CcmObjectRepositoryTest { @UsingDataSet("datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml") @InSequence(10) public void findCcmObjectById() { - final Optional obj1 = ccmObjectRepository.findById(-10L); - final Optional obj2 = ccmObjectRepository.findById(-20L); - final Optional obj3 = ccmObjectRepository.findById(-30L); - final Optional none = ccmObjectRepository.findById(-999L); + final Optional obj1 = ccmObjectRepository.findById(10L); + final Optional obj2 = ccmObjectRepository.findById(20L); + final Optional obj3 = ccmObjectRepository.findById(30L); + final Optional none = ccmObjectRepository.findById(999L); assertThat(obj1.isPresent(), is(true)); - assertThat(obj1.get().getObjectId(), is(-10L)); + assertThat(obj1.get().getObjectId(), is(10L)); assertThat(obj1.get().getDisplayName(), is(equalTo("Test Object 1"))); assertThat(obj2.isPresent(), is(true)); - assertThat(obj2.get().getObjectId(), is(-20L)); + assertThat(obj2.get().getObjectId(), is(20L)); assertThat(obj2.get().getDisplayName(), is(equalTo("Test Object 2"))); assertThat(obj3.isPresent(), is(true)); - assertThat(obj3.get().getObjectId(), is(-30L)); + assertThat(obj3.get().getObjectId(), is(30L)); assertThat(obj3.get().getDisplayName(), is(equalTo("Test Object 3"))); assertThat(none.isPresent(), is(false)); @@ -312,7 +312,7 @@ public class CcmObjectRepositoryTest { excludeColumns = {"object_id"}) @InSequence(400) public void saveChangedCcmObject() { - final CcmObject obj = ccmObjectRepository.findById(-20L).get(); + final CcmObject obj = ccmObjectRepository.findById(20L).get(); obj.setDisplayName("Second Test Object"); ccmObjectRepository.save(obj); @@ -343,7 +343,7 @@ public class CcmObjectRepositoryTest { excludeColumns = {"object_id"}) @InSequence(600) public void deleteCcmObject() { - final CcmObject obj = ccmObjectRepository.findById(-20L).get(); + final CcmObject obj = ccmObjectRepository.findById(20L).get(); ccmObjectRepository.delete(obj); } diff --git a/ccm-core/src/test/java/org/libreccm/security/AuthorizationInterceptorTest.java b/ccm-core/src/test/java/org/libreccm/security/AuthorizationInterceptorTest.java index 06a40d574..d9a488fa4 100644 --- a/ccm-core/src/test/java/org/libreccm/security/AuthorizationInterceptorTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/AuthorizationInterceptorTest.java @@ -130,6 +130,7 @@ public class AuthorizationInterceptorTest { .getPackage()) .addClass(com.arsdigita.kernel.KernelConfig.class) .addClass(com.arsdigita.util.UncheckedWrapperException.class) + .addClass(org.libreccm.imexport.Exportable.class) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/security/GroupManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/GroupManagerTest.java index 9d720ddf7..601a47d8e 100644 --- a/ccm-core/src/test/java/org/libreccm/security/GroupManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/GroupManagerTest.java @@ -123,6 +123,7 @@ public class GroupManagerTest { .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) .addClass(com.arsdigita.kernel.KernelConfig.class) .addClass(com.arsdigita.kernel.security.SecurityConfig.class) + .addClass(org.libreccm.imexport.Exportable.class) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/security/GroupRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/security/GroupRepositoryTest.java index 90cd195be..9fc154564 100644 --- a/ccm-core/src/test/java/org/libreccm/security/GroupRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/GroupRepositoryTest.java @@ -123,6 +123,7 @@ public class GroupRepositoryTest { .getPackage()) .addPackage(org.libreccm.tests.categories.IntegrationTest.class .getPackage()) + .addClass(org.libreccm.imexport.Exportable.class) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.xml", diff --git a/ccm-core/src/test/java/org/libreccm/security/OneTimeAuthManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/OneTimeAuthManagerTest.java index fc1e38f6e..e65915bd2 100644 --- a/ccm-core/src/test/java/org/libreccm/security/OneTimeAuthManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/OneTimeAuthManagerTest.java @@ -127,6 +127,7 @@ public class OneTimeAuthManagerTest { .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) .addClass(com.arsdigita.kernel.KernelConfig.class) .addClass(com.arsdigita.kernel.security.SecurityConfig.class) + .addClass(org.libreccm.imexport.Exportable.class) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.xml", diff --git a/ccm-core/src/test/java/org/libreccm/security/PartyRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/security/PartyRepositoryTest.java index 2e2ee52a3..047c06c0e 100644 --- a/ccm-core/src/test/java/org/libreccm/security/PartyRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/PartyRepositoryTest.java @@ -128,6 +128,7 @@ public class PartyRepositoryTest { .addClass(com.arsdigita.kernel.security.SecurityConfig.class) .addClass(com.arsdigita.kernel.KernelConfig.class) .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) + .addClass(org.libreccm.imexport.Exportable.class) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.xml", diff --git a/ccm-core/src/test/java/org/libreccm/security/PermissionCheckerTest.java b/ccm-core/src/test/java/org/libreccm/security/PermissionCheckerTest.java index 0b0307490..2bd0e97ac 100644 --- a/ccm-core/src/test/java/org/libreccm/security/PermissionCheckerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/PermissionCheckerTest.java @@ -131,6 +131,7 @@ public class PermissionCheckerTest { .getPackage()) .addPackage(com.arsdigita.kernel.security.SecurityConfig.class .getPackage()) + .addClass(org.libreccm.imexport.Exportable.class) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java index 449b6eb94..1d6b19c6f 100644 --- a/ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java @@ -128,10 +128,11 @@ public class PermissionManagerTest { .getPackage()) .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) - .addPackage(com.arsdigita.kernel.KernelConfig.class.getPackage()). - addPackage(com.arsdigita.kernel.security.SecurityConfig.class + .addPackage(com.arsdigita.kernel.KernelConfig.class.getPackage()) + .addPackage(com.arsdigita.kernel.security.SecurityConfig.class .getPackage()) .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) + .addClass(org.libreccm.imexport.Exportable.class) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") @@ -610,7 +611,7 @@ public class PermissionManagerTest { */ @Test(expected = IllegalArgumentException.class) @UsingDataSet("datasets/org/libreccm/security/PermissionManagerTest/" - + "data.yml") + + "data.yml") @ShouldThrowException(IllegalArgumentException.class) @InSequence(340) public void revokePermissionFromRoleNull() throws Throwable { diff --git a/ccm-core/src/test/java/org/libreccm/security/RoleManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/RoleManagerTest.java index b43ea4986..e9a7e9965 100644 --- a/ccm-core/src/test/java/org/libreccm/security/RoleManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/RoleManagerTest.java @@ -120,6 +120,7 @@ public class RoleManagerTest { .addPackage(com.arsdigita.kernel.security.SecurityConfig.class .getPackage()) .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) + .addClass(org.libreccm.imexport.Exportable.class) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/security/RoleRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/security/RoleRepositoryTest.java index 77d160796..8e4844cbb 100644 --- a/ccm-core/src/test/java/org/libreccm/security/RoleRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/RoleRepositoryTest.java @@ -129,6 +129,7 @@ public class RoleRepositoryTest { getPackage()) .addPackage(org.libreccm.tests.categories.IntegrationTest.class .getPackage()) + .addClass(org.libreccm.imexport.Exportable.class) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.xml", diff --git a/ccm-core/src/test/java/org/libreccm/security/SecuredCollectionTest.java b/ccm-core/src/test/java/org/libreccm/security/SecuredCollectionTest.java index 6ea243b0e..99710e881 100644 --- a/ccm-core/src/test/java/org/libreccm/security/SecuredCollectionTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/SecuredCollectionTest.java @@ -147,6 +147,7 @@ public class SecuredCollectionTest { .addPackage(com.arsdigita.kernel.KernelConfig.class.getPackage()) .addPackage(com.arsdigita.kernel.security.SecurityConfig.class .getPackage()) + .addClass(org.libreccm.imexport.Exportable.class) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/security/SecuredIteratorTest.java b/ccm-core/src/test/java/org/libreccm/security/SecuredIteratorTest.java index 33668043a..45a42ca50 100644 --- a/ccm-core/src/test/java/org/libreccm/security/SecuredIteratorTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/SecuredIteratorTest.java @@ -149,6 +149,7 @@ public class SecuredIteratorTest { .addPackage(com.arsdigita.kernel.security.SecurityConfig.class .getPackage()) .addPackage(com.arsdigita.kernel.KernelConfig.class.getPackage()) + .addClass(org.libreccm.imexport.Exportable.class) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/security/ShiroTest.java b/ccm-core/src/test/java/org/libreccm/security/ShiroTest.java index d616d9a06..f617196c8 100644 --- a/ccm-core/src/test/java/org/libreccm/security/ShiroTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/ShiroTest.java @@ -122,6 +122,7 @@ public class ShiroTest { .addPackage(com.arsdigita.kernel.security.SecurityConfig.class .getPackage()) .addClass(org.libreccm.security.authorization.LabBean.class) + .addClass(org.libreccm.imexport.Exportable.class) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/security/UserManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/UserManagerTest.java index 2430c70a2..620ede4b7 100644 --- a/ccm-core/src/test/java/org/libreccm/security/UserManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/UserManagerTest.java @@ -123,6 +123,7 @@ public class UserManagerTest { .addPackage(com.arsdigita.kernel.security.SecurityConfig.class .getPackage()) .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) + .addClass(org.libreccm.imexport.Exportable.class) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/security/UserRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/security/UserRepositoryTest.java index 40145fd57..eb384ecdf 100644 --- a/ccm-core/src/test/java/org/libreccm/security/UserRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/UserRepositoryTest.java @@ -128,6 +128,7 @@ public class UserRepositoryTest { .addClass(com.arsdigita.kernel.security.SecurityConfig.class) .addClass(com.arsdigita.kernel.KernelConfig.class) .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) + .addClass(org.libreccm.imexport.Exportable.class) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.xml",