From 4e6552008b61d38cd48547b3c968ad653231d7a5 Mon Sep 17 00:00:00 2001 From: Yuli Shlosberg Date: Tue, 26 Sep 2017 17:40:43 +0300 Subject: Add VNFs to sanity docker Change-Id: I8b81db65fdbad997d8bdf680eed7dcde1b200eb4 Issue-Id: SDC-401 Signed-off-by: Yuli Shlosberg (cherry picked from commit f8854eef352140497f0502e3f31bc839d173824b) --- .../sdc/ci/tests/api/ComponentBaseTest.java | 30 +++++++++------------- 1 file changed, 12 insertions(+), 18 deletions(-) (limited to 'test-apis-ci/src/main/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 ad1e8dd37d..1817b6e5cb 100644 --- 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 @@ -123,21 +123,20 @@ public abstract class ComponentBaseTest { 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(); + 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 +175,8 @@ public abstract class ComponentBaseTest { @AfterClass(alwaysRun = true) public synchronized static void cleanAfterClass() throws Exception{ -// System.out.println("<<<<<<<>>>>"+method.getDeclaringClass()); -// System.out.println("<<<<<<<>>>>"+method.getName()); - - System.out.println("delete components AfterClass"); deleteCreatedComponents(getCatalogAsMap()); -// extentReport.flush(); } -- cgit 1.2.3-korg