R2 model updates

[sdc.git] / openecomp-be / lib / openecomp-sdc-translator-lib / openecomp-sdc-translator-core / src / test / java / org / openecomp / sdc / translator / services / heattotosca / globaltypes / GlobalTypesServiceTemplatesTest.java

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 1a51b00..72d7f96 100644 (file)
--- 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 =\r
         getGlobalTypesServiceTemplates(OnboardingTypesEnum.CSAR);\r
     Assert.assertNotNull(globalTypesServiceTemplates);\r
-    Assert.assertEquals(globalTypesServiceTemplates.size(), 25);\r
+    Assert.assertEquals(27, globalTypesServiceTemplates.size());\r
     Set<String> globalTypeFolders = globalTypesServiceTemplates.keySet();\r
     List<String> onapGlobalTypes = globalTypeFolders.stream()\r
         .filter(resourceKey -> resourceKey.contains("onap"))\r
         .collect(Collectors.toList());\r
     Assert.assertNotNull(onapGlobalTypes);\r
-    Assert.assertEquals(onapGlobalTypes.size(), 5);\r
+    Assert.assertEquals(7, onapGlobalTypes.size());\r
   }\r
 \r
   @Test\r
@@ -60,12 +60,12 @@ public class GlobalTypesServiceTemplatesTest {
     Map<String, ServiceTemplate> globalTypesServiceTemplates =\r
         getGlobalTypesServiceTemplates(OnboardingTypesEnum.ZIP);\r
     Assert.assertNotNull(globalTypesServiceTemplates);\r
-    Assert.assertEquals(globalTypesServiceTemplates.size(), 20);\r
+    Assert.assertEquals(20, globalTypesServiceTemplates.size());\r
     Set<String> globalTypeFolders = globalTypesServiceTemplates.keySet();\r
     List<String> onapGlobalTypes = globalTypeFolders.stream()\r
         .filter(resourceKey -> resourceKey.contains("onap"))\r
         .collect(Collectors.toList());\r
-    Assert.assertEquals(onapGlobalTypes.size(), 0);\r
+    Assert.assertEquals(0, onapGlobalTypes.size());\r
   }\r
 \r
   @Test\r
@@ -73,12 +73,12 @@ public class GlobalTypesServiceTemplatesTest {
     Map<String, ServiceTemplate> globalTypesServiceTemplates =\r
         getGlobalTypesServiceTemplates(OnboardingTypesEnum.MANUAL);\r
     Assert.assertNotNull(globalTypesServiceTemplates);\r
-    Assert.assertEquals(globalTypesServiceTemplates.size(), 20);\r
+    Assert.assertEquals(20, globalTypesServiceTemplates.size());\r
     Set<String> globalTypeFolders = globalTypesServiceTemplates.keySet();\r
     List<String> onapGlobalTypes = globalTypeFolders.stream()\r
         .filter(resourceKey -> resourceKey.contains("onap"))\r
         .collect(Collectors.toList());\r
-    Assert.assertEquals(onapGlobalTypes.size(), 0);\r
+    Assert.assertEquals(0, onapGlobalTypes.size());\r
   }\r
 \r
   @Test\r
@@ -86,12 +86,12 @@ public class GlobalTypesServiceTemplatesTest {
     Map<String, ServiceTemplate> globalTypesServiceTemplates =\r
         getGlobalTypesServiceTemplates(OnboardingTypesEnum.NONE);\r
     Assert.assertNotNull(globalTypesServiceTemplates);\r
-    Assert.assertEquals(globalTypesServiceTemplates.size(), 20);\r
+    Assert.assertEquals(20, globalTypesServiceTemplates.size());\r
     Set<String> globalTypeFolders = globalTypesServiceTemplates.keySet();\r
     List<String> onapGlobalTypes = globalTypeFolders.stream()\r
         .filter(resourceKey -> resourceKey.contains("onap"))\r
         .collect(Collectors.toList());\r
-    Assert.assertEquals(onapGlobalTypes.size(), 0);\r
+    Assert.assertEquals(0, onapGlobalTypes.size());\r
   }\r
 \r
 }\r