aboutsummaryrefslogtreecommitdiffstats
path: root/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'src/test')
-rw-r--r--src/test/java/org/onap/nbi/apis/StatusResourceTest.java11
-rw-r--r--src/test/resources/application.properties9
2 files changed, 13 insertions, 7 deletions
diff --git a/src/test/java/org/onap/nbi/apis/StatusResourceTest.java b/src/test/java/org/onap/nbi/apis/StatusResourceTest.java
index d9309be..9b80745 100644
--- a/src/test/java/org/onap/nbi/apis/StatusResourceTest.java
+++ b/src/test/java/org/onap/nbi/apis/StatusResourceTest.java
@@ -22,6 +22,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.onap.nbi.apis.status.StatusResource;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -37,12 +38,18 @@ public class StatusResourceTest {
@Autowired
StatusResource statusResource;
+ @Value("${server.contextPath}")
+ String contextPath;
+
+ @Value("${nbi.version}")
+ String version;
+
private MockHttpServletRequest request;
@Before
public void setup() {
request = new MockHttpServletRequest();
- request.setRequestURI("/nbi/api/v1/status");
+ request.setRequestURI(contextPath);
}
@Test
@@ -52,6 +59,6 @@ public class StatusResourceTest {
ObjectNode status = (ObjectNode) response.getBody();
assertThat(status.get("name").textValue()).isEqualTo("nbi");
assertThat(status.get("status").toString()).isEqualTo("OK");
- assertThat(status.get("version").textValue()).isEqualTo("v1");
+ assertThat(status.get("version").textValue()).isEqualTo(version);
}
}
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
index b214f9a..2dc0a70 100644
--- a/src/test/resources/application.properties
+++ b/src/test/resources/application.properties
@@ -14,8 +14,10 @@
# limitations under the License.
#
+nbi.version=v3
+
# SERVER
-server.contextPath=/nbi/api/v3
+server.contextPath=/nbi/api/${nbi.version}
server.port = 8080
# LOGGING
@@ -27,7 +29,7 @@ onap.tenantId=31047205ce114b60833b23e400d6a535
onap.cloudOwner=CloudOwner
# NBI
-nbi.url=http://127.0.0.1:8080/nbi/api/v3
+nbi.url=http://localhost:${server.port}${server.contextPath}
nbi.callForVNF=false
# SCHEDULER
@@ -57,10 +59,7 @@ msb.enabled=false
msb.discovery.host=msb_discovery
msb.discovery.port=10081
msb.service.host=
-msb.service.port=${server.port}
msb.service.name=nbi
-msb.service.version=v1
-msb.service.url=${server.contextPath}
msb.service.custom_path=
msb.service.protocol=REST
msb.service.visual_range=1