Adding UI extensibility

[aai/sparky-be.git] / src / test / java / org / onap / aai / sparky / dal / aai / config / ActiveInventorySslConfigTest.java

diff --git a/src/test/java/org/onap/aai/sparky/dal/aai/config/ActiveInventorySslConfigTest.java b/src/test/java/org/onap/aai/sparky/dal/aai/config/ActiveInventorySslConfigTest.java
index d6bcf99..1e180af 100644 (file)
--- a/src/test/java/org/onap/aai/sparky/dal/aai/config/ActiveInventorySslConfigTest.java
+++ b/src/test/java/org/onap/aai/sparky/dal/aai/config/ActiveInventorySslConfigTest.java
@@ -1,27 +1,27 @@
-/* 
-* ============LICENSE_START=======================================================
-* SPARKY (inventory UI service)
-* ================================================================================
-* Copyright © 2017 AT&T Intellectual Property.
-* Copyright © 2017 Amdocs
-* 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 and OpenECOMP are trademarks
-* and service marks of AT&T Intellectual Property.
-*/
+/**
+ * ============LICENSE_START===================================================
+ * SPARKY (AAI UI service)
+ * ============================================================================
+ * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 Amdocs
+ * 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 and OpenECOMP are trademarks
+ * and service marks of AT&T Intellectual Property.
+ */
 
 package org.onap.aai.sparky.dal.aai.config;
 
@@ -40,8 +40,6 @@ import org.mockito.Mockito;
 import org.onap.aai.sparky.dal.aai.config.ActiveInventorySslConfig;
 import org.onap.aai.sparky.util.Encryptor;
 
-//import com.att.aai.util.EncryptedConfiguration;
-
 public class ActiveInventorySslConfigTest {
 
   private Encryptor encryptorMock = Mockito.mock(Encryptor.class);
@@ -57,7 +55,7 @@ public class ActiveInventorySslConfigTest {
   }
 
   private Properties buildExpectedPropertyDefinition() throws Exception {
-    Encryptor encryptor = new Encryptor();
+
     Properties props = new Properties();
 
     props.put("aai.ssl.enableDebug", "false");
@@ -65,11 +63,7 @@ public class ActiveInventorySslConfigTest {
     props.put("aai.ssl.validateServiceCertificateChain", "false");
     props.put("aai.ssl.keystore.type", "pkcs12");
     props.put("aai.ssl.keystore.filename", "/opt/app/applocal/etc/cert.crt");
-    /*
-     * props.put("aai.ssl.keystore.pass",
-     * encryptor.decryptValue(value)EncryptedConfiguration.encryptToTriple("AES",
-     * Long.toString(123456789 % 10000), "aa1admin", "password"));
-     */
+    props.put("aai.ssl.keystore.pass", "OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o");
     props.put("aai.ssl.truststore.type", "jks");
     props.put("aai.ssl.truststore.filename", "/opt/app/applocal/etc/cert.crt");
     props.put("aai.ssl.basicAuth.username", "username");