From 8b0c94492906d7db528af73834c0d2299b8eb382 Mon Sep 17 00:00:00 2001
From: "andre.schmid" <andre.schmid@est.tech>
Date: Fri, 15 Nov 2019 10:07:12 +0000
Subject: Fix to stabilize sanity ui test suite

Fix the selection of the Resource Composition screen.
Fix the search for a Resource in the home screen.
Refactor some related classes, mainly removing exceptions not thrown,
correcting typos, removing unused/commented code, fixing SonarQube
issues.
Improve the logs and report logs.

Change-Id: I89b5a0d89652367520cededa6744831492bbbaba
Issue-ID: SDC-2648
Signed-off-by: andre.schmid <andre.schmid@est.tech>
---
 .../ci/testSuites/devOnboardE2EOneFileSanity.xml   |  2 +-
 .../resources/ci/testSuites/extendedSanity.xml     |  2 +-
 .../main/resources/ci/testSuites/onapUiSanity.xml  | 43 +++++++++++----------
 .../ci/testSuites/vspValidationAllFlows.xml        | 44 +++++++++++-----------
 4 files changed, 45 insertions(+), 46 deletions(-)

(limited to 'ui-ci/src/main/resources/ci/testSuites')

diff --git a/ui-ci/src/main/resources/ci/testSuites/devOnboardE2EOneFileSanity.xml b/ui-ci/src/main/resources/ci/testSuites/devOnboardE2EOneFileSanity.xml
index 8802e9f8ef..acf4be4be3 100644
--- a/ui-ci/src/main/resources/ci/testSuites/devOnboardE2EOneFileSanity.xml
+++ b/ui-ci/src/main/resources/ci/testSuites/devOnboardE2EOneFileSanity.xml
@@ -4,7 +4,7 @@
   <test name="uitests">
     <classes>
     	<!--onboard-->
-   		<class name="org.openecomp.sdc.ci.tests.execute.sanity.OnboardingFlowsUI">
+   		<class name="org.openecomp.sdc.ci.tests.execute.sanity.OnboardingFlowsUi">
    			  <methods>
 				<include name="onboardVNFTestSanityOneFile"/>
 			  </methods>
diff --git a/ui-ci/src/main/resources/ci/testSuites/extendedSanity.xml b/ui-ci/src/main/resources/ci/testSuites/extendedSanity.xml
index 1e295a2793..00b98c9f23 100644
--- a/ui-ci/src/main/resources/ci/testSuites/extendedSanity.xml
+++ b/ui-ci/src/main/resources/ci/testSuites/extendedSanity.xml
@@ -7,7 +7,7 @@
     <classes>
     	
     	<class name="org.openecomp.sdc.ci.tests.execute.sanity.ToscaValidationTest"/>
-   		<class name="org.openecomp.sdc.ci.tests.execute.sanity.OnboardingFlowsUI">
+   		<class name="org.openecomp.sdc.ci.tests.execute.sanity.OnboardingFlowsUi">
    			  <methods>
 				<exclude name="onboardVNFTestSanity"/>
 				<exclude name="onboardVNFShotFlow"/>
diff --git a/ui-ci/src/main/resources/ci/testSuites/onapUiSanity.xml b/ui-ci/src/main/resources/ci/testSuites/onapUiSanity.xml
index 3945088218..245524d0e8 100644
--- a/ui-ci/src/main/resources/ci/testSuites/onapUiSanity.xml
+++ b/ui-ci/src/main/resources/ci/testSuites/onapUiSanity.xml
@@ -1,34 +1,33 @@
 <?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">
+<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.openecomp.sdc.ci.tests.execute.sanity.Vf">
-            <methods>
-                <include name="changeInstanceNameInVfTest"/>
-            </methods>
-        </class>
+      <class name="org.openecomp.sdc.ci.tests.execute.sanity.Vf">
+        <methods>
+          <include name="changeInstanceNameInVfTest"/>
+        </methods>
+      </class>
 
-        <class name="org.openecomp.sdc.ci.tests.execute.sanity.Service">
-            <methods>
-                <include name="updateService"/>
-            </methods>
-        </class>
+      <class name="org.openecomp.sdc.ci.tests.execute.sanity.Service">
+        <methods>
+          <include name="updateService"/>
+        </methods>
+      </class>
 
 
-        <class name="org.openecomp.sdc.ci.tests.execute.sanity.OnboardingFlowsUI">
-            <methods>
-                <include name="onapOnboardVNFflow"/>
-                <include name="onapOnboardVSPValidationsSanityFlow"/>
-            </methods>
-        </class>
+      <class name="org.openecomp.sdc.ci.tests.execute.sanity.OnboardingFlowsUi">
+        <methods>
+          <include name="onapOnboardVNFflow"/>
+          <include name="onapOnboardVSPValidationsSanityFlow"/>
+        </methods>
+      </class>
 
-
-						
     </classes>
-  </test> <!-- uitests -->
-</suite> <!-- uisuite -->
\ No newline at end of file
+  </test>
+</suite>
diff --git a/ui-ci/src/main/resources/ci/testSuites/vspValidationAllFlows.xml b/ui-ci/src/main/resources/ci/testSuites/vspValidationAllFlows.xml
index f159548fc2..71677a95a5 100644
--- a/ui-ci/src/main/resources/ci/testSuites/vspValidationAllFlows.xml
+++ b/ui-ci/src/main/resources/ci/testSuites/vspValidationAllFlows.xml
@@ -1,23 +1,23 @@
-<?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">
-
-    <parameter name="makeDistribution"  value="false"/>
-
-  <test name="vspValidationAllFlows">
-    <classes>
-
-        <class name="org.openecomp.sdc.ci.tests.execute.sanity.OnboardingFlowsUI">
-            <methods>
-                <include name="onapOnboardVSPValidationsSanityFlow"/>
-                <include name="onapOnboardVSPValidationsConfigurationChangeCheck"/>
-                <include name="onapOnboardVSPCertificationQueryFlow"/>
-                <include name="onapOnboardVSPComplianceCheckFlow"/>
-                <include name="onapOnboardVSPComplianceCheckOperations"/>
-                <include name="onapOnboardVSPCertificationQueryOperations"/>
-            </methods>
-        </class>
-
-    </classes>
-  </test> <!-- uitests -->
+<?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">
+
+    <parameter name="makeDistribution"  value="false"/>
+
+  <test name="vspValidationAllFlows">
+    <classes>
+
+        <class name="org.openecomp.sdc.ci.tests.execute.sanity.OnboardingFlowsUi">
+            <methods>
+                <include name="onapOnboardVSPValidationsSanityFlow"/>
+                <include name="onapOnboardVSPValidationsConfigurationChangeCheck"/>
+                <include name="onapOnboardVSPCertificationQueryFlow"/>
+                <include name="onapOnboardVSPComplianceCheckFlow"/>
+                <include name="onapOnboardVSPComplianceCheckOperations"/>
+                <include name="onapOnboardVSPCertificationQueryOperations"/>
+            </methods>
+        </class>
+
+    </classes>
+  </test> <!-- uitests -->
 </suite> <!-- uisuite -->
\ No newline at end of file
-- 
cgit