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

CCM NG: Fixed test failures in ContentItemManagerTest 

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@6006 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 87464c7a87
pull/2/head
jensp 2019-05-03 18:22:38 +00:00
parent 00530155f4
commit 49ff10891e
2 changed files with 55 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,6 +168,7 @@ public class ContentItemManagerTest {
.addClass( .addClass(
com.arsdigita.ui.admin.applications.DefaultApplicationSettingsPane.class) com.arsdigita.ui.admin.applications.DefaultApplicationSettingsPane.class)
.addClass(org.librecms.dispatcher.ItemResolver.class) .addClass(org.librecms.dispatcher.ItemResolver.class)
.addClass(org.libreccm.imexport.Exportable.class)
.addPackage(com.arsdigita.util.Lockable.class.getPackage()) .addPackage(com.arsdigita.util.Lockable.class.getPackage())
.addPackage(com.arsdigita.web.BaseServlet.class.getPackage()) .addPackage(com.arsdigita.web.BaseServlet.class.getPackage())
.addPackage(org.librecms.Cms.class.getPackage()) .addPackage(org.librecms.Cms.class.getPackage())
@ -430,7 +431,7 @@ public class ContentItemManagerTest {
final Folder folder = section.getRootDocumentsFolder(); final Folder folder = section.getRootDocumentsFolder();
final Workflow workflowTemplate = workflowRepo final Workflow workflowTemplate = workflowRepo
.findById(-110L) .findById(110L)
.get(); .get();
final Article article = itemManager.createContentItem( final Article article = itemManager.createContentItem(
@ -479,7 +480,7 @@ public class ContentItemManagerTest {
final Folder folder = section.getRootDocumentsFolder(); final Folder folder = section.getRootDocumentsFolder();
final Workflow workflowTemplate = workflowRepo final Workflow workflowTemplate = workflowRepo
.findById(-110L) .findById(110L)
.get(); .get();
itemManager.createContentItem("Test", itemManager.createContentItem("Test",
@ -513,7 +514,7 @@ public class ContentItemManagerTest {
final Folder folder = section.getRootDocumentsFolder(); final Folder folder = section.getRootDocumentsFolder();
final Workflow workflowTemplate = workflowRepo final Workflow workflowTemplate = workflowRepo
.findById(-110L) .findById(110L)
.get(); .get();
itemManager.createContentItem(null, itemManager.createContentItem(null,
@ -576,7 +577,7 @@ public class ContentItemManagerTest {
.get(); .get();
final Workflow workflowTemplate = workflowRepo final Workflow workflowTemplate = workflowRepo
.findById(-110L) .findById(110L)
.get(); .get();
itemManager.createContentItem("Test", itemManager.createContentItem("Test",
@ -611,10 +612,10 @@ public class ContentItemManagerTest {
public void moveItem() { public void moveItem() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-10100L); final Optional<ContentItem> item = itemRepo.findById(10100L);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
final Folder targetFolder = folderRepo.findById(-2120L).get(); final Folder targetFolder = folderRepo.findById(2120L).get();
assertThat(targetFolder, is(not(nullValue()))); assertThat(targetFolder, is(not(nullValue())));
itemManager.move(item.get(), targetFolder); itemManager.move(item.get(), targetFolder);
@ -644,8 +645,8 @@ public class ContentItemManagerTest {
public void moveItemToOtherContentSection() { public void moveItemToOtherContentSection() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-10100L); final Optional<ContentItem> item = itemRepo.findById(10100L);
final Folder targetFolder = folderRepo.findById(-2300L).get(); final Folder targetFolder = folderRepo.findById(2300L).get();
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
assertThat(targetFolder, is(not(nullValue()))); assertThat(targetFolder, is(not(nullValue())));
@ -671,8 +672,8 @@ public class ContentItemManagerTest {
public void moveToOtherContentSectionTypeNotPresent() { public void moveToOtherContentSectionTypeNotPresent() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-10400L); final Optional<ContentItem> item = itemRepo.findById(10400L);
final Folder targetFolder = folderRepo.findById(-2300L).get(); final Folder targetFolder = folderRepo.findById(2300L).get();
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
assertThat(targetFolder, is(not(nullValue()))); assertThat(targetFolder, is(not(nullValue())));
@ -697,7 +698,7 @@ public class ContentItemManagerTest {
public void moveItemNull() { public void moveItemNull() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Folder targetFolder = folderRepo.findById(-2120L).get(); final Folder targetFolder = folderRepo.findById(2120L).get();
assertThat(targetFolder, is(not(nullValue()))); assertThat(targetFolder, is(not(nullValue())));
itemManager.move(null, targetFolder); itemManager.move(null, targetFolder);
@ -720,7 +721,7 @@ public class ContentItemManagerTest {
public void moveItemTargetFolderIsNull() { public void moveItemTargetFolderIsNull() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-10100L); final Optional<ContentItem> item = itemRepo.findById(10100L);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
itemManager.move(item.get(), null); itemManager.move(item.get(), null);
@ -758,10 +759,10 @@ public class ContentItemManagerTest {
public void copyToOtherFolder() { public void copyToOtherFolder() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-10100L); final Optional<ContentItem> item = itemRepo.findById(10100L);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
final Folder targetFolder = folderRepo.findById(-2120L).get(); final Folder targetFolder = folderRepo.findById(2120L).get();
assertThat(targetFolder, is(not(nullValue()))); assertThat(targetFolder, is(not(nullValue())));
itemManager.copy(item.get(), targetFolder); itemManager.copy(item.get(), targetFolder);
@ -799,8 +800,8 @@ public class ContentItemManagerTest {
public void copyToFolderInOtherSection() { public void copyToFolderInOtherSection() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> source = itemRepo.findById(-10100L); final Optional<ContentItem> source = itemRepo.findById(10100L);
final Folder targetFolder = folderRepo.findById(-2300L).get(); final Folder targetFolder = folderRepo.findById(2300L).get();
assertThat(source.isPresent(), is(true)); assertThat(source.isPresent(), is(true));
assertThat(targetFolder, is(not(nullValue()))); assertThat(targetFolder, is(not(nullValue())));
@ -831,8 +832,8 @@ public class ContentItemManagerTest {
public void copyToFolderInOtherSectionTypeNotPresent() { public void copyToFolderInOtherSectionTypeNotPresent() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> source = itemRepo.findById(-10400L); final Optional<ContentItem> source = itemRepo.findById(10400L);
final Folder targetFolder = folderRepo.findById(-2300L).get(); final Folder targetFolder = folderRepo.findById(2300L).get();
assertThat(source.isPresent(), is(true)); assertThat(source.isPresent(), is(true));
assertThat(targetFolder, is(not(nullValue()))); assertThat(targetFolder, is(not(nullValue())));
@ -874,10 +875,10 @@ public class ContentItemManagerTest {
public void copyToSameFolder() { public void copyToSameFolder() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-10100L); final Optional<ContentItem> item = itemRepo.findById(10100L);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
final Folder targetFolder = folderRepo.findById(-2110L).get(); final Folder targetFolder = folderRepo.findById(2110L).get();
assertThat(targetFolder, is(not(nullValue()))); assertThat(targetFolder, is(not(nullValue())));
itemManager.copy(item.get(), targetFolder); itemManager.copy(item.get(), targetFolder);
@ -901,7 +902,7 @@ public class ContentItemManagerTest {
public void copyItemNull() { public void copyItemNull() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Folder targetFolder = folderRepo.findById(-2120L).get(); final Folder targetFolder = folderRepo.findById(2120L).get();
assertThat(targetFolder, is(not(nullValue()))); assertThat(targetFolder, is(not(nullValue())));
itemManager.copy(null, targetFolder); itemManager.copy(null, targetFolder);
@ -925,7 +926,7 @@ public class ContentItemManagerTest {
public void copyItemToFolderNull() { public void copyItemToFolderNull() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-10100L); final Optional<ContentItem> item = itemRepo.findById(10100L);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
itemManager.copy(item.get(), null); itemManager.copy(item.get(), null);
@ -966,7 +967,7 @@ public class ContentItemManagerTest {
public void publishItem() { public void publishItem() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-10100L); final Optional<ContentItem> item = itemRepo.findById(10100L);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
final ContentItem live = itemManager.publish(item.get()); final ContentItem live = itemManager.publish(item.get());
@ -1009,9 +1010,9 @@ public class ContentItemManagerTest {
public void publishItemWithLifecycle() { public void publishItemWithLifecycle() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-10100L); final Optional<ContentItem> item = itemRepo.findById(10100L);
final LifecycleDefinition lifecycleDef = lifecycleDefinitionRepo final LifecycleDefinition lifecycleDef = lifecycleDefinitionRepo
.findById(-200L).get(); .findById(200L).get();
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
assertThat(lifecycleDef, is(not(nullValue()))); assertThat(lifecycleDef, is(not(nullValue())));
@ -1047,7 +1048,7 @@ public class ContentItemManagerTest {
public void republishItem() { public void republishItem() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-10200L); final Optional<ContentItem> item = itemRepo.findById(10200L);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
item.get().getName().addValue(Locale.ENGLISH, "article2-edited"); item.get().getName().addValue(Locale.ENGLISH, "article2-edited");
@ -1055,7 +1056,7 @@ public class ContentItemManagerTest {
.addValue(Locale.ENGLISH, "Article has been edited"); .addValue(Locale.ENGLISH, "Article has been edited");
itemRepo.save(item.get()); itemRepo.save(item.get());
final Optional<ContentItem> draft = itemRepo.findById(-10200L); final Optional<ContentItem> draft = itemRepo.findById(10200L);
assertThat(draft.get().getName().getValue(Locale.ENGLISH), assertThat(draft.get().getName().getValue(Locale.ENGLISH),
is(equalTo("article2-edited"))); is(equalTo("article2-edited")));
itemManager.publish(draft.get()); itemManager.publish(draft.get());
@ -1100,7 +1101,7 @@ public class ContentItemManagerTest {
public void publishItemLifecycleIsNull() { public void publishItemLifecycleIsNull() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> draft = itemRepo.findById(-10200L); final Optional<ContentItem> draft = itemRepo.findById(10200L);
itemManager.publish(draft.get(), null); itemManager.publish(draft.get(), null);
}); });
@ -1132,7 +1133,7 @@ public class ContentItemManagerTest {
public void unpublishItem() { public void unpublishItem() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-10200L); final Optional<ContentItem> item = itemRepo.findById(10200L);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
itemManager.unpublish(item.get()); itemManager.unpublish(item.get());
@ -1153,7 +1154,7 @@ public class ContentItemManagerTest {
public void unpublishNonLiveItem() { public void unpublishNonLiveItem() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-10300L); final Optional<ContentItem> item = itemRepo.findById(10300L);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
itemManager.unpublish(item.get()); itemManager.unpublish(item.get());
@ -1195,10 +1196,10 @@ public class ContentItemManagerTest {
public void isLive() { public void isLive() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item1 = itemRepo.findById(-10100L); final Optional<ContentItem> item1 = itemRepo.findById(10100L);
final Optional<ContentItem> item2 = itemRepo.findById(-10200L); final Optional<ContentItem> item2 = itemRepo.findById(10200L);
final Optional<ContentItem> item3 = itemRepo.findById(-10300L); final Optional<ContentItem> item3 = itemRepo.findById(10300L);
final Optional<ContentItem> item4 = itemRepo.findById(-10400L); final Optional<ContentItem> item4 = itemRepo.findById(10400L);
assertThat(item1.isPresent(), is(true)); assertThat(item1.isPresent(), is(true));
assertThat(item2.isPresent(), is(true)); assertThat(item2.isPresent(), is(true));
@ -1228,12 +1229,12 @@ public class ContentItemManagerTest {
public void getLiveVersion() { public void getLiveVersion() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> draft1 = itemRepo.findById(-10100L); final Optional<ContentItem> draft1 = itemRepo.findById(10100L);
final Optional<ContentItem> draft2 = itemRepo.findById(-10200L); final Optional<ContentItem> draft2 = itemRepo.findById(10200L);
final Optional<ContentItem> draft3 = itemRepo.findById(-10300L); final Optional<ContentItem> draft3 = itemRepo.findById(10300L);
final Optional<ContentItem> draft4 = itemRepo.findById(-10400L); final Optional<ContentItem> draft4 = itemRepo.findById(10400L);
final Optional<ContentItem> live2 = itemRepo.findById(-99200L); final Optional<ContentItem> live2 = itemRepo.findById(99200L);
assertThat(itemManager.getLiveVersion(draft1.get(), assertThat(itemManager.getLiveVersion(draft1.get(),
ContentItem.class).isPresent(), ContentItem.class).isPresent(),
@ -1243,7 +1244,7 @@ public class ContentItemManagerTest {
assertThat(liveVersion.isPresent(), assertThat(liveVersion.isPresent(),
is(true)); is(true));
assertThat(liveVersion.get().getObjectId(), assertThat(liveVersion.get().getObjectId(),
is(-99200L)); is(99200L));
assertThat(liveVersion.get().getItemUuid(), assertThat(liveVersion.get().getItemUuid(),
is(equalTo("acae860f-2ffa-450d-b486-054292f0dae6"))); is(equalTo("acae860f-2ffa-450d-b486-054292f0dae6")));
assertThat(liveVersion.get().getVersion(), assertThat(liveVersion.get().getVersion(),
@ -1260,7 +1261,7 @@ public class ContentItemManagerTest {
assertThat(fromLive.isPresent(), assertThat(fromLive.isPresent(),
is(true)); is(true));
assertThat(fromLive.get().getObjectId(), assertThat(fromLive.get().getObjectId(),
is(-99200L)); is(99200L));
assertThat(fromLive.get().getItemUuid(), assertThat(fromLive.get().getItemUuid(),
is(equalTo("acae860f-2ffa-450d-b486-054292f0dae6"))); is(equalTo("acae860f-2ffa-450d-b486-054292f0dae6")));
assertThat(fromLive.get().getVersion(), assertThat(fromLive.get().getVersion(),
@ -1283,35 +1284,35 @@ public class ContentItemManagerTest {
public void getDraftVersion() { public void getDraftVersion() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> draft1 = itemRepo.findById(-10100L); final Optional<ContentItem> draft1 = itemRepo.findById(10100L);
final Optional<ContentItem> draft2 = itemRepo.findById(-10200L); final Optional<ContentItem> draft2 = itemRepo.findById(10200L);
final Optional<ContentItem> draft3 = itemRepo.findById(-10300L); final Optional<ContentItem> draft3 = itemRepo.findById(10300L);
final Optional<ContentItem> draft4 = itemRepo.findById(-10400L); final Optional<ContentItem> draft4 = itemRepo.findById(10400L);
assertThat(itemManager.getDraftVersion(draft1.get(), assertThat(itemManager.getDraftVersion(draft1.get(),
ContentItem.class) ContentItem.class)
.getObjectId(), .getObjectId(),
is(-10100L)); is(10100L));
assertThat(itemManager.getDraftVersion(draft2.get(), assertThat(itemManager.getDraftVersion(draft2.get(),
ContentItem.class) ContentItem.class)
.getObjectId(), .getObjectId(),
is(-10200L)); is(10200L));
assertThat(itemManager.getDraftVersion(draft3.get(), assertThat(itemManager.getDraftVersion(draft3.get(),
ContentItem.class) ContentItem.class)
.getObjectId(), .getObjectId(),
is(-10300L)); is(10300L));
assertThat(itemManager.getDraftVersion(draft4.get(), assertThat(itemManager.getDraftVersion(draft4.get(),
ContentItem.class) ContentItem.class)
.getObjectId(), .getObjectId(),
is(-10400L)); is(10400L));
final Optional<ContentItem> live2 = itemRepo.findById(-99200L); final Optional<ContentItem> live2 = itemRepo.findById(99200L);
final ContentItem draftVersion = itemManager.getDraftVersion( final ContentItem draftVersion = itemManager.getDraftVersion(
live2.get(), ContentItem.class); live2.get(), ContentItem.class);
assertThat(draftVersion, is(not(nullValue()))); assertThat(draftVersion, is(not(nullValue())));
assertThat(draftVersion.getObjectId(), is(-10200L)); assertThat(draftVersion.getObjectId(), is(10200L));
assertThat(draftVersion.getItemUuid(), assertThat(draftVersion.getItemUuid(),
is(equalTo("acae860f-2ffa-450d-b486-054292f0dae6"))); is(equalTo("acae860f-2ffa-450d-b486-054292f0dae6")));
assertThat(draftVersion.getVersion(), assertThat(draftVersion.getVersion(),

3
ccm-core/src/main/java/org/libreccm/workflow/AssignableTaskManager.java
View File

@ -26,10 +26,12 @@ import javax.inject.Inject;
import javax.persistence.EntityManager; import javax.persistence.EntityManager;
import javax.persistence.TypedQuery; import javax.persistence.TypedQuery;
import javax.transaction.Transactional; import javax.transaction.Transactional;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;
import java.util.UUID;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@ -78,6 +80,7 @@ public class AssignableTaskManager implements Serializable {
final TaskAssignment assignment = new TaskAssignment(); final TaskAssignment assignment = new TaskAssignment();
assignment.setTask(task); assignment.setTask(task);
assignment.setRole(role); assignment.setRole(role);
assignment.setUuid(UUID.randomUUID().toString());
task.addAssignment(assignment); task.addAssignment(assignment);
role.addAssignedTask(assignment); role.addAssignedTask(assignment);