summaryrefslogtreecommitdiffstats
path: root/adapters/mso-adapter-utils/src/test/java/org
diff options
context:
space:
mode:
authorLukasz Muszkieta <lukasz.muszkieta@nokia.com>2017-12-18 15:03:24 +0100
committerSeshu Kumar M <seshu.kumar.m@huawei.com>2018-01-03 05:08:44 +0000
commit4108c5aca1ee4c556af3937c09c4415d2ebbde70 (patch)
tree3ce4af7faaa655dac3e96769fa6608327d46d091 /adapters/mso-adapter-utils/src/test/java/org
parent58ee7ac8ab60a17a508358a4c1353eac00411be5 (diff)
refactoring - remove unused code
Issue-ID: SO-360 Change-Id: Iac9653fa6d5f10de7986fa3d511535d74f0c24c8 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>
Diffstat (limited to 'adapters/mso-adapter-utils/src/test/java/org')
-rw-r--r--adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/CloudConfigTest.java60
1 files changed, 23 insertions, 37 deletions
diff --git a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/CloudConfigTest.java b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/CloudConfigTest.java
index 4d9b64e920..dd1b396fae 100644
--- a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/CloudConfigTest.java
+++ b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/CloudConfigTest.java
@@ -35,12 +35,8 @@ import org.openecomp.mso.cloud.CloudIdentity;
import org.openecomp.mso.cloud.CloudSite;
import org.openecomp.mso.openstack.exceptions.MsoCloudIdentityNotFound;
-
-
/**
* This class implements test methods of the CloudConfig features.
- *
- *
*/
public class CloudConfigTest {
@@ -110,37 +106,29 @@ public class CloudConfigTest {
CloudIdentity identity3 = identityMap.get("MTINJVCC101_DCP");
CloudIdentity identity4 = identityMap.get("MTSNJA3DCP1");
-// assertEquals (identity1.getKeystoneUrl(), "http://localhost:5000/v2.0");
-// assertEquals (identity1.getIdentityUrl(), "http://localhost:5000/v2.0");
- assertEquals (identity1.getMsoId(), "john");
- assertEquals (identity1.getMsoPass(), "changeme");
- assertEquals (identity1.getAdminTenant(), "admin");
- assertEquals (identity1.getMemberRole(), "_member_");
- assertEquals (identity1.hasTenantMetadata(), false);
-
-// assertEquals (identity2.getKeystoneUrl(), "http://localhost:5000/v2.0");
-// assertEquals (identity2.getIdentityUrl(), "http://localhost:5000/v2.0");
- assertEquals (identity2.getMsoId(), "mockId");
- assertEquals (identity2.getMsoPass(), "stack123");
- assertEquals (identity2.getAdminTenant(), "service");
- assertEquals (identity2.getMemberRole(), "_member_");
- assertEquals (identity2.hasTenantMetadata(), false);
-
-// assertEquals (identity3.getKeystoneUrl(), "http://localhost:5000/v2.0");
-// assertEquals (identity3.getIdentityUrl(), "http://localhost:5000/v2.0");
- assertEquals (identity3.getMsoId(), "mockIdToo");
- assertEquals (identity3.getMsoPass(), "AICG@mm@@2015");
- assertEquals (identity3.getAdminTenant(), "service");
- assertEquals (identity3.getMemberRole(), "admin");
- assertEquals (identity3.hasTenantMetadata(), true);
-
-// assertEquals (identity4.getKeystoneUrl(), "https://localhost:5000/v2.0");
-// assertEquals (identity4.getIdentityUrl(), "https://localhost:5000/v2.0");
- assertEquals (identity4.getMsoId(), "mockIdToo");
- assertEquals (identity4.getMsoPass(), "2315QRS2015srq");
- assertEquals (identity4.getAdminTenant(), "service");
- assertEquals (identity4.getMemberRole(), "admin");
- assertEquals (identity4.hasTenantMetadata(), true);
+ assertEquals("john", identity1.getMsoId());
+ assertEquals("changeme", identity1.getMsoPass());
+ assertEquals("admin", identity1.getAdminTenant());
+ assertEquals("_member_", identity1.getMemberRole());
+ assertEquals(false, identity1.hasTenantMetadata());
+
+ assertEquals("mockId", identity2.getMsoId());
+ assertEquals("stack123", identity2.getMsoPass());
+ assertEquals("service", identity2.getAdminTenant());
+ assertEquals("_member_", identity2.getMemberRole());
+ assertEquals(false, identity2.hasTenantMetadata());
+
+ assertEquals("mockIdToo", identity3.getMsoId());
+ assertEquals("AICG@mm@@2015", identity3.getMsoPass());
+ assertEquals("service", identity3.getAdminTenant());
+ assertEquals("admin", identity3.getMemberRole());
+ assertEquals(true, identity3.hasTenantMetadata());
+
+ assertEquals("mockIdToo", identity4.getMsoId());
+ assertEquals("2315QRS2015srq", identity4.getMsoPass());
+ assertEquals("service", identity4.getAdminTenant());
+ assertEquals("admin", identity4.getMemberRole());
+ assertEquals(true, identity4.hasTenantMetadata());
}
@@ -162,8 +150,6 @@ public class CloudConfigTest {
public final void testGetIdentityService () {
CloudIdentity identity1 = con.getIdentityService("MT_KEYSTONE");
assertNotNull(identity1);
-// assertEquals (identity1.getKeystoneUrl(), "http://localhost:5000/v2.0");
-// assertEquals (identity1.getIdentityUrl(), "http://localhost:5000/v2.0");
assertEquals (identity1.getMsoId(), "john");
assertEquals (identity1.getMsoPass(), "changeme");
assertEquals (identity1.getAdminTenant(), "admin");