X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Fcrud%2Fservice%2FCrudRestServiceTest.java;h=04340a6d8a957f132bbc7ef7363951823981950f;hb=0c40bcde9facc109ceb8dabb91156df2b4fb4129;hp=ddf384716d043253da85d4524cc4a02c92879155;hpb=d10a218c76633374f083f7a2802c198e93a6abae;p=aai%2Fgizmo.git

diff --git a/src/test/java/org/onap/crud/service/CrudRestServiceTest.java b/src/test/java/org/onap/crud/service/CrudRestServiceTest.java
index ddf3847..04340a6 100644
--- a/src/test/java/org/onap/crud/service/CrudRestServiceTest.java
+++ b/src/test/java/org/onap/crud/service/CrudRestServiceTest.java
@@ -40,9 +40,12 @@ import org.onap.crud.service.util.TestHeaders;
 import org.onap.crud.service.util.TestRequest;
 import org.onap.crud.service.util.TestUriInfo;
 import org.onap.schema.EdgeRulesLoader;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.onap.crud.OXMModelLoaderSetup;
 
-
-public class CrudRestServiceTest {
+@RunWith(MockitoJUnitRunner.Silent.class)
+public class CrudRestServiceTest extends OXMModelLoaderSetup{
   private final String putVertexPayload = "{" +
       "\"id\": \"test-uuid\"," +
       "\"type\": \"pserver\"," +
@@ -77,12 +80,11 @@ public class CrudRestServiceTest {
 
   @Before
   public void init() throws Exception {
-    ClassLoader classLoader = getClass().getClassLoader();
-    File dir = new File(classLoader.getResource("rules").getFile());
-    System.setProperty("CONFIG_HOME", dir.getParent());
+    System.setProperty("CONFIG_HOME", "src/test/resources");
     EdgeRulesLoader.resetSchemaVersionContext();
 
-    CrudGraphDataService service = new CrudGraphDataService(new TestDao());
+    ChampDaoMockTest champDaoTest = new ChampDaoMockTest();
+    CrudGraphDataService service = new CrudGraphDataService(champDaoTest.getChampDao());
     CrudRestService restService = new CrudRestService(service, null);
     mockService = Mockito.spy(restService);
 
@@ -157,27 +159,6 @@ public class CrudRestServiceTest {
 	Assert.assertEquals(response.getEntityTag().getValue(), "test123");
   }
 
-  @Test
-  public void testAddEdgeMultiplicityRules() throws CrudException {
-    Response response;
-
-    response = mockService.addEdge(postEdgePayload, "v10", "services/inventory/v10",
-        new TestHeaders(), null, new TestRequest());
-    Assert.assertEquals("MANY2ONE multiplicity rule broken for Edge:vserver:pserver:tosca.relationships.HostedOn",
-            response.getEntity().toString());
-    Assert.assertEquals(400, response.getStatus());
-
-    response = mockService.addEdge(postEdgePayload, "v9", "tosca.relationships.HostedOn", "services/inventory/v9",
-        new TestHeaders(), null, new TestRequest());
-    Assert.assertEquals(201, response.getStatus());
-
-    response = mockService.addEdge(postEdgePayload, "v8", "tosca.relationships.HostedOn", "services/inventory/v8",
-        new TestHeaders(), null, new TestRequest());
-    Assert.assertEquals("ONE2MANY multiplicity rule broken for Edge:vserver:pserver:tosca.relationships.HostedOn",
-            response.getEntity().toString());
-    Assert.assertEquals(400, response.getStatus());
-  }
-
   @Test
   public void testUpdateVertex() throws CrudException {
     Response response;
@@ -334,9 +315,10 @@ public class CrudRestServiceTest {
     String payloadStr = readFileToString(bulkFile);
     System.out.println(payloadStr);
 
-    response = mockService.addBulk(payloadStr, "v9", "",
+    response = mockService.addBulk(payloadStr, "v9", 
         "services/inventory/v9", new TestHeaders(), null, new TestRequest());
-    System.out.println("Bulk Response: " + response.getStatus() + "\n" + response.getEntity().toString());
+    System.out.println("Bulk Response: " + response);
+    System.out.println("Response Entity: " + response.getEntity().toString());
     assertTrue(response.getStatus() == 200);
   }