X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Fschema%2FRelationshipSchemaValidatorTest.java;h=11d42bf8a35dbc8ea5ad7435b2d23e2967f90d51;hb=0c40bcde9facc109ceb8dabb91156df2b4fb4129;hp=711152d9332b90d637ccddb9d869f382b3ae5b49;hpb=d5322dbd0fa1e32d543b24824a28d6bf0a0b5497;p=aai%2Fgizmo.git

diff --git a/src/test/java/org/onap/schema/RelationshipSchemaValidatorTest.java b/src/test/java/org/onap/schema/RelationshipSchemaValidatorTest.java
index 711152d..11d42bf 100644
--- a/src/test/java/org/onap/schema/RelationshipSchemaValidatorTest.java
+++ b/src/test/java/org/onap/schema/RelationshipSchemaValidatorTest.java
@@ -27,10 +27,13 @@ import org.junit.Before;
 import org.junit.Test;
 import org.onap.crud.entity.Edge;
 import org.onap.crud.exception.CrudException;
-import org.onap.crud.parser.EdgePayload;
-import org.onap.schema.validation.RelationshipSchemaValidator;
+import org.onap.crud.service.EdgePayload;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.onap.crud.OXMModelLoaderSetup;
 
-public class RelationshipSchemaValidatorTest {
+@RunWith(MockitoJUnitRunner.Silent.class)
+public class RelationshipSchemaValidatorTest extends OXMModelLoaderSetup{
     // @formatter:off
 	  private final String edgePayload = "{" +
 		      "\"type\": \"tosca.relationships.HostedOn\"," +
@@ -73,7 +76,7 @@ public class RelationshipSchemaValidatorTest {
             RelationshipSchemaValidator.validateIncomingUpdatePayload(edge, version, payload);
         } catch (CrudException e) {
             assertEquals(400, e.getHttpStatus().getStatusCode());
-            assertThat(e.getMessage(), is("Invalid Source/Target Urls"));
+            assertThat(e.getMessage(), is("Invalid Source Urls"));
         }
     }
 
@@ -115,7 +118,7 @@ public class RelationshipSchemaValidatorTest {
             RelationshipSchemaValidator.validateIncomingUpdatePayload(edge, version, payload);
         } catch (CrudException e) {
             assertEquals(400, e.getHttpStatus().getStatusCode());
-            assertThat(e.getMessage(), is("Invalid Source/Target Urls"));
+            assertThat(e.getMessage(), is("Invalid Target Urls"));
         }
     }
 
@@ -186,7 +189,7 @@ public class RelationshipSchemaValidatorTest {
             RelationshipSchemaValidator.validateIncomingPatchPayload(edge, version, payload);
         } catch (CrudException e) {
             assertEquals(400, e.getHttpStatus().getStatusCode());
-            assertThat(e.getMessage(), is("Invalid Source/Target Urls"));
+            assertThat(e.getMessage(), is("Invalid Source Urls"));
         }
     }
 
@@ -229,7 +232,7 @@ public class RelationshipSchemaValidatorTest {
             RelationshipSchemaValidator.validateIncomingPatchPayload(edge, version, payload);
         } catch (CrudException e) {
             assertEquals(400, e.getHttpStatus().getStatusCode());
-            assertThat(e.getMessage(), is("Invalid Source/Target Urls"));
+            assertThat(e.getMessage(), is("Invalid Target Urls"));
         }
     }