Merge "Bug fixes October 16"

2 files changed, 23 insertions, 5 deletions

diff --git a/common/src/main/java/org/onap/so/client/aai/AAIResourcesClient.java b/common/src/main/java/org/onap/so/client/aai/AAIResourcesClient.java
index e91dc43af9..87951d516b 100644
--- a/common/src/main/java/org/onap/so/client/aai/AAIResourcesClient.java
+++ b/common/src/main/java/org/onap/so/client/aai/AAIResourcesClient.java
@@ -269,18 +269,18 @@ public class AAIResourcesClient extends AAIClient {
 		return e;
 	}
 	
-	private Relationship buildRelationship(AAIResourceUri uri) {
+	protected Relationship buildRelationship(AAIResourceUri uri) {
 		return buildRelationship(uri, Optional.empty());
 	}
 	
-	private Relationship buildRelationship(AAIResourceUri uri, AAIEdgeLabel label) {
+	protected Relationship buildRelationship(AAIResourceUri uri, AAIEdgeLabel label) {
 		return buildRelationship(uri, Optional.of(label));
 	}
-	private Relationship buildRelationship(AAIResourceUri uri, Optional<AAIEdgeLabel> label) {
+	protected Relationship buildRelationship(AAIResourceUri uri, Optional<AAIEdgeLabel> label) {
 		final Relationship result = new Relationship();
 		result.setRelatedLink(uri.build().toString());
 		if (label.isPresent()) {
-			result.setRelationshipLabel(label.toString());
+			result.setRelationshipLabel(label.get().toString());
 		}
 		return result;
 	}
diff --git a/common/src/test/java/org/onap/so/client/aai/AAIResourcesClientTest.java b/common/src/test/java/org/onap/so/client/aai/AAIResourcesClientTest.java
index 63f8f652ce..22dc1cac30 100644
--- a/common/src/test/java/org/onap/so/client/aai/AAIResourcesClientTest.java
+++ b/common/src/test/java/org/onap/so/client/aai/AAIResourcesClientTest.java
@@ -28,15 +28,18 @@ import static com.github.tomakehurst.wiremock.client.WireMock.post;
 import static com.github.tomakehurst.wiremock.client.WireMock.put;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
+import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 
-import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.onap.aai.domain.yang.Relationship;
+import org.onap.so.client.aai.entities.AAIEdgeLabel;
 import org.onap.so.client.aai.entities.AAIResultWrapper;
 import org.onap.so.client.aai.entities.uri.AAIResourceUri;
 import org.onap.so.client.aai.entities.uri.AAIUriFactory;
@@ -183,6 +186,21 @@ public class AAIResourcesClientTest {
 		AAIResultWrapper result = client.get(path, NotFoundException.class);
 	}
 	
+	@Test
+	public void buildRelationshipTest() {
+		AAIResourcesClient client = createClient();
+		AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.GENERIC_VNF, "test");
+		Relationship relationship = new Relationship();
+		relationship.setRelatedLink(uri.build().toString());
+		Relationship actual = client.buildRelationship(uri);
+		assertThat("expect equal no label", actual, sameBeanAs(relationship));
+		
+		relationship.setRelationshipLabel(AAIEdgeLabel.USES.toString());
+		actual = client.buildRelationship(uri, AAIEdgeLabel.USES);
+		assertThat("expect equal has label", actual, sameBeanAs(relationship));
+		
+	}
+	
 	private AAIResourcesClient createClient() {
 		AAIResourcesClient client = spy(new AAIResourcesClient());
 		doReturn(new DefaultAAIPropertiesImpl()).when(client).getRestProperties();