Change the junits to inherit from AAISetup

Issue-ID: AAI-462
Change-Id: I7a6c3dbfb9fd38f6c94f9ef12799e2c3f8d0dd23
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>

diff --git a/aai-resources/src/test/java/org/onap/aai/interceptors/AAILogJAXRSInInterceptorTest.java b/aai-resources/src/test/java/org/onap/aai/interceptors/AAILogJAXRSInInterceptorTest.java
index 40de5a9..01a6788 100644 (file)
--- a/aai-resources/src/test/java/org/onap/aai/interceptors/AAILogJAXRSInInterceptorTest.java
+++ b/aai-resources/src/test/java/org/onap/aai/interceptors/AAILogJAXRSInInterceptorTest.java
@@ -26,6 +26,7 @@ import org.apache.cxf.message.ExchangeImpl;
 import org.apache.cxf.message.Message;
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.aai.AAISetup;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -36,7 +37,7 @@ import java.util.Map;
 
 import static org.mockito.Mockito.*;
 
-public class AAILogJAXRSInInterceptorTest {
+public class AAILogJAXRSInInterceptorTest extends AAISetup {
 
     private AAILogJAXRSInInterceptor aaiLogJAXRSInInterceptor;
 

diff --git a/aai-resources/src/test/java/org/onap/aai/interceptors/AAILogJAXRSOutInterceptorTest.java b/aai-resources/src/test/java/org/onap/aai/interceptors/AAILogJAXRSOutInterceptorTest.java
index 52c6a42..455aa2c 100644 (file)
--- a/aai-resources/src/test/java/org/onap/aai/interceptors/AAILogJAXRSOutInterceptorTest.java
+++ b/aai-resources/src/test/java/org/onap/aai/interceptors/AAILogJAXRSOutInterceptorTest.java
@@ -27,6 +27,7 @@ import org.apache.cxf.message.ExchangeImpl;
 import org.apache.cxf.message.Message;
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.aai.AAISetup;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -37,7 +38,7 @@ import java.util.Map;
 
 import static org.mockito.Mockito.*;
 
-public class AAILogJAXRSOutInterceptorTest {
+public class AAILogJAXRSOutInterceptorTest extends AAISetup {
 
     private AAILogJAXRSOutInterceptor aaiLogJAXRSOutInterceptor;
 

diff --git a/aai-resources/src/test/java/org/onap/aai/interceptors/PostAaiAjscInterceptorTest.java b/aai-resources/src/test/java/org/onap/aai/interceptors/PostAaiAjscInterceptorTest.java
index 6efb0d1..2db19a4 100644 (file)
--- a/aai-resources/src/test/java/org/onap/aai/interceptors/PostAaiAjscInterceptorTest.java
+++ b/aai-resources/src/test/java/org/onap/aai/interceptors/PostAaiAjscInterceptorTest.java
@@ -24,6 +24,7 @@ package org.onap.aai.interceptors;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
+import org.onap.aai.AAISetup;
 import org.onap.aai.logging.LoggingContext;
 
 import javax.servlet.http.HttpServletRequest;
@@ -31,7 +32,7 @@ import javax.servlet.http.HttpServletRequest;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-public class PostAaiAjscInterceptorTest {
+public class PostAaiAjscInterceptorTest extends AAISetup {
 
     private PostAaiAjscInterceptor postAaiAjscInterceptor;
 

diff --git a/aai-resources/src/test/java/org/onap/aai/interceptors/PreAaiAjscInterceptorTest.java b/aai-resources/src/test/java/org/onap/aai/interceptors/PreAaiAjscInterceptorTest.java
index 35651c3..b66e65c 100644 (file)
--- a/aai-resources/src/test/java/org/onap/aai/interceptors/PreAaiAjscInterceptorTest.java
+++ b/aai-resources/src/test/java/org/onap/aai/interceptors/PreAaiAjscInterceptorTest.java
@@ -24,6 +24,7 @@ package org.onap.aai.interceptors;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
+import org.onap.aai.AAISetup;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -31,7 +32,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.anyString;
 
-public class PreAaiAjscInterceptorTest {
+public class PreAaiAjscInterceptorTest extends AAISetup {
 
     private PreAaiAjscInterceptor preAaiAjscInterceptor;
 

diff --git a/aai-resources/src/test/java/org/onap/aai/rest/retired/RetiredConsumerTest.java b/aai-resources/src/test/java/org/onap/aai/rest/retired/RetiredConsumerTest.java
index 66846b6..50964a3 100644 (file)
--- a/aai-resources/src/test/java/org/onap/aai/rest/retired/RetiredConsumerTest.java
+++ b/aai-resources/src/test/java/org/onap/aai/rest/retired/RetiredConsumerTest.java
@@ -26,6 +26,7 @@ import com.att.eelf.configuration.EELFManager;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
+import org.onap.aai.AAISetup;
 import org.onap.aai.introspection.Version;
 
 import javax.ws.rs.core.*;
@@ -36,7 +37,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.mockito.Matchers.anyObject;
 import static org.mockito.Mockito.when;
 
-public abstract class RetiredConsumerTest {
+public abstract class RetiredConsumerTest extends AAISetup {
 
     protected static final MediaType APPLICATION_JSON = MediaType.valueOf("application/json");