ComponentBaseTest.java enhancement and

[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 f63be6c..6903750 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
@@ -1,17 +1,22 @@
 package org.openecomp.sdc.ci.tests.dataProvider;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import org.openecomp.sdc.ci.tests.execute.sanity.ToscaValidationTest;
+import org.openecomp.sdc.ci.tests.execute.setup.SetupCDTest;
 import org.openecomp.sdc.ci.tests.utilities.FileHandling;
 import org.openecomp.sdc.ci.tests.utilities.OnboardingUtils;
 import org.testng.annotations.DataProvider;
+import org.testng.annotations.Factory;
 
 public class OnbordingDataProviders {
 
        protected static String filepath = FileHandling.getVnfRepositoryPath();
        
+//     -----------------------dataProviders-----------------------------------------   
        @DataProvider(name = "randomVNF_List", parallel = false)
        private static final Object[][] randomVnfList() throws Exception {
                int randomElementNumber = 3; //how many VNFs to onboard randomly
@@ -30,6 +35,13 @@ public class OnbordingDataProviders {
                return provideData(fileNamesFromFolder, filepath);
        }
        
+//     -----------------------factories-----------------------------------------
+       @Factory(dataProvider = "VNF_List")
+       public Object[] OnbordingDataProviders(String filepath, String vnfFile){
+               return new Object[] { new ToscaValidationTest(filepath, vnfFile)};
+       }
+       
+       
        
 //     -----------------------methods-----------------------------------------
        public static Object[][] provideData(List<String> fileNamesFromFolder, String filepath) {