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

CCM NG/ccm-cms: Fixed some test failures 

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

Former-commit-id: 72827e8e3d
pull/2/head
jensp 2017-05-02 09:06:52 +00:00
parent 8e70f29f3a
commit 1410e7fe3f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -336,13 +336,13 @@ public class ContentItemManagerTest {
* is called with {@code null} for the folder in which the new item is
* created.
*/
@Test(expected = IllegalArgumentException.class)
@Test(expected = NullPointerException.class)
@InSequence(1500)
@UsingDataSet("datasets/org/librecms/contentsection/"
+ "ContentItemManagerTest/data.xml")
@ShouldMatchDataSet("datasets/org/librecms/contentsection/"
+ "ContentItemManagerTest/data.xml")
@ShouldThrowException(IllegalArgumentException.class)
@ShouldThrowException(NullPointerException.class)
public void createItemFolderIsNull() {
shiro.getSystemUser().execute(() -> {
final ContentSection section = sectionRepo
@ -508,13 +508,13 @@ public class ContentItemManagerTest {
* throws an {@link IllegalArgumentException} if called with {@code null}
* for the folder in which the new item is created.
*/
@Test(expected = IllegalArgumentException.class)
@Test(expected = NullPointerException.class)
@InSequence(2600)
@UsingDataSet("datasets/org/librecms/contentsection/"
+ "ContentItemManagerTest/data.xml")
@ShouldMatchDataSet("datasets/org/librecms/contentsection/"
+ "ContentItemManagerTest/data.xml")
@ShouldThrowException(IllegalArgumentException.class)
@ShouldThrowException(NullPointerException.class)
public void createItemFolderIsNullWithWorkflow() {
shiro.getSystemUser().execute(() -> {
final ContentSection section = sectionRepo

8
ccm-cms/src/test/java/org/librecms/contentsection/FolderManagerTest.java
View File

@ -390,26 +390,26 @@ public class FolderManagerTest {
folderManager.moveFolder(folder, folder);
}
@Test(expected = IllegalArgumentException.class)
@Test(expected = NullPointerException.class)
@UsingDataSet("datasets/org/librecms/contentsection/"
+ "FolderManagerTest/data.xml")
@ShouldMatchDataSet(
value = "datasets/org/librecms/contentsection/"
+ "FolderManagerTest/data.xml")
@ShouldThrowException(IllegalArgumentException.class)
@ShouldThrowException(NullPointerException.class)
@InSequence(3200)
public void moveFolderNull() {
final Folder target = folderRepo.findById(-2010L).get();
folderManager.moveFolder(null, target);
}
@Test(expected = IllegalArgumentException.class)
@Test(expected = NullPointerException.class)
@UsingDataSet("datasets/org/librecms/contentsection/"
+ "FolderManagerTest/data.xml")
@ShouldMatchDataSet(
value = "datasets/org/librecms/contentsection/"
+ "FolderManagerTest/data.xml")
@ShouldThrowException(IllegalArgumentException.class)
@ShouldThrowException(NullPointerException.class)
@InSequence(3210)
public void moveFolderTargetNull() {
final Folder folder = folderRepo.findById(-2008L).get();