1 files changed, 7 insertions, 7 deletions

diff --git a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/model/runtime/RaptorControllerAsyncTest.java b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/model/runtime/RaptorControllerAsyncTest.java
index 84ae2fda..35f21026 100644
--- a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/model/runtime/RaptorControllerAsyncTest.java
+++ b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/model/runtime/RaptorControllerAsyncTest.java
@@ -197,7 +197,7 @@ public class RaptorControllerAsyncTest {
 		raptorControllerAsync.RaptorSearch(mockedRequest, mockedResponse);
 	}
 
-	@Test(expected = java.lang.NullPointerException.class)
+	@Test(expected = org.owasp.esapi.errors.ConfigurationException.class)
 	public void RaptorSearchNullActionKeyTest() throws Exception {
 		User user = new User();
 		user.setOrgUserId("test12");
@@ -220,7 +220,7 @@ public class RaptorControllerAsyncTest {
 		return "test";
 	}
 
-	@Test(expected = java.lang.NullPointerException.class)
+	@Test(expected = org.owasp.esapi.errors.ConfigurationException.class)
 	public void RaptorSearchClassNotFoundExceptionTest() throws Exception {
 		User user = new User();
 		user.setOrgUserId("test12");
@@ -238,7 +238,7 @@ public class RaptorControllerAsyncTest {
 		raptorControllerAsync.RaptorSearch(mockedRequest, mockedResponse);
 	}
 
-	@Test(expected = java.lang.NullPointerException.class)
+	@Test(expected = org.owasp.esapi.errors.ConfigurationException.class)
 	public void RaptorSearchMethodNotFoundExceptionTest() throws Exception {
 		User user = new User();
 		user.setOrgUserId("test12");
@@ -261,7 +261,7 @@ public class RaptorControllerAsyncTest {
 		throw new MethodInvocationException("test");
 	}
 
-	@Test(expected = java.lang.NullPointerException.class)
+	@Test(expected = org.owasp.esapi.errors.ConfigurationException.class)
 	public void RaptorSearchMethodInvocationFoundExceptionTest() throws Exception {
 		User user = new User();
 		user.setOrgUserId("test12");
@@ -280,7 +280,7 @@ public class RaptorControllerAsyncTest {
 		raptorControllerAsync.RaptorSearch(mockedRequest, mockedResponse);
 	}
 
-	@Test(expected = java.lang.NullPointerException.class)
+	@Test(expected = org.owasp.esapi.errors.ConfigurationException.class)
 	public void RaptorSearchRaptorExceptionTest() throws Exception {
 		User user = new User();
 		user.setOrgUserId("test12");
@@ -297,7 +297,7 @@ public class RaptorControllerAsyncTest {
 		raptorControllerAsync.RaptorSearch(mockedRequest, mockedResponse);
 	}
 
-	@Test
+	@Test(expected = org.owasp.esapi.errors.ConfigurationException.class)
 	public void RaptorSearchNoUserTest() throws Exception {
 
 		Mockito.when(UserUtils.getUserSession(mockedRequest)).thenReturn(null);
@@ -315,7 +315,7 @@ public class RaptorControllerAsyncTest {
 		raptorControllerAsync.RaptorSearch(mockedRequest, mockedResponse);
 	}
 
-	@Test(expected = java.lang.NullPointerException.class)
+	@Test(expected = org.owasp.esapi.errors.ConfigurationException.class)
 	public void RaptorSearchGlobalyTest() throws Exception {
 		User user = new User();
 		user.setOrgUserId("test12");