Catalog alignment

Issue-ID: SDC-2724
Signed-off-by: ys9693 <ys9693@att.com>
Change-Id: I52b4aacb58cbd432ca0e1ff7ff1f7dd52099c6fe

2 files changed, 0 insertions, 146 deletions

diff --git a/security-utils/src/test/java/org/openecomp/sdc/security/PasswordsTest.java b/security-utils/src/test/java/org/openecomp/sdc/security/PasswordsTest.java
deleted file mode 100644
index 9310917ba1..0000000000
--- a/security-utils/src/test/java/org/openecomp/sdc/security/PasswordsTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.security;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-public class PasswordsTest {
-
-    @Test
-    public void hashPassword() throws Exception {
-        String hash = Passwords.hashPassword("hello1234");
-        assertTrue(Passwords.isExpectedPassword("hello1234", hash));
-
-        //test different salt-> result in different hash
-        String hash2 = Passwords.hashPassword("hello1234");
-        assertFalse(hash.equals(hash2));
-
-        String hash3  = Passwords.hashPassword("");
-        assertTrue(Passwords.isExpectedPassword("", hash3));
-
-        String hash4  = Passwords.hashPassword(null);
-        assertTrue(hash4 == null);
-    }
-
-    @Test
-    public void isExpectedPassword() throws Exception {
-        //region isExpectedPassword(String password, String salt, String hash)
-        assertTrue(Passwords.isExpectedPassword(null, null, null));
-        //valid hash
-        assertTrue(Passwords.isExpectedPassword("hello1234", "e0277df331f4ff8f74752ac4a8fbe03b", "6dfbad308cdf53c9ff2ee2dca811ee92f1b359586b33027580e2ff92578edbd0"));
-        //invalid salt
-        assertFalse(Passwords.isExpectedPassword("hello1234", "c0000df331f4ff8f74752ac4a00be03c", "6dfbad308cdf53c9ff2ee2dca811ee92f1b359586b33027580e2ff92578edbd0"));
-        assertFalse(Passwords.isExpectedPassword("hello1234", null, "6dfbad308cdf53c9ff2ee2dca811ee92f1b359586b33027580e2ff92578edbd0"));
-        //exacly 1 param uninitialized
-        assertFalse(Passwords.isExpectedPassword("hello1234", "", null));
-        assertFalse(Passwords.isExpectedPassword(null, "", "hello1234"));
-        //no salt & no hash
-        assertFalse(Passwords.isExpectedPassword("hello1234", null, "hello1234"));
-        //endregion
-
-        //region isExpectedPassword(String password, String expectedHash)
-        assertTrue(Passwords.isExpectedPassword(null, null));
-        //valid hash
-        assertTrue(Passwords.isExpectedPassword("hello1234", "e0277df331f4ff8f74752ac4a8fbe03b:6dfbad308cdf53c9ff2ee2dca811ee92f1b359586b33027580e2ff92578edbd0"));
-        //invalid salt
-        assertFalse(Passwords.isExpectedPassword("hello1234", "c0000df331f4ff8f74752ac4a00be03c:6dfbad308cdf53c9ff2ee2dca811ee92f1b359586b33027580e2ff92578edbd0"));
-        //exacly 1 param uninitialized
-        assertFalse(Passwords.isExpectedPassword("hello1234", null));
-        assertFalse(Passwords.isExpectedPassword(null, "hello1234"));
-        //no salt & no hash
-        assertFalse(Passwords.isExpectedPassword("hello1234", "hello1234"));
-        //endregion
-    }
-
-    @Test
-    public void hashtest() {
-        String password = "123456";
-        String hash = Passwords.hashPassword(password);
-        assertTrue(Passwords.isExpectedPassword(password, hash));
-        password = "1sdfgsgd23456";
-        hash = Passwords.hashPassword(password);
-        assertTrue(Passwords.isExpectedPassword(password, hash));
-        password = "1sdfgsgd2345((*&%$%6";
-        hash = Passwords.hashPassword(password);
-        assertTrue(Passwords.isExpectedPassword(password, hash));
-        password = "";
-        hash = Passwords.hashPassword(password);
-        assertTrue(Passwords.isExpectedPassword(password, hash));
-        password = " ";
-        hash = Passwords.hashPassword(password);
-        assertTrue(Passwords.isExpectedPassword(password, hash));
-    }
-
-
-}
diff --git a/security-utils/src/test/java/org/openecomp/sdc/security/SecurityUtilTest.java b/security-utils/src/test/java/org/openecomp/sdc/security/SecurityUtilTest.java
deleted file mode 100644
index e114a468e4..0000000000
--- a/security-utils/src/test/java/org/openecomp/sdc/security/SecurityUtilTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.sdc.security;
-
-import org.junit.Test;
-
-import java.util.Base64;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-
-public class SecurityUtilTest {
-
-    @Test
-    public void encryptDecryptAES128() throws Exception {
-        String data = "decrypt SUCCESS!!";
-        String encrypted = SecurityUtil.INSTANCE.encrypt(data).left().value();
-        assertNotEquals( data, encrypted );
-        byte[] decryptMsg = Base64.getDecoder().decode(encrypted);
-        assertEquals( SecurityUtil.INSTANCE.decrypt( decryptMsg , false ).left().value() ,data );
-        assertEquals( SecurityUtil.INSTANCE.decrypt( encrypted.getBytes() , true ).left().value() ,data );
-    }
-
-    @Test
-    public void obfuscateKey() throws Exception {
-        String key = "abcdefghij123456";
-        String expectedkey = "********ij123456";
-        String obfuscated = SecurityUtil.INSTANCE.obfuscateKey( key );
-        System.out.println( obfuscated );
-        assertEquals( obfuscated , expectedkey );
-    }
-}