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

CCM NG: Tests for ccm-core now work again 

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@3946 8810af33-2d31-482b-a856-94f89814c4df
pull/2/head
jensp 2016-03-21 18:18:35 +00:00
parent c2bae7824a
commit 2f7b0f1dcb
4 changed files with 49 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ccm-core/src/test/java/org/libreccm/categorization/RegistrySetupTest.java
View File

@ -18,8 +18,6 @@
*/ */
package org.libreccm.categorization; package org.libreccm.categorization;
import org.libreccm.categorization.RegistrySetup;
import com.example.TestConfiguration;
import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.junit.InSequence; import org.jboss.arquillian.junit.InSequence;
@ -39,24 +37,14 @@ import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.libreccm.categorization.Categorization;
import org.libreccm.core.CcmObject;
import org.libreccm.jpa.EntityManagerProducer;
import org.libreccm.jpa.utils.MimeTypeConverter;
import org.libreccm.l10n.LocalizedString;
import org.libreccm.modules.InstallEvent; import org.libreccm.modules.InstallEvent;
import org.libreccm.security.Permission;
import org.libreccm.tests.categories.IntegrationTest; import org.libreccm.tests.categories.IntegrationTest;
import org.libreccm.testutils.EqualsVerifier;
import org.libreccm.web.CcmApplication;
import org.libreccm.workflow.Workflow;
import java.io.File; import java.io.File;
import javax.inject.Inject; import javax.inject.Inject;
import javax.persistence.EntityManager; import javax.persistence.EntityManager;
import org.libreccm.configuration.Configuration;
/** /**
@ -131,7 +119,7 @@ public class RegistrySetupTest {
@Test @Test
@ShouldMatchDataSet(value = @ShouldMatchDataSet(value =
"datasets/org/libreccm/categorization/RegistrySetupTest/after-setup.xml", "datasets/org/libreccm/categorization/RegistrySetupTest/after-setup.xml",
excludeColumns = {"object_id", "root_category_id"}) excludeColumns = {"object_id", "root_category_id", "uuid"})
@InSequence(100) @InSequence(100)
public void setupRegistry() { public void setupRegistry() {
final InstallEvent installEvent = new InstallEvent(); final InstallEvent installEvent = new InstallEvent();

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

@ -43,7 +43,6 @@ import org.libreccm.modules.dependencytree.test.cycle.TestModuleB;
import org.libreccm.modules.dependencytree.test.cycle.TestModuleC; import org.libreccm.modules.dependencytree.test.cycle.TestModuleC;
import org.libreccm.modules.dependencytree.test.cycle.TestModuleRoot; import org.libreccm.modules.dependencytree.test.cycle.TestModuleRoot;
import org.libreccm.tests.categories.IntegrationTest; import org.libreccm.tests.categories.IntegrationTest;
import org.libreccm.web.ApplicationType;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
@ -101,27 +100,31 @@ public class DependencyTreeManagerCycleTest {
return ShrinkWrap return ShrinkWrap
.create(WebArchive.class, .create(WebArchive.class,
"LibreCCM-org.libreccm.modules.dependencytree.DependencyTreeManagerCycleTest.war") "LibreCCM-org.libreccm.modules.dependencytree.DependencyTreeManagerCycleTest.war")
.addPackage(IntegrationTest.class.getPackage()) .addPackage(org.libreccm.tests.categories.IntegrationTest.class
.addClass(DependencyTreeManager.class) .getPackage())
.addClass(DependencyException.class) .addClass(org.libreccm.modules.DependencyTreeManager.class)
.addClass(IntegrationException.class) .addClass(org.libreccm.modules.DependencyException.class)
.addClass(org.libreccm.modules.IntegrationException.class)
.addClass(TreeNode.class) .addClass(TreeNode.class)
.addClass(CcmModule.class) .addClass(org.libreccm.modules.CcmModule.class)
.addClass(ModuleInfo.class) .addClass(org.libreccm.modules.ModuleInfo.class)
.addClass(ModuleStatus.class) .addClass(org.libreccm.modules.ModuleStatus.class)
.addClass(Module.class) .addClass(org.libreccm.modules.Module.class)
.addClass(RequiredModule.class) .addClass(org.libreccm.modules.RequiredModule.class)
.addClass(InitEvent.class) .addClass(org.libreccm.modules.InitEvent.class)
.addClass(InstallEvent.class) .addClass(org.libreccm.modules.InstallEvent.class)
.addClass(ShutdownEvent.class) .addClass(org.libreccm.modules.ShutdownEvent.class)
.addClass(UnInstallEvent.class) .addClass(org.libreccm.modules.UnInstallEvent.class)
.addClass(TestModuleRoot.class) .addClass(
.addClass(TestModuleA.class) org.libreccm.modules.dependencytree.test.cycle.TestModuleRoot.class)
.addClass(TestModuleB.class) .addClass(
.addClass(TestModuleC.class) org.libreccm.modules.dependencytree.test.cycle.TestModuleA.class)
.addClass(ApplicationType.class) .addClass(
org.libreccm.modules.dependencytree.test.cycle.TestModuleB.class)
.addClass(
org.libreccm.modules.dependencytree.test.cycle.TestModuleC.class)
.addClass(org.libreccm.web.ApplicationType.class)
.addAsLibraries(libs) .addAsLibraries(libs)
.addAsWebInfResource("test-web.xml", "web.xml")
.addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
.addAsResource( .addAsResource(
"module-info/dependency-tree-manager-cycle-test/module-root.properties", "module-info/dependency-tree-manager-cycle-test/module-root.properties",

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

@ -43,7 +43,6 @@ import org.junit.Test;
import org.junit.experimental.categories.Category; import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.libreccm.tests.categories.IntegrationTest; import org.libreccm.tests.categories.IntegrationTest;
import org.libreccm.web.ApplicationType;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
@ -102,27 +101,31 @@ public class DependencyTreeManagerTest {
return ShrinkWrap return ShrinkWrap
.create(WebArchive.class, .create(WebArchive.class,
"LibreCCM-org.libreccm.modules.dependencytree.DependencyTreeManagerTest.war") "LibreCCM-org.libreccm.modules.dependencytree.DependencyTreeManagerTest.war")
.addPackage(IntegrationTest.class.getPackage()) .addPackage(org.libreccm.tests.categories.IntegrationTest.class
.addClass(DependencyTreeManager.class) .getPackage())
.addClass(DependencyException.class) .addClass(org.libreccm.modules.DependencyTreeManager.class)
.addClass(IntegrationException.class) .addClass(org.libreccm.modules.DependencyException.class)
.addClass(TreeNode.class) .addClass(org.libreccm.modules.IntegrationException.class)
.addClass(CcmModule.class) .addClass(org.libreccm.modules.TreeNode.class)
.addClass(ModuleInfo.class) .addClass(org.libreccm.modules.CcmModule.class)
.addClass(ModuleStatus.class) .addClass(org.libreccm.modules.ModuleInfo.class)
.addClass(Module.class) .addClass(org.libreccm.modules.ModuleStatus.class)
.addClass(RequiredModule.class) .addClass(org.libreccm.modules.Module.class)
.addClass(InitEvent.class) .addClass(org.libreccm.modules.RequiredModule.class)
.addClass(InstallEvent.class) .addClass(org.libreccm.modules.InitEvent.class)
.addClass(ShutdownEvent.class) .addClass(org.libreccm.modules.InstallEvent.class)
.addClass(UnInstallEvent.class) .addClass(org.libreccm.modules.ShutdownEvent.class)
.addClass(TestModuleRoot.class) .addClass(org.libreccm.modules.UnInstallEvent.class)
.addClass(TestModuleA.class) .addClass(
.addClass(TestModuleB.class) org.libreccm.modules.dependencytree.test.valid.TestModuleRoot.class)
.addClass(TestModuleC.class) .addClass(
.addClass(ApplicationType.class) org.libreccm.modules.dependencytree.test.valid.TestModuleA.class)
.addClass(
org.libreccm.modules.dependencytree.test.valid.TestModuleB.class)
.addClass(
org.libreccm.modules.dependencytree.test.valid.TestModuleC.class)
.addClass(org.libreccm.web.ApplicationType.class)
.addAsLibraries(libs) .addAsLibraries(libs)
.addAsWebInfResource("test-web.xml", "web.xml")
.addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml") .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
.addAsResource( .addAsResource(
"module-info/dependency-tree-manager-test/module-root.properties", "module-info/dependency-tree-manager-test/module-root.properties",

1
ccm-theme-foundry/pom.xml
View File

@ -21,6 +21,7 @@
<groupId>org.libreccm</groupId> <groupId>org.libreccm</groupId>
<artifactId>ccm-theme-foundry</artifactId> <artifactId>ccm-theme-foundry</artifactId>
<version>7.0.0-SNAPSHOT</version> <version>7.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>LibreCCM Foundry Theming Engine</name> <name>LibreCCM Foundry Theming Engine</name>