Refresh option in validation result page

[sdc.git] / ui-ci / src / main / java / org / openecomp / sdc / ci / tests / dataProvider / OnbordingDataProviders.java

diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/dataProvider/OnbordingDataProviders.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/dataProvider/OnbordingDataProviders.java
index 6594049..89d90df 100644 (file)
--- a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/dataProvider/OnbordingDataProviders.java
+++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/dataProvider/OnbordingDataProviders.java
@@ -20,17 +20,19 @@
 
 package org.openecomp.sdc.ci.tests.dataProvider;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 import org.openecomp.sdc.ci.tests.datatypes.enums.XnfTypeEnum;
 import org.openecomp.sdc.ci.tests.utilities.FileHandling;
 import org.openecomp.sdc.ci.tests.utils.general.OnboardingUtils;
+import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 public class OnbordingDataProviders {
 
+    private static final String VSP_VGW_CSAR = "vsp-vgw.csar";
     private static final int NUMBER_OF_RANDOMLY_ONBOARD_VNF = 3;
     protected static String filepath = FileHandling.getVnfRepositoryPath();
 
@@ -60,8 +62,10 @@ public class OnbordingDataProviders {
 
         Object[][] filteredArObject = null;
 
-        objectArr[0] = new Object[]{"1-2016-20-visbc3vf-(VOIP)_v2.1.zip", "2-2016-20-visbc3vf-(VOIP)_v2.1_RenameResourceToShay.zip"};
-        objectArr[1] = new Object[]{"1-2017-404_vUSP_vCCF_AIC3.0-(VOIP)_v6.0.zip", "2-2017-404_vUSP_vCCF_AIC3.0-(VOIP)_v6.0_Added2TestParameters.zip"};
+        objectArr[0] = new Object[] {"1-2016-20-visbc3vf-(VOIP)_v2.1.zip",
+                "2-2016-20-visbc3vf-(VOIP)_v2.1_RenameResourceToShay.zip"};
+        objectArr[1] = new Object[] {"1-2017-404_vUSP_vCCF_AIC3.0-(VOIP)_v6.0.zip",
+                "2-2017-404_vUSP_vCCF_AIC3.0-(VOIP)_v6.0_Added2TestParameters.zip"};
 
         filteredArObject = OnboardingUtils.filterObjectArrWithExcludedVnfs(objectArr);
 
@@ -70,12 +74,15 @@ public class OnbordingDataProviders {
 
     }
 
-    // -----------------------factories-----------------------------------------
-//     @Factory(dataProvider = "VNF_List")
-//     public Object[] OnbordingDataProviders(String filepath, String vnfFile){
-//             return new Object[] { new ToscaValidationTest(filepath, vnfFile)};
-//     }
+    @DataProvider(name = "Single_Vsp_Test_Csar", parallel = true)
+    private static Object[][] singleVspTestCsar() throws Exception {
 
+        List<String> fileNamesFromFolder = OnboardingUtils.getXnfNamesFileList(XnfTypeEnum.VNF);
+        if (!fileNamesFromFolder.contains(VSP_VGW_CSAR)) {
+            Assert.fail("Vsp Test file is not exits in the path");
+        }
+        return provideData(Arrays.asList(VSP_VGW_CSAR), filepath);
+    }
 
     // -----------------------methods-----------------------------------------
     static Object[][] provideData(List<String> fileNamesFromFolder, String filepath) {
@@ -83,7 +90,7 @@ public class OnbordingDataProviders {
         Object[][] arObject = new Object[fileNamesFromFolder.size()][];
         int index = 0;
         for (Object obj : fileNamesFromFolder) {
-            arObject[index++] = new Object[]{filepath, obj};
+            arObject[index++] = new Object[] {filepath, obj};
         }
         return arObject;
     }
@@ -106,37 +113,4 @@ public class OnbordingDataProviders {
         }
     }
 
-
-//     private static String[][] arrangeFilesVersionPairs(List<String> filesArr) {
-//             String[][] filesArrangeByPairs = null;
-//
-//             List<String> versionOneFiles= null;
-//             List<String> versionTowFiles= null;
-//
-//             for ( String fileName : filesArr )
-//             {
-//                     if(fileName.startsWith("1-"))
-//                     {
-//                             versionOneFiles.add(fileName);
-//                     }
-//                     else if(fileName.startsWith("2-"))
-//                     {
-//                             versionTowFiles.add(fileName);
-//                     }
-//             }
-//
-//             Collections.sort(versionOneFiles);
-//             Collections.sort(versionTowFiles);
-//
-//             for (int i=0 ; i<versionOneFiles.size() ; i++ )
-//             {
-//                     for (int j=0 ; j<versionTowFiles.size() ; j++ )
-//                     {
-//
-//                     }
-//             }
-//
-//             return filesArrangeByPairs;
-//     }
-
 }