From 3d7c4b367fab94f6a6757c4501f7e27315bdcabc Mon Sep 17 00:00:00 2001 From: jensp Date: Tue, 21 Nov 2017 16:28:47 +0000 Subject: [PATCH] CCM NG: Fixed some test failures git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5127 8810af33-2d31-482b-a856-94f89814c4df --- .../java/org/libreccm/security/PermissionManagerTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java index 6295493af..c68b2c827 100644 --- a/ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java @@ -631,10 +631,10 @@ public class PermissionManagerTest { * * @throws Throwable */ - @Test(expected = NullPointerException.class) + @Test(expected = IllegalArgumentException.class) @UsingDataSet( "datasets/org/libreccm/security/PermissionManagerTest/data.yml") - @ShouldThrowException(NullPointerException.class) + @ShouldThrowException(IllegalArgumentException.class) @InSequence(345) public void revokePermissionOnObjectFromRoleNull() throws Throwable { final CcmObject object1 = ccmObjectRepository.findById(-20001L).get(); @@ -657,10 +657,10 @@ public class PermissionManagerTest { * * @throws Throwable */ - @Test(expected = NullPointerException.class) + @Test(expected = IllegalArgumentException.class) @UsingDataSet( "datasets/org/libreccm/security/PermissionManagerTest/data.yml") - @ShouldThrowException(NullPointerException.class) + @ShouldThrowException(IllegalArgumentException.class) @InSequence(350) public void revokePermissionNullObject() throws Throwable { final Role role1 = roleRepository.findByName("role1").get();