Replaced all tabs with spaces in java and pom.xml

[so.git] / mso-catalog-db / src / test / java / org / onap / so / db / catalog / beans / CloudIdentityTest.java

diff --git a/mso-catalog-db/src/test/java/org/onap/so/db/catalog/beans/CloudIdentityTest.java b/mso-catalog-db/src/test/java/org/onap/so/db/catalog/beans/CloudIdentityTest.java
index f8f3435..f4e5223 100644 (file)
--- a/mso-catalog-db/src/test/java/org/onap/so/db/catalog/beans/CloudIdentityTest.java
+++ b/mso-catalog-db/src/test/java/org/onap/so/db/catalog/beans/CloudIdentityTest.java
@@ -23,9 +23,7 @@ package org.onap.so.db.catalog.beans;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-
 import java.security.GeneralSecurityException;
-
 import org.junit.Test;
 import org.onap.so.db.catalog.beans.AuthenticationType;
 import org.onap.so.db.catalog.beans.CloudIdentity;
@@ -33,71 +31,71 @@ import org.onap.so.db.catalog.beans.ServerType;
 import org.onap.so.utils.CryptoUtils;
 
 public class CloudIdentityTest {
-       
-       private CloudIdentity cloudIdentity = new CloudIdentity();
-       private static final String ID = "testId";
-       private static final String IDENTITY_URL = "testIdentityUrl";
-       private static final String MSO_ID = "testMsoId";
-       private static final String MSO_PASS = "testMsoPassword";
-       private static final String ADMIN_TENANT = "testAdminTenant";
-       private static final String MEMBER_ROLE = "testMemberRole";
-       private static final Boolean TENANT_METADATA = true;
-       
+
+    private CloudIdentity cloudIdentity = new CloudIdentity();
+    private static final String ID = "testId";
+    private static final String IDENTITY_URL = "testIdentityUrl";
+    private static final String MSO_ID = "testMsoId";
+    private static final String MSO_PASS = "testMsoPassword";
+    private static final String ADMIN_TENANT = "testAdminTenant";
+    private static final String MEMBER_ROLE = "testMemberRole";
+    private static final Boolean TENANT_METADATA = true;
+
     @Test
-    public final void testCloudIdentity () {
-        CloudIdentity id = new CloudIdentity ();
-        id.setAdminTenant ("AdminTenant");
-        id.setId ("id");
-//        id.setKeystoneUrl ("keystone");
-        id.setIdentityUrl ("keystone");
-        id.setMemberRole ("member");
-        id.setMsoId ("msoId");
-        id.setMsoPass (CryptoUtils.encryptCloudConfigPassword("password"));
-        id.setTenantMetadata (true);
+    public final void testCloudIdentity() {
+        CloudIdentity id = new CloudIdentity();
+        id.setAdminTenant("AdminTenant");
+        id.setId("id");
+        // id.setKeystoneUrl ("keystone");
+        id.setIdentityUrl("keystone");
+        id.setMemberRole("member");
+        id.setMsoId("msoId");
+        id.setMsoPass(CryptoUtils.encryptCloudConfigPassword("password"));
+        id.setTenantMetadata(true);
         id.setIdentityServerType(null);
         id.setIdentityAuthenticationType(null);
-        
 
-        assertTrue (id.getAdminTenant ().equals ("AdminTenant"));
-        assertTrue (id.getId ().equals ("id"));
-//        assertTrue (id.getKeystoneUrl ().equals ("keystone"));
-        assertTrue (id.getMemberRole ().equals ("member"));
-        assertTrue (id.getMsoId ().equals ("msoId"));
-        assertTrue (CryptoUtils.decryptCloudConfigPassword(id.getMsoPass()).equals ("password"));
-        assertTrue (id.getTenantMetadata ());
-//        assertTrue (id.toString ().contains ("keystone"));
+
+        assertTrue(id.getAdminTenant().equals("AdminTenant"));
+        assertTrue(id.getId().equals("id"));
+        // assertTrue (id.getKeystoneUrl ().equals ("keystone"));
+        assertTrue(id.getMemberRole().equals("member"));
+        assertTrue(id.getMsoId().equals("msoId"));
+        assertTrue(CryptoUtils.decryptCloudConfigPassword(id.getMsoPass()).equals("password"));
+        assertTrue(id.getTenantMetadata());
+        // assertTrue (id.toString ().contains ("keystone"));
         assertTrue(id.toString().contains("null"));
     }
 
     @Test
-    public final void testEncryption () throws GeneralSecurityException {
+    public final void testEncryption() throws GeneralSecurityException {
         String encrypted = CryptoUtils.encryptCloudConfigPassword("password");
-        assertTrue (encrypted != null);
-        assertTrue (!encrypted.equals ("password"));
+        assertTrue(encrypted != null);
+        assertTrue(!encrypted.equals("password"));
     }
-    
+
     @Test
     public void cloneTest() {
-       cloudIdentity = setupCloudIdentity(cloudIdentity, ID, IDENTITY_URL, MSO_ID, MSO_PASS, ADMIN_TENANT, 
-                       MEMBER_ROLE, TENANT_METADATA, ServerType.ORM, AuthenticationType.USERNAME_PASSWORD);
-       CloudIdentity cloudIdentity2 = cloudIdentity.clone();
-       
-       assertEquals(cloudIdentity.getClass(), cloudIdentity2.getClass());
+        cloudIdentity = setupCloudIdentity(cloudIdentity, ID, IDENTITY_URL, MSO_ID, MSO_PASS, ADMIN_TENANT, MEMBER_ROLE,
+                TENANT_METADATA, ServerType.ORM, AuthenticationType.USERNAME_PASSWORD);
+        CloudIdentity cloudIdentity2 = cloudIdentity.clone();
+
+        assertEquals(cloudIdentity.getClass(), cloudIdentity2.getClass());
+    }
+
+    private CloudIdentity setupCloudIdentity(CloudIdentity obj, String id, String identityUrl, String msoId,
+            String msoPass, String adminTenant, String memberRole, Boolean tenantMetadata,
+            ServerType identityServerType, AuthenticationType identityAuthenticationType) {
+        obj.setId(id);
+        obj.setIdentityUrl(identityUrl);
+        obj.setMsoId(msoId);
+        obj.setMsoPass(msoPass);
+        obj.setAdminTenant(adminTenant);
+        obj.setMemberRole(memberRole);
+        obj.setTenantMetadata(tenantMetadata);
+        obj.setIdentityServerType(identityServerType);
+        obj.setIdentityAuthenticationType(identityAuthenticationType);
+
+        return obj;
     }
-       
-    private CloudIdentity setupCloudIdentity(CloudIdentity obj, String id, String identityUrl, 
-               String msoId, String msoPass, String adminTenant, String memberRole, Boolean tenantMetadata, 
-               ServerType identityServerType, AuthenticationType identityAuthenticationType) {
-               obj.setId(id);
-               obj.setIdentityUrl(identityUrl);
-               obj.setMsoId(msoId);
-               obj.setMsoPass(msoPass);
-               obj.setAdminTenant(adminTenant);
-               obj.setMemberRole(memberRole);
-               obj.setTenantMetadata(tenantMetadata);
-               obj.setIdentityServerType(identityServerType);
-               obj.setIdentityAuthenticationType(identityAuthenticationType);
-               
-               return obj;
-       }
 }