Change code in appc dispatcher for new LCMs in R6

[appc.git] / appc-dg / appc-dg-shared / appc-dg-common / src / test / java / org / onap / appc / dg / common / impl / TestVNFConfiguratorImpl.java

diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/onap/appc/dg/common/impl/TestVNFConfiguratorImpl.java b/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/onap/appc/dg/common/impl/TestVNFConfiguratorImpl.java
index 8b08fc2..49bc43d 100644 (file)
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/onap/appc/dg/common/impl/TestVNFConfiguratorImpl.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/test/java/org/onap/appc/dg/common/impl/TestVNFConfiguratorImpl.java
@@ -2,22 +2,22 @@
  * ============LICENSE_START=======================================================
  * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Copyright (C) 2017 Amdocs
  * =============================================================================
  * 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=========================================================
  */
 
@@ -44,7 +44,7 @@ import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({MDSALStoreImpl.class,MDSALStoreFactory.class})
+@PrepareForTest({MDSALStoreImpl.class, MDSALStoreFactory.class})
 public class TestVNFConfiguratorImpl {
 
     private static final EELFLogger logger = EELFManager.getInstance().getLogger(TestVNFConfiguratorImpl.class);
@@ -57,11 +57,11 @@ public class TestVNFConfiguratorImpl {
     @Test(expected = APPCException.class)
     public void testValidations() throws APPCException {
         VNFConfigurator configurator = new VNFConfiguratorImpl();
-        Map<String,String> params = new HashMap<String, String>();
-        params.put("uniqueId","uniqueId");
-        params.put("yang","yang");
-        params.put("configJSON","configJSON");
-        configurator.storeConfig(params,new SvcLogicContext());
+        Map<String, String> params = new HashMap<String, String>();
+        params.put("uniqueId", "uniqueId");
+        params.put("yang", "yang");
+        params.put("configJSON", "configJSON");
+        configurator.storeConfig(params, new SvcLogicContext());
     }
 
     @Test
@@ -71,14 +71,15 @@ public class TestVNFConfiguratorImpl {
         PowerMockito.mockStatic(MDSALStoreFactory.class);
         MDSALStore mdsalStore = PowerMockito.mock(MDSALStoreImpl.class);
         PowerMockito.when(MDSALStoreFactory.createMDSALStore()).thenReturn(mdsalStore);
-        PowerMockito.when(mdsalStore.isModulePresent(Matchers.anyString(),(Date) Matchers.anyObject())).thenReturn(true);
-
-        Map<String,String> params = new HashMap<String, String>();
-        params.put("uniqueId","uniqueId");
-        params.put("yang","yang");
-        params.put("configJSON","configJSON");
-        params.put("requestId","requestId");
-        configurator.storeConfig(params,new SvcLogicContext());
+        PowerMockito.when(mdsalStore.isModulePresent(Matchers.anyString(), (Date) Matchers.anyObject()))
+                .thenReturn(true);
+
+        Map<String, String> params = new HashMap<String, String>();
+        params.put("uniqueId", "uniqueId");
+        params.put("yang", "yang");
+        params.put("configJSON", "configJSON");
+        params.put("requestId", "requestId");
+        configurator.storeConfig(params, new SvcLogicContext());
     }
 
     @Test
@@ -91,16 +92,18 @@ public class TestVNFConfiguratorImpl {
 
         PowerMockito.when(MDSALStoreFactory.createMDSALStore()).thenReturn(mdsalStore);
 
-        PowerMockito.when(mdsalStore.isModulePresent(Matchers.anyString(),(Date) Matchers.anyObject())).thenReturn(false);
+        PowerMockito.when(mdsalStore.isModulePresent(Matchers.anyString(), (Date) Matchers.anyObject()))
+                .thenReturn(false);
 
-        PowerMockito.doNothing().when(mdsalStore).storeYangModule(Matchers.anyString(),(BundleInfo)Matchers.anyObject());
+        PowerMockito.doNothing()
+                .when(mdsalStore).storeYangModule(Matchers.anyString(), (BundleInfo) Matchers.anyObject());
 
-        Map<String,String> params = new HashMap<>();
-        params.put("uniqueId","uniqueId");
-        params.put("yang","yang");
-        params.put("configJSON","configJSON");
-        params.put("requestId","requestId");
-        configurator.storeConfig(params,new SvcLogicContext());
+        Map<String, String> params = new HashMap<String, String>();
+        params.put("uniqueId", "uniqueId");
+        params.put("yang", "yang");
+        params.put("configJSON", "configJSON");
+        params.put("requestId", "requestId");
+        configurator.storeConfig(params, new SvcLogicContext());
 
     }
 }