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

[CCM-NG][UPDATE] 

- modifies import tests

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4774 8810af33-2d31-482b-a856-94f89814c4df
pull/2/head
tosmers 2017-06-12 17:30:51 +00:00
parent 62fe0207a0
commit 83738eebf0
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,6 +95,7 @@ public class CategoryRepository extends AbstractEntityRepository<Long, Category>
* *
* @return An optional either with the found item or empty * @return An optional either with the found item or empty
*/ */
@Transactional(Transactional.TxType.REQUIRED)
public Optional<Category> findByUuid(final String uuid) { public Optional<Category> findByUuid(final String uuid) {
final TypedQuery<Category> query = getEntityManager(). final TypedQuery<Category> query = getEntityManager().
createNamedQuery("Category.findByUuid", Category.class); createNamedQuery("Category.findByUuid", Category.class);

30
ccm-core/src/test/java/org/libreccm/portation/CoreDataImportTest.java
View File

@ -30,11 +30,7 @@ import org.jboss.arquillian.transaction.api.annotation.Transactional;
import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.EmptyAsset; import org.jboss.shrinkwrap.api.asset.EmptyAsset;
import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.After; import org.junit.*;
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.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;
@ -56,8 +52,8 @@ import static org.libreccm.testutils.DependenciesHelpers.getModuleDependencies;
@PersistenceTest @PersistenceTest
@Transactional(TransactionMode.COMMIT) @Transactional(TransactionMode.COMMIT)
@CreateSchema({"create_ccm_core_schema.sql"}) @CreateSchema({"create_ccm_core_schema.sql"})
@CleanupUsingScript(value = {"cleanup.sql"}, /*@CleanupUsingScript(value = {"cleanup.sql"},
phase = TestExecutionPhase.BEFORE) phase = TestExecutionPhase.BEFORE)*/
public class CoreDataImportTest { public class CoreDataImportTest {
@Inject @Inject
@ -125,16 +121,22 @@ public class CoreDataImportTest {
// TEST SECTION // TEST SECTION
@Test @Test
@InSequence(120) @InSequence(100)
public void usersShouldBeImported() { public void usersShouldBeImported() {
importHelper.importUsers(); Assert.assertFalse(
importHelper.importUsers() &&
importHelper.importGroups());
} }
/*
@Test @Test
@InSequence(105)
public void groupsShouldBeImported() {
}
/*@Test
@InSequence(100) @InSequence(100)
public void categoriesShouldBeImported() { public void categoriesShouldBeImported() {
importHelper.importCategories(); Assert.assertFalse(importHelper.importCategories());
} }
@Test @Test
@ -149,11 +151,7 @@ public class CoreDataImportTest {
Assert.assertFalse(importHelper.importGroupMemberships()); Assert.assertFalse(importHelper.importGroupMemberships());
} }
@Test
@InSequence(115)
public void groupsShouldBeImported() {
Assert.assertFalse(importHelper.importGroups());
}