ComponentBaseTest.java enhancement and

[sdc.git] / ui-ci / src / main / java / org / openecomp / sdc / ci / tests / US / MIBsArtifactsOnResourceInstance.java

diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/US/MIBsArtifactsOnResourceInstance.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/US/MIBsArtifactsOnResourceInstance.java
index 949a20b..3fb1529 100644 (file)
--- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/US/MIBsArtifactsOnResourceInstance.java
+++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/US/MIBsArtifactsOnResourceInstance.java
@@ -75,13 +75,9 @@ public class MIBsArtifactsOnResourceInstance extends SetupCDTest {
        // TODO: Change download validation from download artifact via external API to UI
        @Test(dataProvider="mibsArtifactCRUDUi")
        public void mibsArtifactCRUDUi(String fileName, ResourceTypeEnum resourceTypeEnum) throws Exception {
-               setLog("mibsArtifactCRUDUi");
+               setLog(fileName);
                String filePath = FileHandling.getFilePath(folder);
                
-               if(true){
-                       throw new SkipException("Open bug 197101");                     
-               }
-               
                // import Resource
                ResourceReqDetails resourceMetaData = ElementFactory.getDefaultResourceByType(resourceTypeEnum, getUser());
                ResourceUIUtils.importVfc(resourceMetaData, filePath, fileName, getUser());
@@ -137,7 +133,7 @@ public class MIBsArtifactsOnResourceInstance extends SetupCDTest {
        @DataProvider(name="mibsArtifacsOnResourceInstanceShouldOnlyHaveDownloadOption") 
        public static Object[][] dataProviderMibsArtifacsOnResourceInstanceShouldOnlyHaveDownloadOption() {
                return new Object[][] {
-                       {"mibs1vFW_VFC.yml", ResourceTypeEnum.VFC},
+//                     {"mibs1vFW_VFC.yml", ResourceTypeEnum.VFC},
                        // TODO: delete comment below when we will have support for VL on canvas
 //                     {"mibs1VL.yml", ResourceTypeEnum.VL},
                        {"mibs1CP.yml", ResourceTypeEnum.CP}
@@ -148,8 +144,12 @@ public class MIBsArtifactsOnResourceInstance extends SetupCDTest {
        // Import VFC/VL/CP, upload MIBs artifacts then drag it on VF & verify that deployment artifact have only download option
        @Test(dataProvider="mibsArtifacsOnResourceInstanceShouldOnlyHaveDownloadOption")
        public void mibsArtifacsOnResourceInstanceShouldOnlyHaveDownloadOption(String fileName, ResourceTypeEnum resourceTypeEnum) throws Exception {
+               
+//             if(resourceTypeEnum.equals(ResourceTypeEnum.CP)){
+//                     throw new SkipException("Open bug 322930");                     
+//             }
 
-               setLog("mibsArtifacsOnResourceInstanceShouldOnlyHaveDownloadOption");
+               setLog(fileName);
                
                String filePath = FileHandling.getFilePath(folder);
 
@@ -174,7 +174,7 @@ public class MIBsArtifactsOnResourceInstance extends SetupCDTest {
                
                // 4. Create VF.
                ResourceReqDetails vfMetaData = ElementFactory.getDefaultResourceByType(ResourceTypeEnum.VF, getUser());
-               ResourceUIUtils.createResource(vfMetaData, getUser());
+               ResourceUIUtils.createVF(vfMetaData, getUser());
                
                // 5. Click on composition.
                ResourceGeneralPage.getLeftMenu().moveToCompositionScreen();
@@ -212,7 +212,7 @@ public class MIBsArtifactsOnResourceInstance extends SetupCDTest {
 
                // 1. Create VF.
                ResourceReqDetails resourceMetaData = ElementFactory.getDefaultResourceByType(ResourceTypeEnum.VF, getUser());
-               ResourceUIUtils.createResource(resourceMetaData, getUser());
+               ResourceUIUtils.createVF(resourceMetaData, getUser());
                        
                // 2. Upload MIBs artifacts - SNMP_TRAP & SNMP_POLL.
                ResourceGeneralPage.getLeftMenu().moveToDeploymentArtifactScreen();