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

CCM NG: Fixed test failures in AttachmentListManagerTest 

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

Former-commit-id: 3d23917ce5
pull/2/head
jensp 2019-05-03 16:37:26 +00:00
parent a4b9a06aee
commit 2147405e5f
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ccm-cms/src/test/java/org/librecms/contentsection/AttachmentListManagerTest.java
View File

@ -144,6 +144,7 @@ public class AttachmentListManagerTest {
.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())
@ -202,8 +203,8 @@ public class AttachmentListManagerTest {
+ "data.xml") + "data.xml")
public void getAttachmentListNames() { public void getAttachmentListNames() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> article1 = itemRepo.findById(-510); final Optional<ContentItem> article1 = itemRepo.findById(510);
final Optional<ContentItem> article2 = itemRepo.findById(-520); final Optional<ContentItem> article2 = itemRepo.findById(520);
assertThat(article1.isPresent(), is(true)); assertThat(article1.isPresent(), is(true));
assertThat(article2.isPresent(), is(true)); assertThat(article2.isPresent(), is(true));
@ -260,9 +261,9 @@ public class AttachmentListManagerTest {
final Subject systemUser = shiro.getSystemUser(); final Subject systemUser = shiro.getSystemUser();
final Optional<ContentItem> article1 = systemUser final Optional<ContentItem> article1 = systemUser
.execute(() -> itemRepo.findById(-510)); .execute(() -> itemRepo.findById(510));
final Optional<ContentItem> article2 = systemUser final Optional<ContentItem> article2 = systemUser
.execute(() -> itemRepo.findById(-520)); .execute(() -> itemRepo.findById(520));
assertThat(article1.isPresent(), is(true)); assertThat(article1.isPresent(), is(true));
assertThat(article2.isPresent(), is(true)); assertThat(article2.isPresent(), is(true));
@ -329,7 +330,7 @@ public class AttachmentListManagerTest {
final Subject systemUser = shiro.getSystemUser(); final Subject systemUser = shiro.getSystemUser();
final Optional<ContentItem> item = systemUser final Optional<ContentItem> item = systemUser
.execute(() -> itemRepo.findById(-510)); .execute(() -> itemRepo.findById(510));
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
@ -352,7 +353,7 @@ public class AttachmentListManagerTest {
final Subject systemUser = shiro.getSystemUser(); final Subject systemUser = shiro.getSystemUser();
final Optional<ContentItem> item = systemUser final Optional<ContentItem> item = systemUser
.execute(() -> itemRepo.findById(-510)); .execute(() -> itemRepo.findById(510));
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
@ -381,7 +382,7 @@ public class AttachmentListManagerTest {
public void createAttachmentList() { public void createAttachmentList() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-520); final Optional<ContentItem> item = itemRepo.findById(520);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
listManager.createAttachmentList(item.get(), "newList"); listManager.createAttachmentList(item.get(), "newList");
@ -429,7 +430,7 @@ public class AttachmentListManagerTest {
public void createAttachmentListNameIsNull() { public void createAttachmentListNameIsNull() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-520); final Optional<ContentItem> item = itemRepo.findById(520);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
listManager.createAttachmentList(item.get(), null); listManager.createAttachmentList(item.get(), null);
@ -453,7 +454,7 @@ public class AttachmentListManagerTest {
public void createAttachmentListNameIsEmpty() { public void createAttachmentListNameIsEmpty() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-520); final Optional<ContentItem> item = itemRepo.findById(520);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
listManager.createAttachmentList(item.get(), " "); listManager.createAttachmentList(item.get(), " ");
@ -480,7 +481,7 @@ public class AttachmentListManagerTest {
public void createAttachmentListWithPosition() { public void createAttachmentListWithPosition() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-510); final Optional<ContentItem> item = itemRepo.findById(510);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
listManager.createAttachmentList(item.get(), "newList", 1); listManager.createAttachmentList(item.get(), "newList", 1);
@ -510,7 +511,7 @@ public class AttachmentListManagerTest {
public void createAttachmentListWithNegativePosition() { public void createAttachmentListWithNegativePosition() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-510); final Optional<ContentItem> item = itemRepo.findById(510);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
listManager.createAttachmentList(item.get(), "newList", -3); listManager.createAttachmentList(item.get(), "newList", -3);
@ -541,7 +542,7 @@ public class AttachmentListManagerTest {
public void createAttachmentListWithPositionAfterLast() { public void createAttachmentListWithPositionAfterLast() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-510); final Optional<ContentItem> item = itemRepo.findById(510);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
listManager.createAttachmentList(item.get(), "newList", 10); listManager.createAttachmentList(item.get(), "newList", 10);
@ -590,7 +591,7 @@ public class AttachmentListManagerTest {
public void createAttachmentListWithPositionNameIsNull() { public void createAttachmentListWithPositionNameIsNull() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-510); final Optional<ContentItem> item = itemRepo.findById(510);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
listManager.createAttachmentList(item.get(), null, 10); listManager.createAttachmentList(item.get(), null, 10);
@ -615,7 +616,7 @@ public class AttachmentListManagerTest {
public void createAttachmentListWithPositionNameIsEmpty() { public void createAttachmentListWithPositionNameIsEmpty() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-510); final Optional<ContentItem> item = itemRepo.findById(510);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
listManager.createAttachmentList(item.get(), " ", 10); listManager.createAttachmentList(item.get(), " ", 10);
@ -640,7 +641,7 @@ public class AttachmentListManagerTest {
public void removeAttachmentList() { public void removeAttachmentList() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-510); final Optional<ContentItem> item = itemRepo.findById(510);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
final AttachmentList list = item.get().getAttachments().get(0); final AttachmentList list = item.get().getAttachments().get(0);
@ -685,7 +686,7 @@ public class AttachmentListManagerTest {
public void moveUp() { public void moveUp() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-510); final Optional<ContentItem> item = itemRepo.findById(510);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
final AttachmentList list = item.get().getAttachments().get(0); final AttachmentList list = item.get().getAttachments().get(0);
@ -708,7 +709,7 @@ public class AttachmentListManagerTest {
public void moveUpLast() { public void moveUpLast() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-510); final Optional<ContentItem> item = itemRepo.findById(510);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
final AttachmentList list = item.get().getAttachments().get(2); final AttachmentList list = item.get().getAttachments().get(2);
@ -755,7 +756,7 @@ public class AttachmentListManagerTest {
public void moveDown() { public void moveDown() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-510); final Optional<ContentItem> item = itemRepo.findById(510);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
final AttachmentList list = item.get().getAttachments().get(2); final AttachmentList list = item.get().getAttachments().get(2);
@ -778,7 +779,7 @@ public class AttachmentListManagerTest {
public void moveDownFirst() { public void moveDownFirst() {
shiro.getSystemUser().execute(() -> { shiro.getSystemUser().execute(() -> {
final Optional<ContentItem> item = itemRepo.findById(-510); final Optional<ContentItem> item = itemRepo.findById(510);
assertThat(item.isPresent(), is(true)); assertThat(item.isPresent(), is(true));
final AttachmentList list = item.get().getAttachments().get(0); final AttachmentList list = item.get().getAttachments().get(0);