1 files changed, 16 insertions, 23 deletions

diff --git a/policy-core/src/test/java/org/onap/policy/drools/core/lock/PolicyResourceLockManagerTest.java b/policy-core/src/test/java/org/onap/policy/drools/core/lock/PolicyResourceLockManagerTest.java
index 81b52d16..f575ce49 100644
--- a/policy-core/src/test/java/org/onap/policy/drools/core/lock/PolicyResourceLockManagerTest.java
+++ b/policy-core/src/test/java/org/onap/policy/drools/core/lock/PolicyResourceLockManagerTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP
  * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 
 package org.onap.policy.drools.core.lock;
 
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -32,7 +33,6 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.onap.policy.drools.core.lock.TestingUtils.expectException;
 
 import java.util.Arrays;
 import java.util.LinkedList;
@@ -120,12 +120,11 @@ public class PolicyResourceLockManagerTest {
 
     @Test
     public void testLock_ArgEx() {
-        IllegalArgumentException ex =
-                        expectException(IllegalArgumentException.class, () -> mgr.lock(null, OWNER1, MAX_AGE_SEC));
-        assertEquals(NULL_RESOURCE_ID, ex.getMessage());
+        assertThatIllegalArgumentException().isThrownBy(() -> mgr.lock(null, OWNER1, MAX_AGE_SEC))
+                        .withMessage(NULL_RESOURCE_ID);
 
-        ex = expectException(IllegalArgumentException.class, () -> mgr.lock(RESOURCE_A, null, MAX_AGE_SEC));
-        assertEquals(NULL_OWNER, ex.getMessage());
+        assertThatIllegalArgumentException().isThrownBy(() -> mgr.lock(RESOURCE_A, null, MAX_AGE_SEC))
+                        .withMessage(NULL_OWNER);
 
         // this should not throw an exception
         mgr.lock(RESOURCE_A, OWNER1, MAX_AGE_SEC);
@@ -232,12 +231,11 @@ public class PolicyResourceLockManagerTest {
 
     @Test
     public void testRefresh_ArgEx() {
-        IllegalArgumentException ex =
-                        expectException(IllegalArgumentException.class, () -> mgr.refresh(null, OWNER1, MAX_AGE_SEC));
-        assertEquals(NULL_RESOURCE_ID, ex.getMessage());
+        assertThatIllegalArgumentException().isThrownBy(() -> mgr.refresh(null, OWNER1, MAX_AGE_SEC))
+                        .withMessage(NULL_RESOURCE_ID);
 
-        ex = expectException(IllegalArgumentException.class, () -> mgr.refresh(RESOURCE_A, null, MAX_AGE_SEC));
-        assertEquals(NULL_OWNER, ex.getMessage());
+        assertThatIllegalArgumentException().isThrownBy(() -> mgr.refresh(RESOURCE_A, null, MAX_AGE_SEC))
+                        .withMessage(NULL_OWNER);
 
         // this should not throw an exception
         mgr.refresh(RESOURCE_A, OWNER1, MAX_AGE_SEC);
@@ -343,11 +341,9 @@ public class PolicyResourceLockManagerTest {
 
     @Test
     public void testUnlock_ArgEx() {
-        IllegalArgumentException ex = expectException(IllegalArgumentException.class, () -> mgr.unlock(null, OWNER1));
-        assertEquals(NULL_RESOURCE_ID, ex.getMessage());
+        assertThatIllegalArgumentException().isThrownBy(() -> mgr.unlock(null, OWNER1)).withMessage(NULL_RESOURCE_ID);
 
-        ex = expectException(IllegalArgumentException.class, () -> mgr.unlock(RESOURCE_A, null));
-        assertEquals(NULL_OWNER, ex.getMessage());
+        assertThatIllegalArgumentException().isThrownBy(() -> mgr.unlock(RESOURCE_A, null)).withMessage(NULL_OWNER);
     }
 
     @Test
@@ -458,8 +454,7 @@ public class PolicyResourceLockManagerTest {
 
     @Test
     public void testIsLocked_ArgEx() {
-        IllegalArgumentException ex = expectException(IllegalArgumentException.class, () -> mgr.isLocked(null));
-        assertEquals(NULL_RESOURCE_ID, ex.getMessage());
+        assertThatIllegalArgumentException().isThrownBy(() -> mgr.isLocked(null)).withMessage(NULL_RESOURCE_ID);
     }
 
     @Test
@@ -512,12 +507,10 @@ public class PolicyResourceLockManagerTest {
 
     @Test
     public void testIsLockedBy_ArgEx() {
-        IllegalArgumentException ex =
-                        expectException(IllegalArgumentException.class, () -> mgr.isLockedBy(null, OWNER1));
-        assertEquals(NULL_RESOURCE_ID, ex.getMessage());
+        assertThatIllegalArgumentException().isThrownBy(() -> mgr.isLockedBy(null, OWNER1))
+                        .withMessage(NULL_RESOURCE_ID);
 
-        ex = expectException(IllegalArgumentException.class, () -> mgr.isLockedBy(RESOURCE_A, null));
-        assertEquals(NULL_OWNER, ex.getMessage());
+        assertThatIllegalArgumentException().isThrownBy(() -> mgr.isLockedBy(RESOURCE_A, null)).withMessage(NULL_OWNER);
     }
 
     @Test