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

CCM NG: One test in CategoryManagerTest failed when executed after other tests because the hibernate_sequence sequence in the database was not reset between tests. 

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@3778 8810af33-2d31-482b-a856-94f89814c4df
pull/2/head
jensp 2015-12-19 09:18:05 +00:00
parent 6a2ce5a0dc
commit aaf0b053d3
3 changed files with 45 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -237,46 +237,44 @@ public class CategoryManagerTest {
categoryManager.removeSubCategoryFromCategory(bar, foo);
}
// Fails for unknown reasons when executed after the other tests in this
// Test suite, but works when executed stand alone. To be investigated.
// @Test
// @UsingDataSet(
// "datasets/org/libreccm/categorization/CategoryManagerTest/data.yml")
// @ShouldMatchDataSet(
// value = "datasets/org/libreccm/categorization/CategoryManagerTest/"
// + "after-create-multiple-categories.yml")
// @InSequence(3100)
// public void createMultipleCategories() {
// final Domain domain = domainRepo.findByDomainKey("test");
// final Category root = domain.getRoot();
//
// final Category com = new Category();
// com.setName("com");
// com.setDisplayName("com");
// com.setUniqueId("com");
// categoryRepo.save(com);
// categoryManager.addSubCategoryToCategory(com, root);
//
// final Category example = new Category();
// example.setName("example");
// example.setDisplayName("example");
// example.setUniqueId("example");
// categoryRepo.save(example);
// categoryManager.addSubCategoryToCategory(example, com);
//
// final Category categories = new Category();
// categories.setName("categories");
// categories.setDisplayName("categories");
// categories.setUniqueId("categories");
// categoryRepo.save(categories);
// categoryManager.addSubCategoryToCategory(categories, example);
//
// final Category test = new Category();
// test.setName("test");
// test.setDisplayName("test");
// test.setUniqueId("test");
// categoryRepo.save(test);
// categoryManager.addSubCategoryToCategory(test, categories);
// }
@Test
@UsingDataSet(
"datasets/org/libreccm/categorization/CategoryManagerTest/data.yml")
@ShouldMatchDataSet(
value = "datasets/org/libreccm/categorization/CategoryManagerTest/"
+ "after-create-multiple-categories.yml")
@InSequence(3100)
public void createMultipleCategories() {
final Domain domain = domainRepo.findByDomainKey("test");
final Category root = domain.getRoot();
final Category com = new Category();
com.setName("com");
com.setDisplayName("com");
com.setUniqueId("com");
categoryRepo.save(com);
categoryManager.addSubCategoryToCategory(com, root);
final Category example = new Category();
example.setName("example");
example.setDisplayName("example");
example.setUniqueId("example");
categoryRepo.save(example);
categoryManager.addSubCategoryToCategory(example, com);
final Category categories = new Category();
categories.setName("categories");
categories.setDisplayName("categories");
categories.setUniqueId("categories");
categoryRepo.save(categories);
categoryManager.addSubCategoryToCategory(categories, example);
final Category test = new Category();
test.setName("test");
test.setDisplayName("test");
test.setUniqueId("test");
categoryRepo.save(test);
categoryManager.addSubCategoryToCategory(test, categories);
}
}

2
ccm-core/src/test/resources/scripts/h2-cleanup.sql
View File

@ -41,3 +41,5 @@ DELETE FROM ccm_core.user_email_addresses;
DELETE FROM ccm_core.parties;
DELETE FROM ccm_core.ccm_roles;
ALTER SEQUENCE hibernate_sequence RESTART WITH 1;

2
ccm-core/src/test/resources/scripts/pgsql-cleanup.sql
View File

@ -41,3 +41,5 @@ DELETE FROM ccm_core.user_email_addresses;
DELETE FROM ccm_core.parties;
DELETE FROM ccm_core.ccm_roles;
ALTER SEQUENCE hibernate_sequence RESTART;