From eafaf8b613ae1d2b0845368ecb609a277c6a77a7 Mon Sep 17 00:00:00 2001 From: tosmers Date: Mon, 6 Feb 2017 15:54:19 +0000 Subject: [PATCH] [UPDATE] - adds minor changes in partation's CoreDataImportTest-routine git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4552 8810af33-2d31-482b-a856-94f89814c4df --- .../portation/CoreDataImportTest.java | 38 +++++++------- .../org/libreccm/portation/ImportHelper.java | 50 +++++++++---------- 2 files changed, 43 insertions(+), 45 deletions(-) diff --git a/ccm-core/src/test/java/org/libreccm/portation/CoreDataImportTest.java b/ccm-core/src/test/java/org/libreccm/portation/CoreDataImportTest.java index 240581a81..0d2e91840 100644 --- a/ccm-core/src/test/java/org/libreccm/portation/CoreDataImportTest.java +++ b/ccm-core/src/test/java/org/libreccm/portation/CoreDataImportTest.java @@ -18,11 +18,10 @@ */ package org.libreccm.portation; -import javax.inject.Inject; - import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.junit.InSequence; +import org.jboss.arquillian.persistence.CleanupUsingScript; import org.jboss.arquillian.persistence.CreateSchema; import org.jboss.arquillian.persistence.PersistenceTest; import org.jboss.arquillian.transaction.api.annotation.TransactionMode; @@ -35,12 +34,15 @@ 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.libreccm.tests.categories.IntegrationTest; + +import javax.faces.bean.RequestScoped; +import javax.inject.Inject; import static org.libreccm.testutils.DependenciesHelpers.getModuleDependencies; -import org.jboss.arquillian.persistence.CleanupUsingScript; - /** * Test class. Tests the import capabilities of the core module @@ -49,12 +51,13 @@ import org.jboss.arquillian.persistence.CleanupUsingScript; * @author Tobias Osmers * @version created on 12/1/16 */ -//@org.junit.experimental.categories.Category(IntegrationTest.class) +@Category(IntegrationTest.class) @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) @CreateSchema({"create_ccm_core_schema.sql"}) @CleanupUsingScript({"cleanup.sql"}) +@RequestScoped public class CoreDataImportTest { @Inject @@ -113,7 +116,6 @@ public class CoreDataImportTest { @Before public void setUp() { - //importHelper = new ImportHelper(); } @After @@ -125,73 +127,73 @@ public class CoreDataImportTest { @Test @InSequence(105) public void categoriesShouldBeImported() { - importHelper.importCategories(); + importHelper.importRoleMemberships(); } @Test @InSequence(110) public void categorizationsShouldBeImported() { - importHelper.importCategorizations(); + importHelper.importGroupMemberships(); } @Test @InSequence(115) public void usersShouldBeImported() { - importHelper.importUsers(); + importHelper.importGroups(); } @Test @InSequence(120) public void groupsShouldBeImported() { - importHelper.importGroups(); + importHelper.importUsers(); } @Test @InSequence(125) public void groupMembershipsShouldBeImported() { - importHelper.importGroupMemberships(); + importHelper.importTaskAssignments(); } @Test @InSequence(130) public void rolesShouldBeImported() { - importHelper.importRoles(); + importHelper.importAssignableTasks(); } @Test @InSequence(135) public void roleMembershipsShouldBeImported() { - importHelper.importRoleMemberships(); + importHelper.importWorkflowTemplates(); } @Test @InSequence(140) public void workflowTemplatesShouldBeImported() { - importHelper.importWorkflowTemplates(); + importHelper.importWorkflows(); } @Test @InSequence(145) public void workflowsShouldBeImported() { - importHelper.importWorkflows(); + importHelper.importCategorizations(); } @Test @InSequence(150) public void assignableTasksShouldBeImported() { - importHelper.importAssignableTasks(); + importHelper.importPermissions(); } @Test @InSequence(155) public void taskAssignmentsShouldBeImported() { - importHelper.importTaskAssignments(); + importHelper.importCategories(); } @Test @InSequence(160) public void permissionsShouldBeImported() { - importHelper.importPermissions(); + importHelper.importRoles(); } diff --git a/ccm-core/src/test/java/org/libreccm/portation/ImportHelper.java b/ccm-core/src/test/java/org/libreccm/portation/ImportHelper.java index bfc0ecafd..5278c531e 100644 --- a/ccm-core/src/test/java/org/libreccm/portation/ImportHelper.java +++ b/ccm-core/src/test/java/org/libreccm/portation/ImportHelper.java @@ -18,37 +18,34 @@ */ package org.libreccm.portation; +import org.libreccm.categorization.Categorization; import org.libreccm.categorization.CategorizationMarshaller; import org.libreccm.categorization.Category; import org.libreccm.categorization.CategoryMarshaller; import org.libreccm.security.Group; import org.libreccm.security.GroupMarshaller; +import org.libreccm.security.GroupMembership; import org.libreccm.security.GroupMembershipMarshaller; +import org.libreccm.security.Permission; import org.libreccm.security.PermissionMarshaller; +import org.libreccm.security.Role; import org.libreccm.security.RoleMarshaller; +import org.libreccm.security.RoleMembership; import org.libreccm.security.RoleMembershipMarshaller; +import org.libreccm.security.User; import org.libreccm.security.UserMarshaller; +import org.libreccm.workflow.AssignableTask; import org.libreccm.workflow.AssignableTaskMarshaller; +import org.libreccm.workflow.TaskAssignment; import org.libreccm.workflow.TaskAssignmentMarshaller; +import org.libreccm.workflow.Workflow; import org.libreccm.workflow.WorkflowMarshaller; +import org.libreccm.workflow.WorkflowTemplate; import org.libreccm.workflow.WorkflowTemplateMarshaller; import javax.enterprise.context.RequestScoped; import javax.inject.Inject; -import java.util.List; -import org.libreccm.categorization.Categorization; -import org.libreccm.security.GroupMembership; -import org.libreccm.security.Permission; -import org.libreccm.security.Role; -import org.libreccm.security.RoleMembership; -import org.libreccm.security.User; -import org.libreccm.workflow.AssignableTask; -import org.libreccm.workflow.Task; -import org.libreccm.workflow.TaskAssignment; -import org.libreccm.workflow.Workflow; -import org.libreccm.workflow.WorkflowTemplate; - /** * Helper to implement the specifics for the importations. Makes source code * in the actual test class is shorter and more readable. @@ -101,74 +98,73 @@ class ImportHelper { private PermissionMarshaller permissionMarshaller; - public void importCategories() { + void importCategories() { categoryMarshaller.prepare(Format.XML, pathName, "categories.xml", indentation); - List categories = categoryMarshaller.importFile(); + categoryMarshaller.importFile(); } - public void importCategorizations() { + void importCategorizations() { categorizationMarshaller.prepare(Format.XML, pathName, "categorizations.xml", indentation); categorizationMarshaller.importFile(); } - public void importUsers() { + void importUsers() { userMarshaller.prepare(Format.XML, pathName, "users.xml", indentation); userMarshaller.importFile(); } - public void importGroups() { + void importGroups() { groupMarshaller.prepare(Format.XML, pathName, "groups.xml", indentation); groupMarshaller.importFile(); } - public void importGroupMemberships() { - + void importGroupMemberships() { groupMembershipMarshaller.prepare(Format.XML, pathName, "groupMemberships.xml", indentation); groupMembershipMarshaller.importFile(); } - public void importRoles() { + void importRoles() { roleMarshaller.prepare(Format.XML, pathName, "roles.xml", indentation); roleMarshaller.importFile(); } - public void importRoleMemberships() { + void importRoleMemberships() { roleMembershipMarshaller.prepare(Format.XML, pathName, "roleMemberships.xml", indentation); roleMembershipMarshaller.importFile(); } - public void importWorkflowTemplates() { + void importWorkflowTemplates() { workflowTemplateMarshaller.prepare(Format.XML, pathName, "workflowTemplates.xml", indentation); workflowTemplateMarshaller.importFile(); } - public void importWorkflows() { + void importWorkflows() { workflowMarshaller.prepare(Format.XML, pathName, "workflows.xml", indentation); workflowMarshaller.importFile(); } - public void importAssignableTasks() { + void importAssignableTasks() { assignableTaskMarshaller.prepare(Format.XML, pathName, "assignableTasks.xml", indentation); assignableTaskMarshaller.importFile(); } - public void importTaskAssignments() { + void importTaskAssignments() { taskAssignmentMarshaller.prepare(Format.XML, pathName, "taskAssignments.xml", indentation); taskAssignmentMarshaller.importFile(); } - public void importPermissions() { + void importPermissions() { permissionMarshaller.prepare(Format.XML, pathName, "permissions.xml", indentation); permissionMarshaller.importFile();