fix capabilities

[sdc.git] / test-apis-ci / src / main / java / org / openecomp / sdc / ci / tests / api / ComponentBaseTest.java

diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java
index ad1e8dd..67091f3 100644 (file)
--- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java
+++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java
@@ -20,17 +20,15 @@
 
 package org.openecomp.sdc.ci.tests.api;
 
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.LoggerContext;
 import com.aventstack.extentreports.ExtentTest;
 import com.aventstack.extentreports.Status;
 import com.thinkaurelius.titan.core.TitanFactory;
 import com.thinkaurelius.titan.core.TitanGraph;
 import com.thinkaurelius.titan.core.TitanVertex;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.ImmutableTriple;
-import org.apache.log4j.Logger;
 import org.apache.tinkerpop.gremlin.structure.Direction;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.junit.rules.TestName;
@@ -48,7 +46,9 @@ import org.openecomp.sdc.ci.tests.utils.Utils;
 import org.openecomp.sdc.ci.tests.utils.cassandra.CassandraUtils;
 import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils;
 import org.openecomp.sdc.ci.tests.utils.general.ElementFactory;
+import org.openecomp.sdc.ci.tests.utils.general.FileHandling;
 import org.openecomp.sdc.ci.tests.utils.rest.*;
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.ITestContext;
 import org.testng.ITestResult;
@@ -64,11 +64,13 @@ import java.util.stream.Collectors;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertNotNull;
 
+
+
+
 public abstract class ComponentBaseTest {
 
 //     private static Logger logger = LoggerFactory.getLogger(ComponentBaseTest.class.getName());
-       
-       protected static Logger logger= Logger.getLogger(ComponentBaseTest.class);      
+       protected static Logger logger= LoggerFactory.getLogger(ComponentBaseTest.class);
        
 
 //      public ComponentBaseTest(TestName testName, String className) {
@@ -95,12 +97,15 @@ public abstract class ComponentBaseTest {
 
        public ComponentBaseTest(TestName name, String name2) {
                // TODO Auto-generated constructor stub
-               LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();
-               lc.getLogger("com.thinkaurelius").setLevel(Level.INFO);
-               lc.getLogger("com.datastax").setLevel(Level.INFO);
-               lc.getLogger("io.netty").setLevel(Level.INFO);
-               lc.getLogger("c.d").setLevel(Level.INFO);
-       }
+//             LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();
+//             lc.getLogger("com.thinkaurelius").setLevel(Level.INFO);
+//             lc.getLogger("com.datastax").setLevel(Level.INFO);
+//             lc.getLogger("io.netty").setLevel(Level.INFO);
+//             lc.getLogger("c.d").setLevel(Level.INFO);
+//             lc.getLogger("o.a.h").setLevel(Level.INFO);
+//             lc.getLogger("o.o.s.c.t.d.h").setLevel(Level.INFO);
+
+}
        
        public static String getReportFolder() {
                return REPORT_FOLDER;
@@ -111,33 +116,34 @@ public abstract class ComponentBaseTest {
                config = Utils.getConfig();
                myContext=context;
                ExtentManager.initReporter(getReportFolder(), REPORT_FILE_NAME, context);       
-               AtomicOperationUtils.createDefaultConsumer(true);
+//             AtomicOperationUtils.createDefaultConsumer(true);
                openTitanLogic();
                performClean();
                
-               
-
+               String basePath = FileHandling.getBasePath();
+               String csarDir = FileHandling.getCreateDirByName("outputCsar");
+               FileUtils.cleanDirectory(new File(csarDir));
        }
        
        @BeforeMethod(alwaysRun = true)
        public void setBrowserBeforeTest(java.lang.reflect.Method method, ITestContext context) throws Exception {
 
 
-                   String suiteName = ExtentManager.getSuiteName(context);
-                       ExtentTestManager.startTest(method.getName());
-                       ExtentTestManager.assignCategory(this.getClass());
-      
-//    boolean emptyDataProvider = method.getAnnotation(Test.class).dataProvider().isEmpty();
-//     String className = method.getDeclaringClass().getName();
-//             if (emptyDataProvider)  {
-//                     System.out.println("ExtentReport instance started from BeforeMethod...");
-//                     String suiteName = ExtentManager.getSuiteName(context);
+//                 String suiteName = ExtentManager.getSuiteName(context);
 //                     ExtentTestManager.startTest(method.getName());
 //                     ExtentTestManager.assignCategory(this.getClass());
-//
-//             } else {
-//                     System.out.println("ExtentReport instance started from Test...");
-//             }
+
+               boolean emptyDataProvider = method.getAnnotation(Test.class).dataProvider().isEmpty();
+               String className = method.getDeclaringClass().getName();
+               System.out.println(" method.getName() " + method.getName());
+               if (!method.getName().equals("onboardVNFShotFlow"))  {
+                       System.out.println("ExtentReport instance started from BeforeMethod...");
+                       ExtentTestManager.startTest(method.getName());
+                       ExtentTestManager.assignCategory(this.getClass());
+
+               } else {
+                       System.out.println("ExtentReport instance started from Test...");
+               }
       
 
        }
@@ -176,13 +182,8 @@ public abstract class ComponentBaseTest {
        @AfterClass(alwaysRun = true)
        public synchronized static void cleanAfterClass() throws Exception{
 
-//             System.out.println("<<<<<<<<class name>>>>>"+method.getDeclaringClass());
-//             System.out.println("<<<<<<<<class name>>>>>"+method.getName());
-
-
                System.out.println("delete components AfterClass");
                deleteCreatedComponents(getCatalogAsMap());
-//             extentReport.flush();
 
        }
        
@@ -191,7 +192,6 @@ public abstract class ComponentBaseTest {
                
                performClean();
                shutdownTitanLogic();
-
        }
 
        protected static void openTitanLogic() throws Exception {