From 9200382f2ce7b4bb729aa287d0878004b2d2b4f9 Mon Sep 17 00:00:00 2001
From: siddharth0905 <siddharth.singh4@amdocs.com>
Date: Mon, 23 Jul 2018 17:01:41 +0300
Subject: Refactoring Consolidation Service

Changes as per comments

Change-Id: Ic2c800513265daf4bbed1f15920864ba0cb28859
Issue-ID: SDC-1330
Signed-off-by: siddharth0905 <siddharth.singh4@amdocs.com>
---
 .../resourcetranslation/BaseResourceTranslationTest.java  | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java')

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java
index f399cc15e0..56d0b2da9f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java
@@ -260,8 +260,8 @@ public class BaseResourceTranslationTest {
             case VALIDATE_CONNECTIVITY:
               validateComputeConnectivityIn(computeTemplateConsolidationData,
                   expectedServiceTemplate);
-              validateComputeConnectivityOut(computeNodeTemplateId,computeTemplateConsolidationData,
-                  expectedServiceTemplate);
+              validateComputeConnectivityOut(computeNodeTemplateId, computeTemplateConsolidationData,
+                      expectedServiceTemplate);
               break;
             case VALIDATE_DEPENDS_ON:
               validateDependsOnInConsolidationData(computeNodeTemplateId,
@@ -274,11 +274,9 @@ public class BaseResourceTranslationTest {
     }
   }
 
-  protected void validateGetAttribute(String testName){
-    Map<String, ServiceTemplate> expectedServiceTemplateModels = TestUtils.getServiceTemplates
-        (expectedResultMap);
-    validateGetAttr(translationContext,expectedServiceTemplateModels,testName);
-  }
+    protected void validateGetAttribute(String testName) {
+        validateGetAttr(translationContext, testName);
+    }
 
   protected void validateNestedTemplateConsolidationData(String testName){
     validateNestedConsolidationData(translationContext, testName);
@@ -311,8 +309,7 @@ public class BaseResourceTranslationTest {
         switch(ConsolidationDataValidationType.VALIDATE_CONNECTIVITY){
           case VALIDATE_CONNECTIVITY:
             validatePortConnectivityIn(portTemplateConsolidationData,expectedServiceTemplate);
-            validatePortConnectivityOut(portNodeTemplateId, portTemplateConsolidationData,
-                expectedServiceTemplate);
+            validatePortConnectivityOut(portNodeTemplateId, portTemplateConsolidationData, expectedServiceTemplate);
             break;
         }
       }
-- 
cgit 1.2.3-korg