X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=aai-core%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Faai%2Fserialization%2Fqueryformats%2Futils%2FUrlBuilderTest.java;h=397999e28d97b79957225003e38ecd26c76adac4;hb=a86d6a6644d6de3f3f814cd6e25cfe2213d5dd05;hp=5a64828d77c4ff2b108d4feb31a657e618e7c3cf;hpb=a395fa69a28a04d0a667fe458b4f10497a1d6794;p=aai%2Faai-common.git

diff --git a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/UrlBuilderTest.java b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/UrlBuilderTest.java
index 5a64828d..397999e2 100644
--- a/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/UrlBuilderTest.java
+++ b/aai-core/src/test/java/org/onap/aai/serialization/queryformats/utils/UrlBuilderTest.java
@@ -25,9 +25,9 @@ import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.onap.aai.AAISetup;
-import org.onap.aai.introspection.Version;
 import org.onap.aai.serialization.db.DBSerializer;
 import org.onap.aai.serialization.queryformats.exceptions.AAIFormatVertexException;
+import org.onap.aai.setup.SchemaVersion;
 import org.onap.aai.util.AAIConstants;
 
 import java.io.UnsupportedEncodingException;
@@ -57,29 +57,29 @@ public class UrlBuilderTest extends AAISetup {
 	}
 
 	@Test
-	public void v11Pathed() throws UnsupportedEncodingException, URISyntaxException, AAIFormatVertexException {
-		Version version = Version.v11;
-		UrlBuilder builder = new UrlBuilder(version, serializer, protocolAndHost);
+	public void v11Pathed() throws AAIFormatVertexException {
+		SchemaVersion version = new SchemaVersion("v11");
+		UrlBuilder builder = new UrlBuilder(version, serializer, protocolAndHost, schemaVersions, basePath);
 		String result = builder.pathed(v);
 		
-		assertEquals("has no protocol and host", AAIConstants.AAI_APP_ROOT + version + uri, result);
+		assertEquals("has no protocol and host", basePath + "/"+ version + uri, result);
 		
 	}
 
 	@Test
-	public void v11Id() throws UnsupportedEncodingException, URISyntaxException, AAIFormatVertexException {
-		Version version = Version.v11;
-		UrlBuilder builder = new UrlBuilder(version, serializer, protocolAndHost);
+	public void v11Id() {
+		SchemaVersion version = new SchemaVersion("v11");
+		UrlBuilder builder = new UrlBuilder(version, serializer, protocolAndHost, schemaVersions, basePath);
 		String result = builder.id(v);
 		
-		assertEquals("has no protocol and host", AAIConstants.AAI_APP_ROOT + version + "/resources/id/" + vId, result);
+		assertEquals("has no protocol and host", basePath + "/"+ version + "/resources/id/" + vId, result);
 		
 	}
 	
 	@Test
-	public void beforeV11Pathed() throws UnsupportedEncodingException, URISyntaxException, AAIFormatVertexException {
-		Version version = Version.v10;
-		UrlBuilder builder = new UrlBuilder(version, serializer, protocolAndHost);
+	public void beforeV11Pathed() throws AAIFormatVertexException {
+		SchemaVersion version = new SchemaVersion("v10");
+		UrlBuilder builder = new UrlBuilder(version, serializer, protocolAndHost, schemaVersions, basePath);
 		String result = builder.pathed(v);
 		
 		assertEquals("has protocol and host", protocolAndHost + version + uri, result);
@@ -87,9 +87,9 @@ public class UrlBuilderTest extends AAISetup {
 	}
 	
 	@Test
-	public void beforeV11Id() throws UnsupportedEncodingException, URISyntaxException, AAIFormatVertexException {
-		Version version = Version.v10;
-		UrlBuilder builder = new UrlBuilder(version, serializer, protocolAndHost);
+	public void beforeV11Id() {
+		SchemaVersion version = new SchemaVersion("v10");
+		UrlBuilder builder = new UrlBuilder(version, serializer, protocolAndHost, schemaVersions, basePath);
 		String result = builder.id(v);
 		
 		assertEquals("has protocol and host", protocolAndHost + version + "/resources/id/" + vId, result);