summaryrefslogtreecommitdiffstats
path: root/huawei/vnfmadapter/VnfmadapterService/service/src/test/java
diff options
context:
space:
mode:
authorluxin <luxin7@huawei.com>2017-09-27 17:23:25 +0800
committerluxin <luxin7@huawei.com>2017-09-27 17:36:25 +0800
commit43ef05055556c1db825bccf1f015b7e9508e6284 (patch)
treebadc67b320352005c008781a4d463b7c61dc0423 /huawei/vnfmadapter/VnfmadapterService/service/src/test/java
parent046d1548036451e1f5dc41e35efab60298c74979 (diff)
Remove unused parameter in restRoa
Change-Id: Ia627e06fbe42825825a3b512b53fdff9bb32b219 Issue-Id:VFC-425 Signed-off-by: luxin <luxin7@huawei.com>
Diffstat (limited to 'huawei/vnfmadapter/VnfmadapterService/service/src/test/java')
-rw-r--r--huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/AuthRoaTest.java8
-rw-r--r--huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfAdapterResourceRoaTest.java5
2 files changed, 6 insertions, 7 deletions
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/AuthRoaTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/AuthRoaTest.java
index 027a9da2..2369b02a 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/AuthRoaTest.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/AuthRoaTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 Huawei Technologies Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -174,11 +174,10 @@ public class AuthRoaTest {
@Test
public void testDelAuthToken() {
MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {};
- HttpServletRequest mockInstance = proxyStub.getMockInstance();
MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
- String result = authRoa.delAuthToken(mockInstance, null, null, mockResInstance);
+ String result = authRoa.delAuthToken(null, null, mockResInstance);
JSONObject resultJson = new JSONObject();
resultJson.put("Information", "Operation success");
@@ -188,11 +187,10 @@ public class AuthRoaTest {
@Test
public void testShakehand() {
MockUp<HttpServletRequest> proxyStub = new MockUp<HttpServletRequest>() {};
- HttpServletRequest mockInstance = proxyStub.getMockInstance();
MockUp<HttpServletResponse> proxyResStub = new MockUp<HttpServletResponse>() {};
HttpServletResponse mockResInstance = proxyResStub.getMockInstance();
- String result = authRoa.shakehand(mockInstance, null, mockResInstance);
+ String result = authRoa.shakehand(null, mockResInstance);
JSONObject resultJson = new JSONObject();
resultJson.put("status", "running");
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfAdapterResourceRoaTest.java b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfAdapterResourceRoaTest.java
index d8ea9cd4..58c584d8 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfAdapterResourceRoaTest.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfAdapterResourceRoaTest.java
@@ -43,13 +43,14 @@ public class VnfAdapterResourceRoaTest {
public JSONObject getAllCloud(String url, String conntoken) {
JSONObject resultObj = new JSONObject();
resultObj.put("dn", "test");
+ resultObj.put("vim_id", "12345");
return resultObj;
}
};
VnfAdapterResourceRoa vnfAdapter = new VnfAdapterResourceRoa();
- String result = vnfAdapter.getAllCloudInfo(null);
- assertEquals("test", result);
+ String result = vnfAdapter.getAllCloudInfo();
+ assertEquals("12345", result);
}
}