LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

CCM NG: 

- Refactored all Arquillian tests to use DependenciesHelper
- Migrationscripts for Role#description


git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4326 8810af33-2d31-482b-a856-94f89814c4df
pull/2/head
jensp 2016-09-27 10:54:57 +00:00
parent 5bd478e116
commit 0d1e2285d8
36 changed files with 361 additions and 601 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ccm-archetype-module/src/main/resources/archetype-resources/src/test/java/__moduleClass__Test.java
View File

@ -3,6 +3,7 @@
*/
package ${package};
import static org.libreccm.testutils.DependenciesHelpers.*;
import static org.hamcrest.CoreMatchers.*;
import org.jboss.arquillian.container.test.api.Deployment;
@ -66,23 +67,12 @@ public class ${moduleClass}Test {
@Deployment
public static WebArchive createDeployment() {
final PomEquippedResolveStage pom = Maven
.resolver()
.loadPomFromFile("pom.xml");
final PomEquippedResolveStage dependencies = pom
.importCompileAndRuntimeDependencies();
final File[] libs = dependencies.resolve().withTransitivity().asFile();
for (File lib : libs) {
System.err.printf("Adding file '%s' to test archive...%n",
lib.getName());
}
return ShrinkWrap
.create(WebArchive.class,
"LibreCCM-${package}.${moduleClass}Test.war")
.addPackage(${moduleClass}.class.getPackage())
.addAsLibraries(libs)
.addAsLibraries(getModuleDependencies())
.addAsLibraries(getCcmCoreDependencies())
.addAsResource("test-persistence.xml",
"META-INF/persistence.xml")
.addAsWebInfResource("test-web.xml", "WEB-INF/web.xml")

64
ccm-cms/src/test/java/org/librecms/contentsection/ContentItemManagerTest.java
View File

@ -65,6 +65,7 @@ import javax.persistence.TypedQuery;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import static org.libreccm.testutils.DependenciesHelpers.*;
/**
*
@ -122,36 +123,36 @@ public class ContentItemManagerTest {
@Deployment
public static WebArchive createDeployment() {
final PomEquippedResolveStage pom = Maven
.resolver()
.loadPomFromFile("pom.xml");
final PomEquippedResolveStage dependencies = pom
.importCompileAndRuntimeDependencies();
dependencies.addDependency(MavenDependencies.createDependency(
"org.libreccm:ccm-core", ScopeType.RUNTIME, false));
dependencies.addDependency(MavenDependencies.createDependency(
"org.libreccm:ccm-testutils", ScopeType.RUNTIME, false));
dependencies.addDependency(MavenDependencies.createDependency(
"net.sf.saxon:Saxon-HE", ScopeType.RUNTIME, false));
dependencies.addDependency(MavenDependencies.createDependency(
"org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven",
ScopeType.RUNTIME, false));
final File[] libsWithCcmCore = dependencies.resolve().withTransitivity()
.asFile();
final List<File> libsList = new ArrayList<>(libsWithCcmCore.length - 1);
IntStream.range(0, libsWithCcmCore.length).forEach(i -> {
final File lib = libsWithCcmCore[i];
if (!lib.getName().startsWith("ccm-core")) {
libsList.add(lib);
}
});
final File[] libs = libsList.toArray(new File[libsList.size()]);
for (File lib : libs) {
System.err.printf("Adding file '%s' to test archive...%n",
lib.getName());
}
//// final PomEquippedResolveStage pom = Maven
//// .resolver()
//// .loadPomFromFile("pom.xml");
//// final PomEquippedResolveStage dependencies = pom
//// .importCompileAndRuntimeDependencies();
//// dependencies.addDependency(MavenDependencies.createDependency(
//// "org.libreccm:ccm-core", ScopeType.RUNTIME, false));
//// dependencies.addDependency(MavenDependencies.createDependency(
//// "org.libreccm:ccm-testutils", ScopeType.RUNTIME, false));
//// dependencies.addDependency(MavenDependencies.createDependency(
//// "net.sf.saxon:Saxon-HE", ScopeType.RUNTIME, false));
//// dependencies.addDependency(MavenDependencies.createDependency(
//// "org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven",
//// ScopeType.RUNTIME, false));
//// final File[] libsWithCcmCore = dependencies.resolve().withTransitivity()
//// .asFile();
////
// final List<File> libsList = new ArrayList<>(libsWithCcmCore.length - 1);
// IntStream.range(0, libsWithCcmCore.length).forEach(i -> {
// final File lib = libsWithCcmCore[i];
// if (!lib.getName().startsWith("ccm-core")) {
// libsList.add(lib);
// }
// });
// final File[] libs = libsList.toArray(new File[libsList.size()]);
//
// for (File lib : libs) {
// System.err.printf("Adding file '%s' to test archive...%n",
// lib.getName());
// }
return ShrinkWrap
.create(WebArchive.class,
@ -197,7 +198,8 @@ public class ContentItemManagerTest {
.getPackage())
.addPackage(org.librecms.contenttypes.Article.class.getPackage())
.addClass(com.arsdigita.kernel.security.SecurityConfig.class)
.addAsLibraries(libs)
.addAsLibraries(getModuleDependencies())
.addAsLibraries(getCcmCoreDependencies())
.addAsResource("configs/shiro.ini", "shiro.ini")
.addAsResource(
"configs/org/librecms/contentsection/ContentItemManagerTest/log4j2.xml",

35
ccm-cms/src/test/java/org/librecms/contentsection/ContentItemRepositoryTest.java
View File

@ -57,6 +57,7 @@ import javax.inject.Inject;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import static org.libreccm.testutils.DependenciesHelpers.*;
/**
*
@ -96,37 +97,6 @@ public class ContentItemRepositoryTest {
@Deployment
public static WebArchive createDeployment() {
final PomEquippedResolveStage pom = Maven
.resolver()
.loadPomFromFile("pom.xml");
final PomEquippedResolveStage dependencies = pom
.importCompileAndRuntimeDependencies();
dependencies.addDependency(MavenDependencies.createDependency(
"org.libreccm:ccm-core", ScopeType.RUNTIME, false));
dependencies.addDependency(MavenDependencies.createDependency(
"org.libreccm:ccm-testutils", ScopeType.RUNTIME, false));
dependencies.addDependency(MavenDependencies.createDependency(
"net.sf.saxon:Saxon-HE", ScopeType.RUNTIME, false));
dependencies.addDependency(MavenDependencies.createDependency(
"org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven",
ScopeType.RUNTIME, false));
final File[] libsWithCcmCore = dependencies.resolve().withTransitivity()
.asFile();
final List<File> libsList = new ArrayList<>(libsWithCcmCore.length - 1);
IntStream.range(0, libsWithCcmCore.length).forEach(i -> {
final File lib = libsWithCcmCore[i];
if (!lib.getName().startsWith("ccm-core")) {
libsList.add(lib);
}
});
final File[] libs = libsList.toArray(new File[libsList.size()]);
for (File lib : libs) {
System.err.printf("Adding file '%s' to test archive...%n",
lib.getName());
}
return ShrinkWrap
.create(WebArchive.class,
"LibreCCM-org.librecms.contentsection.ContentItemRepositoryTest.war")
@ -170,7 +140,8 @@ public class ContentItemRepositoryTest {
.addPackage(org.librecms.contentsection.ContentSection.class
.getPackage())
.addPackage(org.librecms.contenttypes.Article.class.getPackage())
.addAsLibraries(libs)
.addAsLibraries(getModuleDependencies())
.addAsLibraries(getCcmCoreDependencies())
.addAsResource("test-persistence.xml",
"META-INF/persistence.xml")
.addAsWebInfResource("test-web.xml", "WEB-INF/web.xml")

66
ccm-cms/src/test/java/org/librecms/contentsection/ContentSectionManagerTest.java
View File

@ -60,6 +60,7 @@ import javax.inject.Inject;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import static org.librecms.CmsConstants.*;
import static org.libreccm.testutils.DependenciesHelpers.*;
/**
*
@ -108,37 +109,37 @@ public class ContentSectionManagerTest {
@Deployment
public static WebArchive createDeployment() {
final PomEquippedResolveStage pom = Maven
.resolver()
.loadPomFromFile("pom.xml");
final PomEquippedResolveStage dependencies = pom
.importCompileAndRuntimeDependencies();
dependencies.addDependency(MavenDependencies.createDependency(
"org.libreccm:ccm-core", ScopeType.RUNTIME, false));
dependencies.addDependency(MavenDependencies.createDependency(
"org.libreccm:ccm-testutils", ScopeType.RUNTIME, false));
dependencies.addDependency(MavenDependencies.createDependency(
"net.sf.saxon:Saxon-HE", ScopeType.RUNTIME, false));
dependencies.addDependency(MavenDependencies.createDependency(
"org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven",
ScopeType.RUNTIME, false));
final File[] libsWithCcmCore = dependencies.resolve().withTransitivity()
.asFile();
final List<File> libsList = new ArrayList<>(libsWithCcmCore.length - 1);
IntStream.range(0, libsWithCcmCore.length).forEach(i -> {
final File lib = libsWithCcmCore[i];
if (!lib.getName().startsWith("ccm-core")) {
libsList.add(lib);
}
});
final File[] libs = libsList.toArray(new File[libsList.size()]);
for (File lib : libs) {
System.err.printf("Adding file '%s' to test archive...%n",
lib.getName());
}
// final PomEquippedResolveStage pom = Maven
// .resolver()
// .loadPomFromFile("pom.xml");
// final PomEquippedResolveStage dependencies = pom
// .importCompileAndRuntimeDependencies();
// dependencies.addDependency(MavenDependencies.createDependency(
// "org.libreccm:ccm-core", ScopeType.RUNTIME, false));
// dependencies.addDependency(MavenDependencies.createDependency(
// "org.libreccm:ccm-testutils", ScopeType.RUNTIME, false));
// dependencies.addDependency(MavenDependencies.createDependency(
// "net.sf.saxon:Saxon-HE", ScopeType.RUNTIME, false));
// dependencies.addDependency(MavenDependencies.createDependency(
// "org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven",
// ScopeType.RUNTIME, false));
// final File[] libsWithCcmCore = dependencies.resolve().withTransitivity()
// .asFile();
//
// final List<File> libsList = new ArrayList<>(libsWithCcmCore.length - 1);
// IntStream.range(0, libsWithCcmCore.length).forEach(i -> {
// final File lib = libsWithCcmCore[i];
// if (!lib.getName().startsWith("ccm-core")) {
// libsList.add(lib);
// }
// });
// final File[] libs = libsList.toArray(new File[libsList.size()]);
//
// for (File lib : libs) {
// System.err.printf("Adding file '%s' to test archive...%n",
// lib.getName());
// }
//
return ShrinkWrap
.create(WebArchive.class,
"LibreCCM-org.libreccm.cms.contentsection.ContentSectionManagerTest.war").
@ -181,7 +182,8 @@ public class ContentSectionManagerTest {
.getPackage())
.addPackage(org.librecms.lifecycle.Lifecycle.class.getPackage())
.addPackage(ContentSection.class.getPackage())
.addAsLibraries(libs)
.addAsLibraries(getModuleDependencies())
.addAsLibraries(getCcmCoreDependencies())
.addAsResource("test-persistence.xml",
"META-INF/persistence.xml")
.addAsWebInfResource("test-web.xml", "WEB-INF/web.xml")

1
ccm-core/src/main/java/org/libreccm/categorization/Category.java
View File

@ -46,7 +46,6 @@ import javax.persistence.NamedEntityGraph;
import javax.persistence.NamedEntityGraphs;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.NamedSubgraph;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.validation.constraints.Pattern;

13
ccm-core/src/main/java/org/libreccm/security/Role.java
View File

@ -32,12 +32,16 @@ import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import javax.persistence.AssociationOverride;
import javax.persistence.Column;
import javax.persistence.Embedded;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
import javax.persistence.NamedAttributeNode;
import javax.persistence.NamedEntityGraph;
import javax.persistence.NamedEntityGraphs;
@ -149,7 +153,14 @@ public class Role implements Serializable {
/**
* An optional description for a role.
*/
@Column(name = "DESCRIPTION", length = 2048)
@Embedded
@AssociationOverride(
name = "values",
joinTable = @JoinTable(name = "ROLE_DESCRIPTIONS",
schema = DB_SCHEMA,
joinColumns = {
@JoinColumn(name = "ROLE_ID")
}))
@XmlElement(name = "description", namespace = CORE_XML_NS)
private LocalizedString description;

11
ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_8__add_role_description.sql 100644
View File

@ -0,0 +1,11 @@
create table CCM_CORE.ROLE_DESCRIPTIONS (
ROLE_ID bigint not null,
LOCALIZED_VALUE longvarchar,
LOCALE varchar(255) not null,
primary key (ROLE_ID, LOCALE)
);
alter table CCM_CORE.ROLE_DESCRIPTIONS
add constraint FKo09bh4j3k3k0ph3awvjwx31ft
foreign key (ROLE_ID)
references CCM_CORE.CCM_ROLES;

11
ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_8__add_role_description.sql 100644
View File

@ -0,0 +1,11 @@
create table CCM_CORE.ROLE_DESCRIPTIONS (
ROLE_ID bigint not null,
LOCALIZED_VALUE longvarchar,
LOCALE varchar(255) not null,
primary key (ROLE_ID, LOCALE)
);
alter table CCM_CORE.ROLE_DESCRIPTIONS
add constraint FKo09bh4j3k3k0ph3awvjwx31ft
foreign key (ROLE_ID)
references CCM_CORE.CCM_ROLES;

19
ccm-core/src/test/java/com/arsdigita/kernel/security/SecurityConfigTest.java
View File

@ -31,17 +31,15 @@ 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;
import static org.junit.Assert.*;
import static org.libreccm.testutils.DependenciesHelpers.*;
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.libreccm.categorization.Categorization;
import org.libreccm.core.CcmObject;
@ -53,7 +51,6 @@ import org.libreccm.tests.categories.IntegrationTest;
import org.libreccm.web.ApplicationRepository;
import org.libreccm.workflow.Workflow;
import java.io.File;
import java.util.List;
/**
@ -86,18 +83,6 @@ public class SecurityConfigTest {
@Deployment
public static WebArchive createDeployment() {
final PomEquippedResolveStage pom = Maven
.resolver()
.loadPomFromFile("pom.xml");
final PomEquippedResolveStage dependencies = pom
.importCompileAndRuntimeDependencies();
final File[] libs = dependencies.resolve().withTransitivity().asFile();
for (File lib : libs) {
System.err.printf("Adding file '%s' to test archive...%n",
lib.getName());
}
return ShrinkWrap
.create(WebArchive.class,
"LibreCCM-com.arsdigita.kernel.security.SecurityConfigTest.war")
@ -116,7 +101,7 @@ public class SecurityConfigTest {
.addPackage(XML.class.getPackage())
.addPackage(DateFormatter.class.getPackage())
.addPackage(IntegrationTest.class.getPackage())
.addAsLibraries(libs)
.addAsLibraries(getModuleDependencies())
.addAsResource(
"configs/com/arsdigita/kernel/security/SecurityConfigTest/ccm-core.config",
"ccm-core.config")

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

@ -58,6 +58,7 @@ import javax.persistence.TypedQuery;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import static org.libreccm.testutils.DependenciesHelpers.*;
/**
*
@ -115,17 +116,17 @@ public class CategoryManagerTest {
@Deployment
public static WebArchive createDeployment() {
final PomEquippedResolveStage pom = Maven
.resolver()
.loadPomFromFile("pom.xml");
final PomEquippedResolveStage dependencies = pom
.importCompileAndRuntimeDependencies();
final File[] libs = dependencies.resolve().withTransitivity().asFile();
for (File lib : libs) {
System.err.printf("Adding file '%s' to test archive...%n",
lib.getName());
}
// final PomEquippedResolveStage pom = Maven
// .resolver()
// .loadPomFromFile("pom.xml");
// final PomEquippedResolveStage dependencies = pom
// .importCompileAndRuntimeDependencies();
// final File[] libs = dependencies.resolve().withTransitivity().asFile();
//
// for (File lib : libs) {
// System.err.printf("Adding file '%s' to test archive...%n",
// lib.getName());
// }
return ShrinkWrap
.create(WebArchive.class,
@ -150,7 +151,7 @@ public class CategoryManagerTest {
.addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage())
.addClass(com.arsdigita.kernel.KernelConfig.class)
.addClass(com.arsdigita.kernel.security.SecurityConfig.class)
.addAsLibraries(libs)
.addAsLibraries(getModuleDependencies())
.addAsResource("configs/shiro.ini", "shiro.ini")
.addAsResource("test-persistence.xml",
"META-INF/persistence.xml")

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

@ -22,7 +22,6 @@ import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.authz.UnauthorizedException;
import org.apache.shiro.subject.Subject;
import java.io.File;
import javax.inject.Inject;
import javax.persistence.EntityManager;
@ -40,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 +50,7 @@ import org.libreccm.tests.categories.IntegrationTest;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import static org.libreccm.testutils.DependenciesHelpers.*;
/**
*
@ -101,18 +99,6 @@ public class CategoryRepositoryTest {
@Deployment
public static WebArchive createDeployment() {
final PomEquippedResolveStage pom = Maven
.resolver()
.loadPomFromFile("pom.xml");
final PomEquippedResolveStage dependencies = pom
.importCompileAndRuntimeDependencies();
final File[] libs = dependencies.resolve().withTransitivity().asFile();
for (File lib : libs) {
System.err.printf("Adding file '%s' to test archive...%n",
lib.getName());
}
return ShrinkWrap
.create(WebArchive.class,
"LibreCCM-org.libreccm.categorization.CategoryRepositoryTest.war")
@ -136,7 +122,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)
.addAsLibraries(libs)
.addAsLibraries(getModuleDependencies())
.addAsResource("configs/shiro.ini", "shiro.ini")
.addAsResource("test-persistence.xml",
"META-INF/persistence.xml")

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

@ -50,6 +50,7 @@ import org.libreccm.tests.categories.IntegrationTest;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import static org.libreccm.testutils.DependenciesHelpers.*;
/**
*
@ -90,17 +91,17 @@ public class ConfigurationManagerTest {
@Deployment
public static WebArchive createDeployment() {
final PomEquippedResolveStage pom = Maven
.resolver()
.loadPomFromFile("pom.xml");
final PomEquippedResolveStage dependencies = pom
.importCompileAndRuntimeDependencies();
final File[] libs = dependencies.resolve().withTransitivity().asFile();
for (File lib : libs) {
System.err.printf("Adding file '%s' to test archive...%n",
lib.getName());
}
// final PomEquippedResolveStage pom = Maven
// .resolver()
// .loadPomFromFile("pom.xml");
// final PomEquippedResolveStage dependencies = pom
// .importCompileAndRuntimeDependencies();
// final File[] libs = dependencies.resolve().withTransitivity().asFile();
//
// for (File lib : libs) {
// System.err.printf("Adding file '%s' to test archive...%n",
// lib.getName());
// }
return ShrinkWrap
.create(WebArchive.class,
@ -128,7 +129,7 @@ public class ConfigurationManagerTest {
.addClass(com.arsdigita.kernel.KernelConfig.class)
.addClass(com.arsdigita.kernel.security.SecurityConfig.class)
.addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage())
.addAsLibraries(libs)
.addAsLibraries(getModuleDependencies())
.addAsResource("configs/shiro.ini", "shiro.ini")
.addAsResource("test-persistence.xml",
"META-INF/persistence.xml")

15
ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java
View File

@ -52,6 +52,7 @@ import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import static org.junit.Assert.*;
import static org.libreccm.testutils.DependenciesHelpers.*;
/**
*
@ -91,18 +92,6 @@ public class CcmObjectRepositoryTest {
@Deployment
public static WebArchive createDeployment() {
final PomEquippedResolveStage pom = Maven
.resolver()
.loadPomFromFile("pom.xml");
final PomEquippedResolveStage dependencies = pom
.importCompileAndRuntimeDependencies();
final File[] libs = dependencies.resolve().withTransitivity().asFile();
for (File lib : libs) {
System.err.printf("Adding file '%s' to test archive...%n",
lib.getName());
}
return ShrinkWrap
.create(WebArchive.class,
"LibreCCM-org.libreccm.core.CcmObjectRepositoryTest.war")
@ -123,7 +112,7 @@ public class CcmObjectRepositoryTest {
.getPackage())
.addPackage(org.libreccm.web.CcmApplication.class.getPackage())
.addPackage(org.libreccm.workflow.Workflow.class.getPackage())
.addAsLibraries(libs)
.addAsLibraries(getModuleDependencies())
.addAsResource("test-persistence.xml",
"META-INF/persistence.xml")
.addAsWebInfResource("test-web.xml", "WEB-INF/web.xml")

24
ccm-core/src/test/java/org/libreccm/modules/ConfigurationLoaderTest.java
View File

@ -28,8 +28,6 @@ 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 org.junit.Before;
@ -40,11 +38,12 @@ import org.junit.runner.RunWith;
import org.libreccm.configuration.ExampleConfiguration;
import org.libreccm.tests.categories.IntegrationTest;
import java.io.File;
import javax.inject.Inject;
import javax.persistence.EntityManager;
import static org.libreccm.testutils.DependenciesHelpers.*;
/**
*
@ -81,46 +80,29 @@ public class ConfigurationLoaderTest {
@Deployment
public static WebArchive createDeployment() {
final PomEquippedResolveStage pom = Maven
.resolver()
.loadPomFromFile("pom.xml");
final PomEquippedResolveStage dependencies = pom
.importCompileAndRuntimeDependencies();
final File[] libs = dependencies.resolve().withTransitivity().asFile();
for (File lib : libs) {
System.err.printf("Adding file '%s' to test archive...%n",
lib.getName());
}
return ShrinkWrap
.create(WebArchive.class,
"LibreCCM-org.libreccm.modules.ConfigurationLoaderTest.war")
//.addPackage(org.libreccm.categorization.Category.class.getPackage())
.addPackage(org.libreccm.configuration.Configuration.class
.getPackage())
//.addPackage(org.libreccm.core.CcmObject.class.getPackage())
.addPackage(org.libreccm.jpa.EntityManagerProducer.class
.getPackage())
.addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class
.getPackage())
.addPackage(org.libreccm.l10n.LocalizedString.class.getPackage())
.addClass(org.libreccm.modules.ConfigurationLoader.class)
//.addPackage(org.libreccm.security.Permission.class.getPackage())
//.addPackage(org.libreccm.workflow.Workflow.class.getPackage())
.addPackage(org.libreccm.tests.categories.IntegrationTest.class
.getPackage())
.addPackage(org.libreccm.testutils.EqualsVerifier.class.
getPackage())
.addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage())
.addAsLibraries(libs)
.addAsLibraries(getModuleDependencies())
.addAsResource("test-persistence.xml",
"META-INF/persistence.xml")
.addAsResource(
"configs/org/libreccm/modules/ConfigurationLoaderTest/"
+ "log4j2.xml",
"log4j2.xml")
// .addAsWebInfResource(EmptyAsset.INSTANCE, "web.xml")
.addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
.addAsResource(
"configs/org/libreccm/modules/ConfigurationLoaderTest/"

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

@ -26,8 +26,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,10 +42,11 @@ import org.libreccm.modules.dependencytree.test.cycle.TestModuleC;
import org.libreccm.modules.dependencytree.test.cycle.TestModuleRoot;
import org.libreccm.tests.categories.IntegrationTest;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import static org.libreccm.testutils.DependenciesHelpers.*;
/**
*
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
@ -85,18 +84,6 @@ public class DependencyTreeManagerCycleTest {
@Deployment
public static WebArchive createDeployment() {
final PomEquippedResolveStage pom = Maven
.resolver()
.loadPomFromFile("pom.xml");
final PomEquippedResolveStage dependencies = pom
.importCompileAndRuntimeDependencies();
final File[] libs = dependencies.resolve().withTransitivity().asFile();
for (File lib : libs) {
System.err.printf("Adding file '%s' to test archive...%n",
lib.getName());
}
return ShrinkWrap
.create(WebArchive.class,
"LibreCCM-org.libreccm.modules.dependencytree.DependencyTreeManagerCycleTest.war")
@ -124,7 +111,7 @@ public class DependencyTreeManagerCycleTest {
.addClass(
org.libreccm.modules.dependencytree.test.cycle.TestModuleC.class)
.addClass(org.libreccm.web.ApplicationType.class)
.addAsLibraries(libs)
.addAsLibraries(getModuleDependencies())
.addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
.addAsResource(
"module-info/dependency-tree-manager-cycle-test/module-root.properties",

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

@ -48,6 +48,8 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
import static org.libreccm.testutils.DependenciesHelpers.*;
/**
*
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
@ -86,17 +88,17 @@ public class DependencyTreeManagerTest {
@Deployment
public static WebArchive createDeployment() {
final PomEquippedResolveStage pom = Maven
.resolver()
.loadPomFromFile("pom.xml");
final PomEquippedResolveStage dependencies = pom
.importCompileAndRuntimeDependencies();
final File[] libs = dependencies.resolve().withTransitivity().asFile();
for (File lib : libs) {
System.err.printf("Adding file '%s' to test archive...%n",
lib.getName());
}
// final PomEquippedResolveStage pom = Maven
// .resolver()
// .loadPomFromFile("pom.xml");
// final PomEquippedResolveStage dependencies = pom
// .importCompileAndRuntimeDependencies();
// final File[] libs = dependencies.resolve().withTransitivity().asFile();
//
// for (File lib : libs) {
// System.err.printf("Adding file '%s' to test archive...%n",
// lib.getName());
// }
return ShrinkWrap
.create(WebArchive.class,
@ -125,7 +127,7 @@ public class DependencyTreeManagerTest {
.addClass(
org.libreccm.modules.dependencytree.test.valid.TestModuleC.class)
.addClass(org.libreccm.web.ApplicationType.class)
.addAsLibraries(libs)
.addAsLibraries(getModuleDependencies())
.addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
.addAsResource(
"module-info/dependency-tree-manager-test/module-root.properties",

1
ccm-core/src/test/java/org/libreccm/modules/DependencyTreeManagerValidateVersionTest.java
View File

@ -18,7 +18,6 @@
*/
package org.libreccm.modules;
import org.libreccm.modules.DependencyTreeManager;
import static org.hamcrest.Matchers.*;

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

@ -32,8 +32,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;
@ -46,12 +44,12 @@ import org.libreccm.core.CcmObjectRepository;
import org.libreccm.security.authorization.LabBean;
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.*;
/**
*
@ -94,18 +92,6 @@ public class AuthorizationInterceptorTest {
@Deployment
public static WebArchive createDeployment() {
final PomEquippedResolveStage pom = Maven
.resolver()
.loadPomFromFile("pom.xml");
final PomEquippedResolveStage dependencies = pom.
importCompileAndRuntimeDependencies();
final File[] libs = dependencies.resolve().withTransitivity().asFile();
for (File lib : libs) {
System.err.printf("Adding file '%s' to test archive...%n",
lib.getName());
}
return ShrinkWrap
.create(WebArchive.class,
"LibreCCM-org.libreccm.security.AuthorizationInterceptorTest.war")
@ -140,7 +126,7 @@ public class AuthorizationInterceptorTest {
.addPackage(com.arsdigita.xml.formatters.DateTimeFormatter.class
.getPackage())
.addClass(com.arsdigita.kernel.KernelConfig.class)
.addAsLibraries(libs)
.addAsLibraries(getModuleDependencies())
.addAsResource("test-persistence.xml",
"META-INF/persistence.xml")
.addAsResource("configs/shiro.ini", "shiro.ini")

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

@ -30,10 +30,7 @@ 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 org.junit.Before;
@ -43,13 +40,13 @@ 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 javax.servlet.ServletContext;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import static org.libreccm.testutils.DependenciesHelpers.*;
/**
*
@ -98,18 +95,6 @@ public class ChallengeManagerTest {
@Deployment
public static WebArchive createDeployment() {
final PomEquippedResolveStage pom = Maven
.resolver()
.loadPomFromFile("pom.xml");
final PomEquippedResolveStage dependencies = pom.
importCompileAndRuntimeDependencies();
final File[] libs = dependencies.resolve().withTransitivity().asFile();
for (File lib : libs) {
System.err.printf("Adding file '%s' to test archive...%n",
lib.getName());
}
return ShrinkWrap
.create(WebArchive.class,
"LibreCCM-org.libreccm.security.ChallengeManagerTest.war")
@ -142,7 +127,7 @@ public class ChallengeManagerTest {
.addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage())
.addClass(com.arsdigita.kernel.KernelConfig.class)
.addClass(com.arsdigita.kernel.security.SecurityConfig.class)
.addAsLibraries(libs)
.addAsLibraries(getModuleDependencies())
.addAsResource("configs/shiro.ini", "shiro.ini")
.addAsResource("test-persistence.xml",
"META-INF/persistence.xml")

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

@ -20,7 +20,6 @@ package org.libreccm.security;
import org.apache.shiro.subject.ExecutionException;
import java.io.File;
import javax.inject.Inject;
@ -35,10 +34,7 @@ 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 org.junit.Before;
@ -50,6 +46,7 @@ import org.libreccm.tests.categories.IntegrationTest;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import static org.libreccm.testutils.DependenciesHelpers.*;
/**
*
@ -95,32 +92,21 @@ public class GroupManagerTest {
@Deployment
public static WebArchive createDeployment() {
final PomEquippedResolveStage pom = Maven
.resolver()
.loadPomFromFile("pom.xml");
final PomEquippedResolveStage dependencies = pom.
importCompileAndRuntimeDependencies();
final File[] libs = dependencies.resolve().withTransitivity().asFile();
for (File lib : libs) {
System.err.printf("Adding file '%s' to test archive...%n",
lib.getName());
}
return ShrinkWrap
.create(WebArchive.class,
"LibreCCM-org.libreccm.security.GroupManagerTest.war")
.addPackage(org.libreccm.categorization.Categorization.class
.getPackage())
.addPackage(org.libreccm.configuration.ConfigurationManager.class
.addPackage(
org.libreccm.configuration.ConfigurationManager.class
.getPackage())
.addPackage(org.libreccm.core.CcmObject.class.getPackage())
.addPackage(org.libreccm.jpa.EntityManagerProducer.class
.getPackage())
.addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class
.getPackage())
.addPackage(org.libreccm.l10n.LocalizedString.class.getPackage())
.addPackage(org.libreccm.security.User.class.getPackage())
.addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()).
addPackage(org.libreccm.security.User.class.getPackage())
.addPackage(org.libreccm.tests.categories.IntegrationTest.class
.getPackage())
.addPackage(org.libreccm.testutils.EqualsVerifier.class
@ -134,7 +120,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)
.addAsLibraries(libs)
.addAsLibraries(getModuleDependencies())
.addAsResource("test-persistence.xml",
"META-INF/persistence.xml")
.addAsWebInfResource("test-web.xml", "web.xml")

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

@ -18,7 +18,6 @@
*/
package org.libreccm.security;
import java.io.File;
import java.util.List;
import javax.inject.Inject;
@ -40,12 +39,11 @@ 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;
import org.junit.BeforeClass;
@ -98,18 +96,6 @@ public class GroupRepositoryTest {
@Deployment
public static WebArchive createDeployment() {
final PomEquippedResolveStage pom = Maven
.resolver()
.loadPomFromFile("pom.xml");
final PomEquippedResolveStage dependencies = pom.
importCompileAndRuntimeDependencies();
final File[] libs = dependencies.resolve().withTransitivity().asFile();
for (File lib : libs) {
System.err.printf("Adding file '%s' to test archive...%n",
lib.getName());
}
return ShrinkWrap
.create(WebArchive.class,
"LibreCCM-org.libreccm.security.UserRepositoryTest.war")
@ -130,7 +116,7 @@ public class GroupRepositoryTest {
.getPackage())
.addPackage(org.libreccm.tests.categories.IntegrationTest.class
.getPackage())
.addAsLibraries(libs)
.addAsLibraries(getModuleDependencies())
.addAsResource("configs/shiro.ini", "shiro.ini")
.addAsResource("test-persistence.xml",
"META-INF/persistence.xml")

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

@ -20,7 +20,6 @@ package org.libreccm.security;
import org.apache.shiro.subject.ExecutionException;
import java.io.File;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.time.temporal.ChronoUnit;
@ -39,10 +38,7 @@ 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 org.junit.Before;
@ -56,6 +52,7 @@ import java.util.List;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import static org.libreccm.testutils.DependenciesHelpers.*;
/**
*
@ -99,18 +96,6 @@ public class OneTimeAuthManagerTest {
@Deployment
public static WebArchive createDeployment() {
final PomEquippedResolveStage pom = Maven
.resolver()
.loadPomFromFile("pom.xml");
final PomEquippedResolveStage dependencies = pom.
importCompileAndRuntimeDependencies();
final File[] libs = dependencies.resolve().withTransitivity().asFile();
for (File lib : libs) {
System.err.printf("Adding file '%s' to test archive...%n",
lib.getName());
}
return ShrinkWrap
.create(WebArchive.class,
"LibreCCM-org.libreccm.security.OneTimeAuthManagerTest.war")
@ -136,7 +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)
.addAsLibraries(libs)
.addAsLibraries(getModuleDependencies())
.addAsResource("configs/shiro.ini", "shiro.ini")
.addAsResource("test-persistence.xml",
"META-INF/persistence.xml")

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

@ -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;
@ -47,11 +45,11 @@ import javax.inject.Inject;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import java.io.File;
import java.util.List;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.assertThat;
import static org.libreccm.testutils.DependenciesHelpers.*;
/**
*
@ -99,18 +97,6 @@ public class PartyRepositoryTest {
@Deployment
public static WebArchive createDeployment() {
final PomEquippedResolveStage pom = Maven
.resolver()
.loadPomFromFile("pom.xml");
final PomEquippedResolveStage dependencies = pom.
importCompileAndRuntimeDependencies();
final File[] libs = dependencies.resolve().withTransitivity().asFile();
for (File lib : libs) {
System.err.printf("Adding file '%s' to test archive...%n",
lib.getName());
}
return ShrinkWrap
.create(WebArchive.class,
"LibreCCM-org.libreccm.security.UserRepositoryTest.war")
@ -136,7 +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())
.addAsLibraries(libs)
.addAsLibraries(getModuleDependencies())
.addAsResource("configs/shiro.ini", "shiro.ini")
.addAsResource("test-persistence.xml",
"META-INF/persistence.xml")

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

@ -20,7 +20,6 @@ package org.libreccm.security;
import static org.libreccm.core.CoreConstants.*;
import java.io.File;
import java.util.concurrent.Callable;
import javax.inject.Inject;
@ -40,8 +39,6 @@ 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 org.junit.Before;
@ -58,6 +55,7 @@ import java.util.List;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import static org.libreccm.testutils.DependenciesHelpers.*;
/**
*
@ -103,18 +101,6 @@ public class PermissionCheckerTest {
@Deployment
public static WebArchive createDeployment() {
final PomEquippedResolveStage pom = Maven
.resolver()
.loadPomFromFile("pom.xml");
final PomEquippedResolveStage dependencies = pom.
importCompileAndRuntimeDependencies();
final File[] libs = dependencies.resolve().withTransitivity().asFile();
for (File lib : libs) {
System.err.printf("Adding file '%s' to test archive...%n",
lib.getName());
}
return ShrinkWrap
.create(WebArchive.class,
"LibreCCM-org.libreccm.security.PermissionCheckerTest.war")
@ -141,7 +127,7 @@ public class PermissionCheckerTest {
.getPackage())
.addPackage(com.arsdigita.util.UncheckedWrapperException.class
.getPackage())
.addAsLibraries(libs)
.addAsLibraries(getModuleDependencies())
.addAsResource("test-persistence.xml",
"META-INF/persistence.xml")
.addAsResource("configs/shiro.ini", "shiro.ini")

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

@ -30,10 +30,7 @@ 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 org.junit.Before;
@ -45,13 +42,13 @@ import org.libreccm.core.CcmObject;
import org.libreccm.core.CcmObjectRepository;
import org.libreccm.tests.categories.IntegrationTest;
import java.io.File;
import javax.inject.Inject;
import javax.persistence.EntityManager;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import static org.libreccm.testutils.DependenciesHelpers.*;
/**
*
@ -100,18 +97,6 @@ public class PermissionManagerTest {
@Deployment
public static WebArchive createDeployment() {
final PomEquippedResolveStage pom = Maven
.resolver()
.loadPomFromFile("pom.xml");
final PomEquippedResolveStage dependencies = pom.
importCompileAndRuntimeDependencies();
final File[] libs = dependencies.resolve().withTransitivity().asFile();
for (File lib : libs) {
System.err.printf("Adding file '%s' to test archive...%n",
lib.getName());
}
return ShrinkWrap
.create(WebArchive.class,
"LibreCCM-org.libreccm.security.PermissionManagerTest.war")
@ -138,7 +123,7 @@ public class PermissionManagerTest {
.addPackage(com.arsdigita.util.UncheckedWrapperException.class
.getPackage())
.addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage())
.addAsLibraries(libs)
.addAsLibraries(getModuleDependencies())
.addAsResource("test-persistence.xml",
"META-INF/persistence.xml")
.addAsResource("configs/shiro.ini", "shiro.ini")

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

@ -48,6 +48,7 @@ import javax.inject.Inject;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import static org.libreccm.testutils.DependenciesHelpers.*;
/**
*
@ -93,18 +94,6 @@ public class RoleManagerTest {
@Deployment
public static WebArchive createDeployment() {
final PomEquippedResolveStage pom = Maven
.resolver()
.loadPomFromFile("pom.xml");
final PomEquippedResolveStage dependencies = pom.
importCompileAndRuntimeDependencies();
final File[] libs = dependencies.resolve().withTransitivity().asFile();
for (File lib : libs) {
System.err.printf("Adding file '%s' to test archive...%n",
lib.getName());
}
return ShrinkWrap
.create(WebArchive.class,
"LibreCCM-org.libreccm.security.RoleManagerTest.war")
@ -131,7 +120,7 @@ public class RoleManagerTest {
.addPackage(com.arsdigita.util.UncheckedWrapperException.class
.getPackage())
.addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage())
.addAsLibraries(libs)
.addAsLibraries(getModuleDependencies())
.addAsResource("test-persistence.xml",
"META-INF/persistence.xml")
.addAsResource("configs/shiro.ini", "shiro.ini")

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

@ -51,6 +51,7 @@ import javax.persistence.PersistenceContext;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import static org.libreccm.testutils.DependenciesHelpers.*;
/**
* Tests for the {@link RoleRepository}. Note. We are not enabling the
@ -96,18 +97,6 @@ public class RoleRepositoryTest {
@Deployment
public static WebArchive createDeployment() {
final PomEquippedResolveStage pom = Maven
.resolver()
.loadPomFromFile("pom.xml");
final PomEquippedResolveStage dependencies = pom.
importCompileAndRuntimeDependencies();
final File[] libs = dependencies.resolve().withTransitivity().asFile();
for (File lib : libs) {
System.err.printf("Adding file '%s' to test archive...%n",
lib.getName());
}
return ShrinkWrap
.create(WebArchive.class,
"LibreCCM-org.libreccm.security.RoleRepositoryTest.war")
@ -127,7 +116,7 @@ public class RoleRepositoryTest {
.addPackage(org.libreccm.testutils.EqualsVerifier.class.getPackage())
.addPackage(org.libreccm.tests.categories.IntegrationTest.class
.getPackage())
.addAsLibraries(libs)
.addAsLibraries(getModuleDependencies())
.addAsResource("configs/shiro.ini", "shiro.ini")
.addAsResource("test-persistence.xml",
"META-INF/persistence.xml")

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

@ -19,7 +19,6 @@
package org.libreccm.security;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.Callable;
@ -39,8 +38,6 @@ 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 org.junit.Before;
@ -54,6 +51,7 @@ import org.libreccm.tests.categories.IntegrationTest;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import static org.libreccm.testutils.DependenciesHelpers.*;
/**
*
@ -77,7 +75,6 @@ public class SecuredCollectionTest {
@Inject
private CcmObjectRepository objectRepository;
//private List<CcmObject> list;
private SecuredCollection<CcmObject> collection1;
private SecuredCollection<CcmObject> collection2;
private SecuredCollection<CcmObject> collection3;
@ -121,18 +118,6 @@ public class SecuredCollectionTest {
@Deployment
public static WebArchive createDeployment() {
final PomEquippedResolveStage pom = Maven
.resolver()
.loadPomFromFile("pom.xml");
final PomEquippedResolveStage dependencies = pom.
importCompileAndRuntimeDependencies();
final File[] libs = dependencies.resolve().withTransitivity().asFile();
for (File lib : libs) {
System.err.printf("Adding file '%s' to test archive...%n",
lib.getName());
}
return ShrinkWrap
.create(WebArchive.class,
"LibreCCM-org.libreccm.security.SecuredCollectionTest.war")
@ -158,7 +143,7 @@ public class SecuredCollectionTest {
.getPackage())
.addPackage(com.arsdigita.util.UncheckedWrapperException.class
.getPackage())
.addAsLibraries(libs)
.addAsLibraries(getModuleDependencies())
.addAsResource("test-persistence.xml",
"META-INF/persistence.xml")
.addAsResource("configs/shiro.ini", "shiro.ini")

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

@ -32,8 +32,6 @@ 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 org.junit.Before;
@ -45,7 +43,6 @@ import org.libreccm.core.CcmObject;
import org.libreccm.core.CcmObjectRepository;
import org.libreccm.tests.categories.IntegrationTest;
import java.io.File;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@ -55,6 +52,7 @@ import javax.inject.Inject;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import static org.libreccm.testutils.DependenciesHelpers.*;
/**
*
@ -122,18 +120,6 @@ public class SecuredIteratorTest {
@Deployment
public static WebArchive createDeployment() {
final PomEquippedResolveStage pom = Maven
.resolver()
.loadPomFromFile("pom.xml");
final PomEquippedResolveStage dependencies = pom.
importCompileAndRuntimeDependencies();
final File[] libs = dependencies.resolve().withTransitivity().asFile();
for (File lib : libs) {
System.err.printf("Adding file '%s' to test archive...%n",
lib.getName());
}
return ShrinkWrap
.create(WebArchive.class,
"LibreCCM-org.libreccm.security.SecuredIteratorTest.war")
@ -159,7 +145,7 @@ public class SecuredIteratorTest {
.addPackage(com.arsdigita.kernel.KernelConfig.class.getPackage())
.addPackage(com.arsdigita.util.UncheckedWrapperException.class
.getPackage())
.addAsLibraries(libs)
.addAsLibraries(getModuleDependencies())
.addAsResource("test-persistence.xml",
"META-INF/persistence.xml")
.addAsResource("configs/shiro.ini", "shiro.ini")

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

@ -21,7 +21,6 @@ package org.libreccm.security;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.UsernamePasswordToken;
import java.io.File;
import javax.inject.Inject;
@ -41,8 +40,6 @@ 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 org.junit.Before;
@ -54,6 +51,7 @@ import org.libreccm.tests.categories.IntegrationTest;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;
import static org.libreccm.testutils.DependenciesHelpers.*;
/**
*
@ -90,18 +88,6 @@ public class ShiroTest {
@Deployment
public static WebArchive createDeployment() {
final PomEquippedResolveStage pom = Maven
.resolver()
.loadPomFromFile("pom.xml");
final PomEquippedResolveStage dependencies = pom.
importCompileAndRuntimeDependencies();
final File[] libs = dependencies.resolve().withTransitivity().asFile();
for (File lib : libs) {
System.err.printf("Adding file '%s' to test archive...%n",
lib.getName());
}
return ShrinkWrap
.create(WebArchive.class,
"LibreCCM-org.libreccm.security.ShiroTest.war")
@ -131,7 +117,7 @@ public class ShiroTest {
.addPackage(com.arsdigita.kernel.security.SecurityConfig.class
.getPackage())
.addClass(org.libreccm.security.authorization.LabBean.class)
.addAsLibraries(libs)
.addAsLibraries(getModuleDependencies())
.addAsResource("test-persistence.xml",
"META-INF/persistence.xml")
.addAsResource("configs/shiro.ini", "shiro.ini")

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

@ -53,6 +53,7 @@ import org.junit.runner.RunWith;
import org.libreccm.tests.categories.IntegrationTest;
import static org.junit.Assert.*;
import static org.libreccm.testutils.DependenciesHelpers.*;
/**
*
@ -95,18 +96,6 @@ public class UserManagerTest {
@Deployment
public static WebArchive createDeployment() {
final PomEquippedResolveStage pom = Maven
.resolver()
.loadPomFromFile("pom.xml");
final PomEquippedResolveStage dependencies = pom.
importCompileAndRuntimeDependencies();
final File[] libs = dependencies.resolve().withTransitivity().asFile();
for (File lib : libs) {
System.err.printf("Adding file '%s' to test archive...%n",
lib.getName());
}
return ShrinkWrap
.create(WebArchive.class,
"LibreCCM-org.libreccm.security.UserManagerTest.war")
@ -134,7 +123,7 @@ public class UserManagerTest {
.addPackage(com.arsdigita.util.UncheckedWrapperException.class
.getPackage())
.addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage())
.addAsLibraries(libs)
.addAsLibraries(getModuleDependencies())
.addAsResource("test-persistence.xml",
"META-INF/persistence.xml")
.addAsResource("configs/shiro.ini", "shiro.ini")

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

@ -41,6 +41,7 @@ import org.junit.After;
import org.junit.AfterClass;
import static org.junit.Assert.*;
import static org.libreccm.testutils.DependenciesHelpers.*;
import org.junit.Before;
import org.junit.BeforeClass;
@ -102,18 +103,6 @@ public class UserRepositoryTest {
@Deployment
public static WebArchive createDeployment() {
final PomEquippedResolveStage pom = Maven
.resolver()
.loadPomFromFile("pom.xml");
final PomEquippedResolveStage dependencies = pom.
importCompileAndRuntimeDependencies();
final File[] libs = dependencies.resolve().withTransitivity().asFile();
for (File lib : libs) {
System.err.printf("Adding file '%s' to test archive...%n",
lib.getName());
}
return ShrinkWrap
.create(WebArchive.class,
"LibreCCM-org.libreccm.security.UserRepositoryTest.war")
@ -137,7 +126,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())
.addAsLibraries(libs)
.addAsLibraries(getModuleDependencies())
.addAsResource("configs/shiro.ini", "shiro.ini")
.addAsResource("test-persistence.xml",
"META-INF/persistence.xml")

58
ccm-core/src/test/resources-wildfly8-remote-h2-mem/scripts/create_ccm_core_schema.sql
View File

@ -47,7 +47,7 @@ CREATE SCHEMA ccm_core;
create table CCM_CORE.CATEGORY_DESCRIPTIONS (
OBJECT_ID bigint not null,
LOCALIZED_VALUE clob,
LOCALIZED_VALUE longvarchar,
LOCALE varchar(255) not null,
primary key (OBJECT_ID, LOCALE)
);
@ -64,7 +64,7 @@ CREATE SCHEMA ccm_core;
create table CCM_CORE.CATEGORY_TITLES (
OBJECT_ID bigint not null,
LOCALIZED_VALUE clob,
LOCALIZED_VALUE longvarchar,
LOCALE varchar(255) not null,
primary key (OBJECT_ID, LOCALE)
);
@ -112,7 +112,7 @@ CREATE SCHEMA ccm_core;
create table CCM_CORE.DOMAIN_DESCRIPTIONS (
OBJECT_ID bigint not null,
LOCALIZED_VALUE clob,
LOCALIZED_VALUE longvarchar,
LOCALE varchar(255) not null,
primary key (OBJECT_ID, LOCALE)
);
@ -129,14 +129,14 @@ CREATE SCHEMA ccm_core;
create table CCM_CORE.DOMAIN_TITLES (
OBJECT_ID bigint not null,
LOCALIZED_VALUE clob,
LOCALIZED_VALUE longvarchar,
LOCALE varchar(255) not null,
primary key (OBJECT_ID, LOCALE)
);
create table CCM_CORE.FORMBUILDER_COMPONENT_DESCRIPTIONS (
COMPONENT_ID bigint not null,
LOCALIZED_VALUE clob,
LOCALIZED_VALUE longvarchar,
LOCALE varchar(255) not null,
primary key (COMPONENT_ID, LOCALE)
);
@ -181,14 +181,14 @@ CREATE SCHEMA ccm_core;
create table CCM_CORE.FORMBUILDER_DATA_QUERY_DESCRIPTIONS (
DATA_QUERY_ID bigint not null,
LOCALIZED_VALUE clob,
LOCALIZED_VALUE longvarchar,
LOCALE varchar(255) not null,
primary key (DATA_QUERY_ID, LOCALE)
);
create table CCM_CORE.FORMBUILDER_DATA_QUERY_NAMES (
DATA_QUERY_ID bigint not null,
LOCALIZED_VALUE clob,
LOCALIZED_VALUE longvarchar,
LOCALE varchar(255) not null,
primary key (DATA_QUERY_ID, LOCALE)
);
@ -225,7 +225,7 @@ CREATE SCHEMA ccm_core;
create table CCM_CORE.FORMBUILDER_OPTION_LABELS (
OPTION_ID bigint not null,
LOCALIZED_VALUE clob,
LOCALIZED_VALUE longvarchar,
LOCALE varchar(255) not null,
primary key (OPTION_ID, LOCALE)
);
@ -238,14 +238,14 @@ CREATE SCHEMA ccm_core;
create table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_DESCRIPTIONS (
PROCESS_LISTENER_ID bigint not null,
LOCALIZED_VALUE clob,
LOCALIZED_VALUE longvarchar,
LOCALE varchar(255) not null,
primary key (PROCESS_LISTENER_ID, LOCALE)
);
create table CCM_CORE.FORMBUILDER_PROCESS_LISTENER_NAMES (
PROCESS_LISTENER_ID bigint not null,
LOCALIZED_VALUE clob,
LOCALIZED_VALUE longvarchar,
LOCALE varchar(255) not null,
primary key (PROCESS_LISTENER_ID, LOCALE)
);
@ -442,21 +442,21 @@ CREATE SCHEMA ccm_core;
create table CCM_CORE.RESOURCE_DESCRIPTIONS (
OBJECT_ID bigint not null,
LOCALIZED_VALUE clob,
LOCALIZED_VALUE longvarchar,
LOCALE varchar(255) not null,
primary key (OBJECT_ID, LOCALE)
);
create table CCM_CORE.RESOURCE_TITLES (
OBJECT_ID bigint not null,
LOCALIZED_VALUE clob,
LOCALIZED_VALUE longvarchar,
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,
LOCALIZED_VALUE longvarchar,
LOCALE varchar(255) not null,
primary key (RESOURCE_TYPE_ID, LOCALE)
);
@ -479,6 +479,13 @@ CREATE SCHEMA ccm_core;
primary key (OBJECT_ID)
);
create table CCM_CORE.ROLE_DESCRIPTIONS (
ROLE_ID bigint not null,
LOCALIZED_VALUE longvarchar,
LOCALE varchar(255) not null,
primary key (ROLE_ID, LOCALE)
);
create table CCM_CORE.ROLE_MEMBERSHIPS (
MEMBERSHIP_ID bigint not null,
MEMBER_ID bigint,
@ -491,11 +498,11 @@ CREATE SCHEMA ccm_core;
SETTING_ID bigint not null,
CONFIGURATION_CLASS varchar(512) not null,
NAME varchar(512) not null,
SETTING_VALUE_BOOLEAN boolean,
SETTING_VALUE_DOUBLE double,
SETTING_VALUE_STRING varchar(1024),
SETTING_VALUE_BOOLEAN boolean,
SETTING_VALUE_BIG_DECIMAL decimal(19,2),
SETTING_VALUE_LONG bigint,
SETTING_VALUE_STRING varchar(1024),
primary key (SETTING_ID)
);
@ -506,7 +513,7 @@ CREATE SCHEMA ccm_core;
create table CCM_CORE.SETTINGS_L10N_STR_VALUES (
ENTRY_ID bigint not null,
LOCALIZED_VALUE clob,
LOCALIZED_VALUE longvarchar,
LOCALE varchar(255) not null,
primary key (ENTRY_ID, LOCALE)
);
@ -551,14 +558,14 @@ CREATE SCHEMA ccm_core;
create table CCM_CORE.WORKFLOW_DESCRIPTIONS (
WORKFLOW_ID bigint not null,
LOCALIZED_VALUE clob,
LOCALIZED_VALUE longvarchar,
LOCALE varchar(255) not null,
primary key (WORKFLOW_ID, LOCALE)
);
create table CCM_CORE.WORKFLOW_NAMES (
WORKFLOW_ID bigint not null,
LOCALIZED_VALUE clob,
LOCALIZED_VALUE longvarchar,
LOCALE varchar(255) not null,
primary key (WORKFLOW_ID, LOCALE)
);
@ -575,7 +582,7 @@ CREATE SCHEMA ccm_core;
create table CCM_CORE.WORKFLOW_TASK_LABELS (
TASK_ID bigint not null,
LOCALIZED_VALUE clob,
LOCALIZED_VALUE longvarchar,
LOCALE varchar(255) not null,
primary key (TASK_ID, LOCALE)
);
@ -590,7 +597,7 @@ CREATE SCHEMA ccm_core;
create table CCM_CORE.WORKFLOW_TASKS_DESCRIPTIONS (
TASK_ID bigint not null,
LOCALIZED_VALUE clob,
LOCALIZED_VALUE longvarchar,
LOCALE varchar(255) not null,
primary key (TASK_ID, LOCALE)
);
@ -613,6 +620,7 @@ CREATE SCHEMA ccm_core;
create table CCM_CORE.WORKFLOWS (
WORKFLOW_ID bigint not null,
TEMPLATE_ID bigint,
primary key (WORKFLOW_ID)
);
@ -1010,6 +1018,11 @@ create sequence hibernate_sequence start with 1 increment by 1;
foreign key (OBJECT_ID)
references CCM_CORE.CCM_OBJECTS;
alter table CCM_CORE.ROLE_DESCRIPTIONS
add constraint FKo09bh4j3k3k0ph3awvjwx31ft
foreign key (ROLE_ID)
references CCM_CORE.CCM_ROLES;
alter table CCM_CORE.ROLE_MEMBERSHIPS
add constraint FK9m88ywi7rcin7b7jrgh53emrq
foreign key (MEMBER_ID)
@ -1124,3 +1137,8 @@ create sequence hibernate_sequence start with 1 increment by 1;
add constraint FKefpdf9ojplu7loo31hfm0wl2h
foreign key (TASK_ID)
references CCM_CORE.WORKFLOW_TASKS;
alter table CCM_CORE.WORKFLOWS
add constraint FKeixdxau4jebw682gd49tdbsjy
foreign key (TEMPLATE_ID)
references CCM_CORE.WORKFLOW_TEMPLATES;

18
ccm-core/src/test/resources-wildfly8-remote-pgsql/scripts/create_ccm_core_schema.sql
View File

@ -478,6 +478,13 @@ create table CCM_CORE.APPLICATIONS (
primary key (OBJECT_ID)
);
create table CCM_CORE.ROLE_DESCRIPTIONS (
ROLE_ID int8 not null,
LOCALIZED_VALUE text,
LOCALE varchar(255) not null,
primary key (ROLE_ID, LOCALE)
);
create table CCM_CORE.ROLE_MEMBERSHIPS (
MEMBERSHIP_ID int8 not null,
MEMBER_ID int8,
@ -490,11 +497,11 @@ create table CCM_CORE.APPLICATIONS (
SETTING_ID int8 not null,
CONFIGURATION_CLASS varchar(512) not null,
NAME varchar(512) not null,
SETTING_VALUE_BOOLEAN boolean,
SETTING_VALUE_STRING varchar(1024),
SETTING_VALUE_BIG_DECIMAL numeric(19, 2),
SETTING_VALUE_DOUBLE float8,
SETTING_VALUE_BOOLEAN boolean,
SETTING_VALUE_BIG_DECIMAL numeric(19, 2),
SETTING_VALUE_LONG int8,
SETTING_VALUE_STRING varchar(1024),
primary key (SETTING_ID)
);
@ -1010,6 +1017,11 @@ create sequence hibernate_sequence start 1 increment 1;
foreign key (OBJECT_ID)
references CCM_CORE.CCM_OBJECTS;
alter table CCM_CORE.ROLE_DESCRIPTIONS
add constraint FKo09bh4j3k3k0ph3awvjwx31ft
foreign key (ROLE_ID)
references CCM_CORE.CCM_ROLES;
alter table CCM_CORE.ROLE_MEMBERSHIPS
add constraint FK9m88ywi7rcin7b7jrgh53emrq
foreign key (MEMBER_ID)

36
ccm-docrepo/src/test/java/org/libreccm/docrepo/portation/ArquillianExampleTest.java
View File

@ -37,6 +37,7 @@ import java.io.File;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertThat;
import static org.libreccm.testutils.DependenciesHelpers.*;
/**
*
@ -75,32 +76,34 @@ public class ArquillianExampleTest {
@Deployment
public static WebArchive createDeployment() {
final PomEquippedResolveStage pom = Maven
.resolver()
.loadPomFromFile("pom.xml");
final PomEquippedResolveStage dependencies = pom
.importCompileAndRuntimeDependencies();
final File[] libs = dependencies.resolve().withTransitivity().asFile();
for (File lib : libs) {
System.err.printf("Adding file '%s' to test archive...%n",
lib.getName());
}
// final PomEquippedResolveStage pom = Maven
// .resolver()
// .loadPomFromFile("pom.xml");
// final PomEquippedResolveStage dependencies = pom
// .importCompileAndRuntimeDependencies();
// final File[] libs = dependencies.resolve().withTransitivity().asFile();
//
// for (File lib : libs) {
// System.err.printf("Adding file '%s' to test archive...%n",
// lib.getName());
// }
//
return ShrinkWrap
.create(WebArchive.class,
"LibreCCM-org.libreccm.docrepo.ArquillianExampleTest.war")
.addPackage(org.libreccm.core.CcmObject.class.getPackage())
"LibreCCM-org.libreccm.docrepo.ArquillianExampleTest.war").
addPackage(org.libreccm.core.CcmObject.class.getPackage())
.addPackage(org.libreccm.security.Permission.class.getPackage())
.addPackage(org.libreccm.web.CcmApplication.class.getPackage())
.addPackage(org.libreccm.categorization.Categorization.class.getPackage())
.addPackage(org.libreccm.categorization.Categorization.class.
getPackage())
.addPackage(LocalizedString.class.getPackage())
.addPackage(Workflow.class.getPackage())
.addPackage(EntityManagerProducer.class.getPackage())
.addPackage(MimeTypeConverter.class.getPackage())
.addPackage(EqualsVerifier.class.getPackage())
.addPackage(IntegrationTest.class.getPackage())
.addAsLibraries(libs)
.addAsLibraries(getModuleDependencies())
.addAsLibraries(getCcmCoreDependencies())
.addAsResource("test-persistence.xml",
"META-INF/persistence.xml")
.addAsWebInfResource("test-web.xml", "WEB-INF/web.xml")
@ -112,7 +115,6 @@ public class ArquillianExampleTest {
//
// @Test
// public void hello() {}
@Test
@InSequence(1)
public void entityManagerIsInjected() {

53
ccm-docrepo/src/test/java/org/libreccm/docrepo/portation/FilePortationTest.java
View File

@ -55,6 +55,7 @@ import java.util.List;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.libreccm.testutils.DependenciesHelpers.*;
/**
*
@ -109,30 +110,30 @@ public class FilePortationTest {
@Deployment
public static WebArchive createDeployment() {
final PomEquippedResolveStage pom = Maven
.resolver()
.loadPomFromFile("pom.xml");
final PomEquippedResolveStage dependencies = pom
.importCompileAndRuntimeDependencies();
final java.io.File[] libs = dependencies.resolve().withTransitivity()
.asFile();
for (java.io.File lib : libs) {
System.err.printf("Adding file '%s' to test archive...%n", lib
.getName());
}
final PomEquippedResolveStage corePom = Maven.resolver()
.loadPomFromFile("../ccm-core/pom.xml");
final PomEquippedResolveStage coreDependencies = corePom
.importCompileAndRuntimeDependencies();
final java.io.File[] coreLibs = coreDependencies.resolve()
.withTransitivity().asFile();
for (java.io.File lib : coreLibs) {
System.err.printf("Adding file '%s' to test archive...%n", lib
.getName());
}
// final PomEquippedResolveStage pom = Maven
// .resolver()
// .loadPomFromFile("pom.xml");
// final PomEquippedResolveStage dependencies = pom
// .importCompileAndRuntimeDependencies();
// final java.io.File[] libs = dependencies.resolve().withTransitivity()
// .asFile();
//
// for (java.io.File lib : libs) {
// System.err.printf("Adding file '%s' to test archive...%n", lib
// .getName());
// }
//
// final PomEquippedResolveStage corePom = Maven.resolver()
// .loadPomFromFile("../ccm-core/pom.xml");
// final PomEquippedResolveStage coreDependencies = corePom
// .importCompileAndRuntimeDependencies();
// final java.io.File[] coreLibs = coreDependencies.resolve()
// .withTransitivity().asFile();
// for (java.io.File lib : coreLibs) {
// System.err.printf("Adding file '%s' to test archive...%n", lib
// .getName());
// }
//
return ShrinkWrap
.create(WebArchive.class,
"LibreCCM-org.libreccm.docrepo.FilePortationTest.war")
@ -161,8 +162,8 @@ public class FilePortationTest {
.getPackage())
.addPackage(com.arsdigita.xml.CCMTransformerFactory.class
.getPackage())
.addAsLibraries(libs)
.addAsLibraries(coreLibs)
.addAsLibraries(getModuleDependencies())
.addAsLibraries(getCcmCoreDependencies())
.addAsResource("META-INF/jboss-deployment-structure.xml",
"META-INF/jboss-deployment-structure.xml")
.addAsResource("test-persistence.xml", "META-INF/persistence.xml")