Fixed some test failures

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5883 8810af33-2d31-482b-a856-94f89814c4df

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",

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")

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 obj1 = entityManager.find(CcmObject.class, 10L);
-        final CcmObject obj2 = entityManager.find(CcmObject.class, -20L);
+        final CcmObject obj2 = entityManager.find(CcmObject.class, 20L);
-        final CcmObject obj3 = entityManager.find(CcmObject.class, -30L);
+        final CcmObject obj3 = entityManager.find(CcmObject.class, 30L);
-        final CcmObject none = entityManager.find(CcmObject.class, -999L);
+        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 id1 = 10L;
-        final Long id2 = -20L;
+        final Long id2 = 20L;
-        final Long id3 = -30L;
+        final Long id3 = 30L;
-        final Long id4 = -999L;
+        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<CcmObject> obj1 = ccmObjectRepository.findById(-10L);
+        final Optional<CcmObject> obj1 = ccmObjectRepository.findById(10L);
-        final Optional<CcmObject> obj2 = ccmObjectRepository.findById(-20L);
+        final Optional<CcmObject> obj2 = ccmObjectRepository.findById(20L);
-        final Optional<CcmObject> obj3 = ccmObjectRepository.findById(-30L);
+        final Optional<CcmObject> obj3 = ccmObjectRepository.findById(30L);
-        final Optional<CcmObject> none = ccmObjectRepository.findById(-999L);
+        final Optional<CcmObject> 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);
     }

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")

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")

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",

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",

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",

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")

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.KernelConfig.class.getPackage())
-            addPackage(com.arsdigita.kernel.security.SecurityConfig.class
+            .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 {

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")

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",

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")

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")

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")

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")

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",