From cb72310ab92091c47502f7e3c1bf2162884dca83 Mon Sep 17 00:00:00 2001
From: dekstroza <dejan.kitic@ericsson.com>
Date: Fri, 18 May 2018 15:23:12 +0100
Subject: R2 model updates

All model verification changes and updated in single patch.

Change-Id: Ie794dc141400490bf1a858a8d6c9d1c45e5b9443
Issue-ID: SDC-1253
Signed-off-by: Michael Lando <ml636r@att.com>
---
 .../globaltypes/GlobalTypesServiceTemplatesTest.java     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src')

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesServiceTemplatesTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesServiceTemplatesTest.java
index 1a51b002b1..72d7f96038 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesServiceTemplatesTest.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesServiceTemplatesTest.java
@@ -46,13 +46,13 @@ public class GlobalTypesServiceTemplatesTest {
     Map<String, ServiceTemplate> globalTypesServiceTemplates =
         getGlobalTypesServiceTemplates(OnboardingTypesEnum.CSAR);
     Assert.assertNotNull(globalTypesServiceTemplates);
-    Assert.assertEquals(globalTypesServiceTemplates.size(), 25);
+    Assert.assertEquals(27, globalTypesServiceTemplates.size());
     Set<String> globalTypeFolders = globalTypesServiceTemplates.keySet();
     List<String> onapGlobalTypes = globalTypeFolders.stream()
         .filter(resourceKey -> resourceKey.contains("onap"))
         .collect(Collectors.toList());
     Assert.assertNotNull(onapGlobalTypes);
-    Assert.assertEquals(onapGlobalTypes.size(), 5);
+    Assert.assertEquals(7, onapGlobalTypes.size());
   }
 
   @Test
@@ -60,12 +60,12 @@ public class GlobalTypesServiceTemplatesTest {
     Map<String, ServiceTemplate> globalTypesServiceTemplates =
         getGlobalTypesServiceTemplates(OnboardingTypesEnum.ZIP);
     Assert.assertNotNull(globalTypesServiceTemplates);
-    Assert.assertEquals(globalTypesServiceTemplates.size(), 20);
+    Assert.assertEquals(20, globalTypesServiceTemplates.size());
     Set<String> globalTypeFolders = globalTypesServiceTemplates.keySet();
     List<String> onapGlobalTypes = globalTypeFolders.stream()
         .filter(resourceKey -> resourceKey.contains("onap"))
         .collect(Collectors.toList());
-    Assert.assertEquals(onapGlobalTypes.size(), 0);
+    Assert.assertEquals(0, onapGlobalTypes.size());
   }
 
   @Test
@@ -73,12 +73,12 @@ public class GlobalTypesServiceTemplatesTest {
     Map<String, ServiceTemplate> globalTypesServiceTemplates =
         getGlobalTypesServiceTemplates(OnboardingTypesEnum.MANUAL);
     Assert.assertNotNull(globalTypesServiceTemplates);
-    Assert.assertEquals(globalTypesServiceTemplates.size(), 20);
+    Assert.assertEquals(20, globalTypesServiceTemplates.size());
     Set<String> globalTypeFolders = globalTypesServiceTemplates.keySet();
     List<String> onapGlobalTypes = globalTypeFolders.stream()
         .filter(resourceKey -> resourceKey.contains("onap"))
         .collect(Collectors.toList());
-    Assert.assertEquals(onapGlobalTypes.size(), 0);
+    Assert.assertEquals(0, onapGlobalTypes.size());
   }
 
   @Test
@@ -86,12 +86,12 @@ public class GlobalTypesServiceTemplatesTest {
     Map<String, ServiceTemplate> globalTypesServiceTemplates =
         getGlobalTypesServiceTemplates(OnboardingTypesEnum.NONE);
     Assert.assertNotNull(globalTypesServiceTemplates);
-    Assert.assertEquals(globalTypesServiceTemplates.size(), 20);
+    Assert.assertEquals(20, globalTypesServiceTemplates.size());
     Set<String> globalTypeFolders = globalTypesServiceTemplates.keySet();
     List<String> onapGlobalTypes = globalTypeFolders.stream()
         .filter(resourceKey -> resourceKey.contains("onap"))
         .collect(Collectors.toList());
-    Assert.assertEquals(onapGlobalTypes.size(), 0);
+    Assert.assertEquals(0, onapGlobalTypes.size());
   }
 
 }
-- 
cgit 1.2.3-korg