CCM NG: Fixed several problems in tests due to several changes.

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

ccm-core/src/main/java/org/libreccm/l10n/LocalizedString.java

@@ -62,7 +62,7 @@ public class LocalizedString implements Serializable {
      */
     @ElementCollection(fetch = FetchType.EAGER)
     @MapKeyColumn(name = "LOCALE")
-    @Column(name = "LOCALIZED_VALUES")
+    @Column(name = "LOCALIZED_VALUE")
     @Basic
     @Lob
     @Type(type = "org.hibernate.type.TextType")

ccm-core/src/test/java/org/libreccm/categorization/CategoryManagerTest.java

@@ -137,6 +137,7 @@ public class CategoryManagerTest {
             .addPackage(org.libreccm.web.CcmApplication.class.getPackage())
             .addPackage(org.libreccm.workflow.Workflow.class.getPackage())
             .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage())
+            .addClass(org.libreccm.portation.Portable.class)
             .addClass(com.arsdigita.kernel.KernelConfig.class)
             .addClass(com.arsdigita.kernel.security.SecurityConfig.class)
             .addAsLibraries(getModuleDependencies())

ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryTest.java

@@ -120,6 +120,7 @@ public class CategoryRepositoryTest {
             .addPackage(org.libreccm.web.CcmApplication.class.getPackage())
             .addPackage(org.libreccm.workflow.Workflow.class.getPackage())
             .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage())
+            .addClass(org.libreccm.portation.Portable.class)
             .addClass(com.arsdigita.kernel.KernelConfig.class)
             .addClass(com.arsdigita.kernel.security.SecurityConfig.class)
             .addAsLibraries(getModuleDependencies())

ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerTest.java

@@ -105,6 +105,7 @@ public class ConfigurationManagerTest {
                 .getPackage())
             .addPackage(org.libreccm.l10n.LocalizedString.class
                 .getPackage())
+            .addClass(org.libreccm.portation.Portable.class)
             .addPackage(org.libreccm.security.Permission.class.getPackage())
             .addPackage(org.libreccm.web.CcmApplication.class.getPackage())
             .addPackage(org.libreccm.workflow.Workflow.class.getPackage())

ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java

@@ -113,6 +113,7 @@ public class CcmObjectRepositoryTest {
                 .getPackage())
             .addPackage(org.libreccm.web.CcmApplication.class.getPackage())
             .addPackage(org.libreccm.workflow.Workflow.class.getPackage())
+            .addClass(org.libreccm.portation.Portable.class)
             .addAsLibraries(getModuleDependencies())
             .addAsResource("test-persistence.xml",
                            "META-INF/persistence.xml")

ccm-core/src/test/java/org/libreccm/modules/DatasetsTest.java

@@ -24,7 +24,6 @@ import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -35,7 +34,6 @@ import org.libreccm.testutils.DatasetsVerifier;
 import java.util.Arrays;
 import java.util.Collection;
 
-import static org.junit.Assert.*;
 
 /**
  *

ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerCycleTest.java

@@ -94,6 +94,7 @@ public class DependencyTreeManagerCycleTest {
             .addClass(org.libreccm.modules.IntegrationException.class)
             .addClass(TreeNode.class)
             .addClass(org.libreccm.modules.CcmModule.class)
+            .addClass(org.libreccm.modules.ModuleEvent.class)
             .addClass(org.libreccm.modules.ModuleInfo.class)
             .addClass(org.libreccm.modules.ModuleStatus.class)
             .addClass(org.libreccm.modules.Module.class)
@@ -110,6 +111,7 @@ public class DependencyTreeManagerCycleTest {
                 org.libreccm.modules.dependencytree.test.cycle.TestModuleB.class)
             .addClass(
                 org.libreccm.modules.dependencytree.test.cycle.TestModuleC.class)
+            .addPackage(org.libreccm.pagemodel.PageModel.class.getPackage())
             .addClass(org.libreccm.web.ApplicationType.class)
             .addAsLibraries(getModuleDependencies())
             .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")

ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerTest.java

@@ -30,8 +30,6 @@ import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.resolver.api.maven.Maven;
-import org.jboss.shrinkwrap.resolver.api.maven.PomEquippedResolveStage;
 import org.junit.After;
 import org.junit.AfterClass;
 
@@ -44,7 +42,6 @@ import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.libreccm.tests.categories.IntegrationTest;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -110,6 +107,7 @@ public class DependencyTreeManagerTest {
             .addClass(org.libreccm.modules.IntegrationException.class)
             .addClass(org.libreccm.modules.TreeNode.class)
             .addClass(org.libreccm.modules.CcmModule.class)
+            .addClass(org.libreccm.modules.ModuleEvent.class)
             .addClass(org.libreccm.modules.ModuleInfo.class)
             .addClass(org.libreccm.modules.ModuleStatus.class)
             .addClass(org.libreccm.modules.Module.class)
@@ -126,6 +124,8 @@ public class DependencyTreeManagerTest {
                 org.libreccm.modules.dependencytree.test.valid.TestModuleB.class)
             .addClass(
                 org.libreccm.modules.dependencytree.test.valid.TestModuleC.class)
+//            .addClass(org.libreccm.portation.Portable.class)
+            .addPackage(org.libreccm.pagemodel.PageModel.class.getPackage())
             .addClass(org.libreccm.web.ApplicationType.class)
             .addAsLibraries(getModuleDependencies())
             .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")

ccm-core/src/test/java/org/libreccm/security/AuthorizationInterceptorTest.java

@@ -126,6 +126,7 @@ public class AuthorizationInterceptorTest {
             .addPackage(com.arsdigita.xml.formatters.DateTimeFormatter.class
                 .getPackage())
             .addClass(com.arsdigita.kernel.KernelConfig.class)
+            .addClass(org.libreccm.portation.Portable.class)
             .addAsLibraries(getModuleDependencies())
             .addAsResource("test-persistence.xml",
                            "META-INF/persistence.xml")

ccm-core/src/test/java/org/libreccm/security/ChallengeManagerTest.java

@@ -125,6 +125,7 @@ public class ChallengeManagerTest {
             .addPackage(org.libreccm.tests.categories.IntegrationTest.class
                 .getPackage())
             .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage())
+            .addClass(org.libreccm.portation.Portable.class)
             .addClass(com.arsdigita.kernel.KernelConfig.class)
             .addClass(com.arsdigita.kernel.security.SecurityConfig.class)
             .addAsLibraries(getModuleDependencies())

ccm-core/src/test/java/org/libreccm/security/GroupManagerTest.java

@@ -20,7 +20,6 @@ package org.libreccm.security;
 
 import org.apache.shiro.subject.ExecutionException;
 
-
 import javax.inject.Inject;
 
 import org.jboss.arquillian.container.test.api.Deployment;
@@ -120,6 +119,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.portation.Portable.class)
             .addAsLibraries(getModuleDependencies())
             .addAsResource("test-persistence.xml",
                            "META-INF/persistence.xml")

ccm-core/src/test/java/org/libreccm/security/GroupRepositoryTest.java

@@ -116,6 +116,7 @@ public class GroupRepositoryTest {
                 .getPackage())
             .addPackage(org.libreccm.tests.categories.IntegrationTest.class
                 .getPackage())
+            .addClass(org.libreccm.portation.Portable.class)
             .addAsLibraries(getModuleDependencies())
             .addAsResource("configs/shiro.ini", "shiro.ini")
             .addAsResource("test-persistence.xml",

ccm-core/src/test/java/org/libreccm/security/OneTimeAuthManagerTest.java

@@ -121,6 +121,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.portation.Portable.class)
             .addAsLibraries(getModuleDependencies())
             .addAsResource("configs/shiro.ini", "shiro.ini")
             .addAsResource("test-persistence.xml",

ccm-core/src/test/java/org/libreccm/security/PartyRepositoryTest.java

@@ -122,6 +122,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.portation.Portable.class)
             .addAsLibraries(getModuleDependencies())
             .addAsResource("configs/shiro.ini", "shiro.ini")
             .addAsResource("test-persistence.xml",

ccm-core/src/test/java/org/libreccm/security/PermissionCheckerTest.java

@@ -127,6 +127,7 @@ public class PermissionCheckerTest {
                 .getPackage())
             .addPackage(com.arsdigita.util.UncheckedWrapperException.class
                 .getPackage())
+            .addClass(org.libreccm.portation.Portable.class)
             .addAsLibraries(getModuleDependencies())
             .addAsResource("test-persistence.xml",
                            "META-INF/persistence.xml")

ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java

@@ -130,6 +130,7 @@ public class PermissionManagerTest {
             .addPackage(com.arsdigita.util.UncheckedWrapperException.class
                 .getPackage())
             .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage())
+            .addClass(org.libreccm.portation.Portable.class)
             .addAsLibraries(getModuleDependencies())
             .addAsResource("test-persistence.xml",
                            "META-INF/persistence.xml")

ccm-core/src/test/java/org/libreccm/security/RoleManagerTest.java

@@ -31,8 +31,6 @@ import org.jboss.arquillian.transaction.api.annotation.TransactionMode;
 import org.jboss.arquillian.transaction.api.annotation.Transactional;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.resolver.api.maven.Maven;
-import org.jboss.shrinkwrap.resolver.api.maven.PomEquippedResolveStage;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -42,12 +40,11 @@ import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.libreccm.tests.categories.IntegrationTest;
 
-import java.io.File;
-
 import javax.inject.Inject;
 
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
+
 import static org.libreccm.testutils.DependenciesHelpers.*;
 
 /**
@@ -120,6 +117,7 @@ public class RoleManagerTest {
             .addPackage(com.arsdigita.util.UncheckedWrapperException.class
                 .getPackage())
             .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage())
+            .addClass(org.libreccm.portation.Portable.class)
             .addAsLibraries(getModuleDependencies())
             .addAsResource("test-persistence.xml",
                            "META-INF/persistence.xml")

ccm-core/src/test/java/org/libreccm/security/RoleRepositoryTest.java

@@ -120,6 +120,7 @@ public class RoleRepositoryTest {
                 getPackage())
             .addPackage(org.libreccm.tests.categories.IntegrationTest.class
                 .getPackage())
+            .addClass(org.libreccm.portation.Portable.class)
             .addAsLibraries(getModuleDependencies())
             .addAsResource("configs/shiro.ini", "shiro.ini")
             .addAsResource("test-persistence.xml",

ccm-core/src/test/java/org/libreccm/security/SecuredCollectionTest.java

@@ -143,6 +143,7 @@ public class SecuredCollectionTest {
                 .getPackage())
             .addPackage(com.arsdigita.util.UncheckedWrapperException.class
                 .getPackage())
+            .addClass(org.libreccm.portation.Portable.class)
             .addAsLibraries(getModuleDependencies())
             .addAsResource("test-persistence.xml",
                            "META-INF/persistence.xml")

ccm-core/src/test/java/org/libreccm/security/SecuredIteratorTest.java

@@ -145,6 +145,7 @@ public class SecuredIteratorTest {
             .addPackage(com.arsdigita.kernel.KernelConfig.class.getPackage())
             .addPackage(com.arsdigita.util.UncheckedWrapperException.class
                 .getPackage())
+            .addClass(org.libreccm.portation.Portable.class)
             .addAsLibraries(getModuleDependencies())
             .addAsResource("test-persistence.xml",
                            "META-INF/persistence.xml")

ccm-core/src/test/java/org/libreccm/security/ShiroTest.java

@@ -116,6 +116,7 @@ public class ShiroTest {
             .addPackage(com.arsdigita.kernel.KernelConfig.class.getPackage())
             .addPackage(com.arsdigita.kernel.security.SecurityConfig.class
                 .getPackage())
+            .addClass(org.libreccm.portation.Portable.class)
             .addClass(org.libreccm.security.authorization.LabBean.class)
             .addAsLibraries(getModuleDependencies())
             .addAsResource("test-persistence.xml",

ccm-core/src/test/java/org/libreccm/security/UserManagerTest.java

@@ -20,8 +20,6 @@ package org.libreccm.security;
 
 import org.apache.shiro.subject.ExecutionException;
 
-import java.io.File;
-
 import javax.inject.Inject;
 
 import org.hibernate.exception.ConstraintViolationException;
@@ -41,8 +39,6 @@ import org.jboss.arquillian.transaction.api.annotation.TransactionMode;
 import org.jboss.arquillian.transaction.api.annotation.Transactional;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.resolver.api.maven.Maven;
-import org.jboss.shrinkwrap.resolver.api.maven.PomEquippedResolveStage;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -53,6 +49,7 @@ import org.junit.runner.RunWith;
 import org.libreccm.tests.categories.IntegrationTest;
 
 import static org.junit.Assert.*;
+
 import static org.libreccm.testutils.DependenciesHelpers.*;
 
 /**
@@ -123,6 +120,7 @@ public class UserManagerTest {
             .addPackage(com.arsdigita.util.UncheckedWrapperException.class
                 .getPackage())
             .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage())
+            .addClass(org.libreccm.portation.Portable.class)
             .addAsLibraries(getModuleDependencies())
             .addAsResource("test-persistence.xml",
                            "META-INF/persistence.xml")

ccm-core/src/test/java/org/libreccm/security/UserRepositoryTest.java

@@ -33,14 +33,12 @@ import org.jboss.arquillian.persistence.UsingDataSet;
 import org.jboss.arquillian.transaction.api.annotation.TransactionMode;
 import org.jboss.arquillian.transaction.api.annotation.Transactional;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.resolver.api.maven.Maven;
-import org.jboss.shrinkwrap.resolver.api.maven.PomEquippedResolveStage;
 import org.junit.After;
 import org.junit.AfterClass;
 
 import static org.junit.Assert.*;
+
 import static org.libreccm.testutils.DependenciesHelpers.*;
 
 import org.junit.Before;
@@ -50,7 +48,6 @@ import org.junit.runner.RunWith;
 import org.libreccm.core.EmailAddress;
 import org.libreccm.tests.categories.IntegrationTest;
 
-import java.io.File;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -126,6 +123,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.portation.Portable.class)
             .addAsLibraries(getModuleDependencies())
             .addAsResource("configs/shiro.ini", "shiro.ini")
             .addAsResource("test-persistence.xml",