From 7c2593303b78cf8df66134d60af7a0efc54e4f13 Mon Sep 17 00:00:00 2001
From: vasraz <vasyl.razinkov@est.tech>
Date: Wed, 20 Jan 2021 21:20:28 +0000
Subject: Remove vulnerable log4j dependency

Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-3310
Change-Id: I1c31ab30efa7a3d03a08f512024a3967ce024237
---
 .../ci/tests/execute/setup/SetupCDTest.java        |  2 +-
 .../ci/testSuites/backend/onapApiSanity.xml        | 16 +++----
 .../ci/testSuites/frontend/onapUiSanity.xml        | 51 +++++++++++-----------
 3 files changed, 34 insertions(+), 35 deletions(-)

(limited to 'integration-tests/src')

diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/setup/SetupCDTest.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/setup/SetupCDTest.java
index 18b5a71061..61c6c56222 100644
--- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/setup/SetupCDTest.java
+++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/execute/setup/SetupCDTest.java
@@ -179,7 +179,7 @@ public abstract class SetupCDTest extends DriverFactory {
                     addTrafficFileToReport(result);
                 }
 
-                if (result.getInstanceName().equals(OnboardingFlowsUi.class.getName()) && result.getStatus() == ITestResult.FAILURE) {
+                if (OnboardingFlowsUi.class.getName().equals(result.getInstanceName()) && result.getStatus() == ITestResult.FAILURE) {
                     final String msg = "Onboarding test failed, closing browser";
                     LOGGER.info(msg);
                     getExtendTest().log(Status.INFO, msg);
diff --git a/integration-tests/src/test/resources/ci/testSuites/backend/onapApiSanity.xml b/integration-tests/src/test/resources/ci/testSuites/backend/onapApiSanity.xml
index 8d5d2b2f08..fbd796edb1 100644
--- a/integration-tests/src/test/resources/ci/testSuites/backend/onapApiSanity.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/backend/onapApiSanity.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd" >
 <suite name="externalApis" configfailurepolicy="continue" parallel="methods" thread-count="1" data-provider-thread-count="1">
-	<parameter name="makeDistribution"  value="false"/>
-	<parameter name="makeToscaValidation"  value="true"/>
-	<test name="ExternalApis"> 
-		<classes>
-			<class name="org.onap.sdc.backend.ci.tests.sanity.Onboard"/>
-		</classes>
-	</test>
+  <parameter name="makeDistribution" value="false"/>
+  <parameter name="makeToscaValidation" value="true"/>
+  <test name="ExternalApis">
+    <classes>
+      <class name="org.onap.sdc.backend.ci.tests.sanity.Onboard"/>
+    </classes>
+  </test>
 </suite>
\ No newline at end of file
diff --git a/integration-tests/src/test/resources/ci/testSuites/frontend/onapUiSanity.xml b/integration-tests/src/test/resources/ci/testSuites/frontend/onapUiSanity.xml
index 47dc9f6960..48e28fc316 100644
--- a/integration-tests/src/test/resources/ci/testSuites/frontend/onapUiSanity.xml
+++ b/integration-tests/src/test/resources/ci/testSuites/frontend/onapUiSanity.xml
@@ -1,30 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="uitests" configfailurepolicy="continue" parallel="methods" thread-count="1"
-       data-provider-thread-count="1">
+<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd" >
+<suite name="uitests" configfailurepolicy="continue" parallel="methods" thread-count="1" data-provider-thread-count="1">
 
-    <parameter name="makeDistribution" value="false"/>
+  <parameter name="makeDistribution" value="false"/>
 
-    <test name="uiSanity">
-        <classes>
-            <class name="org.onap.sdc.frontend.ci.tests.execute.sanity.Vf">
-                <methods>
-                    <include name="changeInstanceNameInVfTest"/>
-                </methods>
-            </class>
-            <class name="org.onap.sdc.frontend.ci.tests.execute.sanity.Service">
-                <methods>
-                    <include name="updateService"/>
-                </methods>
-            </class>
-            <class name="org.onap.sdc.frontend.ci.tests.execute.sanity.OnboardingFlowsUi">
-                <methods>
-                    <include name="onapOnboardVNFflow"/>
-                    <include name="onapOnboardVSPValidationsSanityFlow"/>
-                    <include name="onboardPNFSoftwareInformationFlow"/>
-                </methods>
-            </class>
-            <class name="org.onap.sdc.frontend.ci.tests.execute.sanity.GAB"/>
-        </classes>
-    </test>
+  <test name="uiSanity">
+    <classes>
+      <class name="org.onap.sdc.frontend.ci.tests.execute.sanity.Vf">
+        <methods>
+          <include name="changeInstanceNameInVfTest"/>
+        </methods>
+      </class>
+      <class name="org.onap.sdc.frontend.ci.tests.execute.sanity.Service">
+        <methods>
+          <include name="updateService"/>
+        </methods>
+      </class>
+      <class name="org.onap.sdc.frontend.ci.tests.execute.sanity.OnboardingFlowsUi">
+        <methods>
+          <include name="onapOnboardVNFflow"/>
+          <include name="onapOnboardVSPValidationsSanityFlow"/>
+          <include name="onboardPNFSoftwareInformationFlow"/>
+        </methods>
+      </class>
+      <class name="org.onap.sdc.frontend.ci.tests.execute.sanity.GAB"/>
+    </classes>
+  </test>
 </suite>
-- 
cgit 1.2.3-korg