1 files changed, 14 insertions, 4 deletions

diff --git a/aai-core/src/test/java/org/onap/aai/rest/TenantTest.java b/aai-core/src/test/java/org/onap/aai/rest/TenantTest.java
index 72ea49ad..e031a326 100644
--- a/aai-core/src/test/java/org/onap/aai/rest/TenantTest.java
+++ b/aai-core/src/test/java/org/onap/aai/rest/TenantTest.java
@@ -21,34 +21,44 @@ package org.onap.aai.rest;
 
 import com.jayway.jsonpath.JsonPath;
 import org.junit.Before;
+import org.junit.ClassRule;
 import org.junit.Ignore;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
-import org.onap.aai.AAIJunitRunner;
+import org.onap.aai.AAISetup;
 import org.onap.aai.HttpTestUtil;
 import org.onap.aai.PayloadUtil;
 import org.onap.aai.serialization.engines.QueryStyle;
 import org.skyscreamer.jsonassert.JSONAssert;
+import org.springframework.test.context.junit4.rules.SpringClassRule;
+import org.springframework.test.context.junit4.rules.SpringMethodRule;
 
 import javax.ws.rs.core.Response;
 import java.util.*;
 
 import static org.junit.Assert.assertEquals;
 
-@RunWith(value = AAIJunitRunner.class)
-public class TenantTest {
+@RunWith(value = Parameterized.class)
+public class TenantTest extends AAISetup {
 
     private HttpTestUtil httpTestUtil;
     private Map<String, String> templateValuesMap;
+    @ClassRule
+    public static final SpringClassRule SPRING_CLASS_RULE = new SpringClassRule();
 
+    @Rule
+    public final SpringMethodRule springMethodRule = new SpringMethodRule();
+    
     @Parameterized.Parameter(value = 0)
     public QueryStyle queryStyle;
 
     @Parameterized.Parameters(name = "QueryStyle.{0}")
     public static Collection<Object[]> data() {
         return Arrays.asList(new Object[][]{
-                {QueryStyle.TRAVERSAL}
+                {QueryStyle.TRAVERSAL},
+                {QueryStyle.TRAVERSAL_URI}
         });
     }