summaryrefslogtreecommitdiffstats
path: root/src/test/java
diff options
context:
space:
mode:
authorDeterme, Sebastien (sd378r) <sd378r@intl.att.com>2017-10-30 18:50:37 +0100
committerDeterme, Sebastien (sd378r) <sd378r@intl.att.com>2017-10-30 19:00:08 +0100
commit434170f50621917a7fb2cbe7c7b01c4b29a8211e (patch)
treedc52603bac0159f3a3f1c3b60222df7d500ad6bd /src/test/java
parent2e5ec6aaac811c9a0efd8f80eef39fd91a1ac9ea (diff)
Add encryption for passwords
Add encrypted password on all values specified in the properties files, unit tests have been reworked. Change-Id: I619ff67fe1025f69af733b776f055914f949f26a Issue-ID: CLAMP-64 Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
Diffstat (limited to 'src/test/java')
-rw-r--r--src/test/java/org/onap/clamp/clds/it/CryptoUtilsItCase.java76
-rw-r--r--src/test/java/org/onap/clamp/clds/it/SdcCatalogServicesItCase.java5
-rw-r--r--src/test/java/org/onap/clamp/clds/it/SdcReqItCase.java (renamed from src/test/java/org/onap/clamp/clds/client/req/SdcReqTest.java)44
3 files changed, 105 insertions, 20 deletions
diff --git a/src/test/java/org/onap/clamp/clds/it/CryptoUtilsItCase.java b/src/test/java/org/onap/clamp/clds/it/CryptoUtilsItCase.java
new file mode 100644
index 000000000..f03fe83c7
--- /dev/null
+++ b/src/test/java/org/onap/clamp/clds/it/CryptoUtilsItCase.java
@@ -0,0 +1,76 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2017 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============================================
+ * ===================================================================
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+
+package org.onap.clamp.clds.it;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.security.GeneralSecurityException;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.onap.clamp.clds.util.CryptoUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringRunner;
+
+/**
+ * Test Crypto Utils with Spring.
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@TestPropertySource(locations = "classpath:application-no-camunda.properties")
+public class CryptoUtilsItCase {
+ @Autowired
+ private CryptoUtils cryptoUtils;
+
+ /**
+ * This method tests encryption.
+ *
+ * @throws GeneralSecurityException
+ */
+ @Test
+ public final void testEncryption() throws GeneralSecurityException {
+ final String testData = "This is a test string";
+ final String encodedStringExpected = "A5CB112C9F608A220B35AFED08024D98B9653333AF4C9527C2E934DE473F6145";
+ String encodedString = cryptoUtils.encrypt(testData);
+ assertNotNull(encodedString);
+ assertEquals(encodedStringExpected, encodedString);
+ }
+
+ /**
+ * This method tests decryption.
+ *
+ * @throws GeneralSecurityException
+ */
+ @Test
+ public final void testDecryption() throws GeneralSecurityException {
+ final String decodedStringExpected = "This is a test string";
+ final String encodedString = "A5CB112C9F608A220B35AFED08024D98B9653333AF4C9527C2E934DE473F6145";
+ String decryptedString = cryptoUtils.decrypt(encodedString);
+ assertNotNull(decryptedString);
+ assertEquals(decodedStringExpected, decryptedString);
+ }
+} \ No newline at end of file
diff --git a/src/test/java/org/onap/clamp/clds/it/SdcCatalogServicesItCase.java b/src/test/java/org/onap/clamp/clds/it/SdcCatalogServicesItCase.java
index 0deae6d31..b684a506f 100644
--- a/src/test/java/org/onap/clamp/clds/it/SdcCatalogServicesItCase.java
+++ b/src/test/java/org/onap/clamp/clds/it/SdcCatalogServicesItCase.java
@@ -298,6 +298,11 @@ public class SdcCatalogServicesItCase extends AbstractItCase {
SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcVFCResources.json"), "UTF-8"))
.when(spy).getCldsServicesOrResourcesBasedOnURL(allVfcResourcesDetailUrl, false);
+ String allCvfcResourcesDetailUrl = refProp.getStringValue("sdc.catalog.url") + "resources?resourceType=CVFC";
+ Mockito.doReturn(IOUtils.toString(
+ SdcCatalogServicesItCase.class.getResourceAsStream("/example/sdc/sdcCVFCResources.json"), "UTF-8"))
+ .when(spy).getCldsServicesOrResourcesBasedOnURL(allCvfcResourcesDetailUrl, false);
+
String allVfAlarms = refProp.getStringValue("sdc.catalog.url")
+ "resources/84855843-5247-4e97-a2bd-5395a510253b/artifacts/d57ac7ec-f3c3-4793-983a-c75ac3a43153";
Mockito.doReturn(IOUtils.toString(
diff --git a/src/test/java/org/onap/clamp/clds/client/req/SdcReqTest.java b/src/test/java/org/onap/clamp/clds/it/SdcReqItCase.java
index 497abe0f7..faff28463 100644
--- a/src/test/java/org/onap/clamp/clds/client/req/SdcReqTest.java
+++ b/src/test/java/org/onap/clamp/clds/it/SdcReqItCase.java
@@ -21,30 +21,41 @@
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
*/
-package org.onap.clamp.clds.client.req;
+package org.onap.clamp.clds.it;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import java.security.GeneralSecurityException;
import java.util.ArrayList;
import java.util.List;
import org.camunda.bpm.engine.delegate.DelegateExecution;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.onap.clamp.clds.client.SdcCatalogServices;
+import org.onap.clamp.clds.client.req.SdcReq;
import org.onap.clamp.clds.model.CldsSdcResource;
import org.onap.clamp.clds.model.CldsSdcServiceDetail;
import org.onap.clamp.clds.model.prop.Global;
import org.onap.clamp.clds.model.prop.ModelProperties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringRunner;
-public class SdcReqTest {
-
- String baseUrl = "AYBABTU";
- String serviceInvariantUuid = "serviceInvariantUUID";
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@TestPropertySource(locations = "classpath:application-no-camunda.properties")
+public class SdcReqItCase {
+ String baseUrl = "AYBABTU";
+ String serviceInvariantUuid = "serviceInvariantUUID";
+ @Autowired
+ private SdcReq sdcReq;
@Test
- public void getSdcReqUrlsListNoGlobalPropTest() {
+ public void getSdcReqUrlsListNoGlobalPropTest() throws GeneralSecurityException {
ModelProperties prop = mock(ModelProperties.class);
SdcCatalogServices sdcCatalogServices = mock(SdcCatalogServices.class);
DelegateExecution delegateExecution = mock(DelegateExecution.class);
@@ -53,32 +64,25 @@ public class SdcReqTest {
cldsSdcResources.add(cldsSdcResource);
List<String> resourceVf = new ArrayList<>();
resourceVf.add(serviceInvariantUuid);
-
- Assert.assertTrue(SdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty());
-
+ Assert.assertTrue(sdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty());
Global global = mock(Global.class);
when(prop.getGlobal()).thenReturn(global);
- Assert.assertTrue(SdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty());
-
+ Assert.assertTrue(sdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty());
when(global.getService()).thenReturn(serviceInvariantUuid);
- Assert.assertTrue(SdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty());
-
+ Assert.assertTrue(sdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty());
CldsSdcServiceDetail cldsSdcServiceDetail = mock(CldsSdcServiceDetail.class);
when(sdcCatalogServices.getCldsSdcServiceDetailFromJson(null)).thenReturn(cldsSdcServiceDetail);
when(global.getResourceVf()).thenReturn(new ArrayList<>());
- Assert.assertTrue(SdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty());
-
+ Assert.assertTrue(sdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty());
when(cldsSdcServiceDetail.getResources()).thenReturn(cldsSdcResources);
- Assert.assertTrue(SdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty());
-
+ Assert.assertTrue(sdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty());
when(cldsSdcResource.getResoucreType()).thenReturn("VF");
- Assert.assertTrue(SdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty());
-
+ Assert.assertTrue(sdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution).isEmpty());
when(global.getResourceVf()).thenReturn(resourceVf);
when(cldsSdcResource.getResourceInvariantUUID()).thenReturn(serviceInvariantUuid);
when(cldsSdcResource.getResourceInstanceName()).thenReturn("Resource instance name");
List<String> expected = new ArrayList<>();
expected.add("AYBABTU/null/resourceInstances/resourceinstancename/artifacts");
- Assert.assertEquals(expected, SdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution));
+ Assert.assertEquals(expected, sdcReq.getSdcReqUrlsList(prop, baseUrl, sdcCatalogServices, delegateExecution));
}
}