From 4eb1b48b1ed9dfbd957c3a407a62237a4880a5d0 Mon Sep 17 00:00:00 2001
From: Henri Sara <hesara@vaadin.com>
Date: Tue, 2 Aug 2016 10:47:27 +0300
Subject: [PATCH] Remove old integration tests

Remove all integration tests whose servers do not support Servlet 3.0
and some other obsolete servers.

Change-Id: I648bda9a74579be69cb54864fa526d3105742b9b
---
 ...-test-WebLogic-Portal-10.3.2-portlet2.html | 140 ------------------
 uitest/integration_tests.xml                  |  67 ---------
 2 files changed, 207 deletions(-)
 delete mode 100644 uitest/integration-testscripts/weblogic-portal/integration-test-WebLogic-Portal-10.3.2-portlet2.html

diff --git a/uitest/integration-testscripts/weblogic-portal/integration-test-WebLogic-Portal-10.3.2-portlet2.html b/uitest/integration-testscripts/weblogic-portal/integration-test-WebLogic-Portal-10.3.2-portlet2.html
deleted file mode 100644
index f9f1d316c9..0000000000
--- a/uitest/integration-testscripts/weblogic-portal/integration-test-WebLogic-Portal-10.3.2-portlet2.html
+++ /dev/null
@@ -1,140 +0,0 @@
-<tr>
-	<td>open</td>
-	<td>/VaadinTest/TestPortal.portal</td>
-	<td></td>
-</tr>
-<!--Start actual test-->
-<tr>
-	<td>waitForElementPresent</td>
-	<td>//div[2]/div/div/div/span</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[2]/div/div/div/span</td>
-	<td>Test of ApplicationResources with full path</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//body/div[4]/div//p</td>
-	<td>exact:Mode: view State: normal</td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>initial</td>
-</tr>
-<tr>
-	<td>closeNotification</td>
-	<td>//body/div[4]/div</td>
-	<td>0,0</td>
-</tr>
-<tr>
-	<td>assertTextNotPresent</td>
-	<td>Action * received</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[@class=&quot;v-link v-disabled v-widget&quot;]/a/span</td>
-	<td></td>
-</tr>
-<!--Send an action-->
-<tr>
-	<td>mouseClickAndWait</td>
-	<td>//div[8]/div/a/span</td>
-	<td>32,9</td>
-</tr>
-<tr>
-	<td>assertTextPresent</td>
-	<td>Action 'someAction' received</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//body/div[4]/div//p</td>
-	<td>exact:Mode: view State: normal</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[@class=&quot;v-link v-disabled v-widget&quot;]/a/span</td>
-	<td></td>
-</tr>
-<tr>
-	<td>closeNotification</td>
-	<td>//body/div[4]/div</td>
-	<td>0,0</td>
-</tr>
-<!--Switch to edit mode-->
-<tr>
-	<td>mouseClickAndWait</td>
-	<td>name=edit</td>
-	<td>3,5</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//body/div[4]/div//p</td>
-	<td>exact:Mode: edit State: normal</td>
-</tr>
-<tr>
-	<td>closeNotification</td>
-	<td>//body/div[4]/div</td>
-	<td>0,0</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[@class=&quot;v-link v-widget&quot;]/a/span</td>
-	<td>Done</td>
-</tr>
-<!--Maximize-->
-<tr>
-	<td>mouseClickAndWait</td>
-	<td>//div[6]/div/a/span</td>
-	<td>16,7</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//body/div[4]/div//p</td>
-	<td>exact:Mode: edit State: maximized</td>
-</tr>
-<tr>
-	<td>closeNotification</td>
-	<td>//body/div[4]/div</td>
-	<td>0,0</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[6]/div/a/span</td>
-	<td>Back to normal</td>
-</tr>
-<!--Restore back to normal-->
-<tr>
-	<td>mouseClickAndWait</td>
-	<td>//div[6]/div/a/span</td>
-	<td>71,8</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//body/div[4]/div//p</td>
-	<td>exact:Mode: edit State: normal</td>
-</tr>
-<tr>
-	<td>closeNotification</td>
-	<td>//body/div[4]/div</td>
-	<td>0,0</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[@class=&quot;v-link v-widget&quot;]/a/span</td>
-	<td>Done</td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>//div[6]/div/a/span</td>
-	<td>Maximize</td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>final</td>
-</tr>
diff --git a/uitest/integration_tests.xml b/uitest/integration_tests.xml
index cadb3d9da1..f8bb146099 100644
--- a/uitest/integration_tests.xml
+++ b/uitest/integration_tests.xml
@@ -135,19 +135,6 @@
         </antcall>
     </target>
 
-    <target name="integration-test-tomcat6">
-        <antcall target="run-generic-integration-test">
-            <param name="startDelay" value="10" />
-            <param name="target-server" value="tomcat6" />
-        </antcall>
-    </target>
-
-    <target name="integration-test-jetty7">
-        <antcall target="run-generic-integration-test">
-            <param name="target-server" value="jetty7" />
-        </antcall>
-    </target>
-
     <target name="integration-test-jetty8">
         <antcall target="run-generic-integration-test">
             <param name="startDelay" value="300" />
@@ -162,34 +149,6 @@
         </antcall>
     </target>
 
-    <target name="integration-test-jboss4">
-        <antcall target="run-generic-integration-test">
-            <param name="startDelay" value="10" />
-            <param name="target-server" value="jboss4" />
-        </antcall>
-    </target>
-
-    <target name="integration-test-jboss5">
-        <antcall target="run-generic-integration-test">
-            <param name="startDelay" value="10" />
-            <param name="target-server" value="jboss5" />
-        </antcall>
-    </target>
-
-    <target name="integration-test-jboss6">
-        <antcall target="run-generic-integration-test">
-            <param name="startDelay" value="10" />
-            <param name="target-server" value="jboss6" />
-        </antcall>
-    </target>
-
-    <target name="integration-test-jboss7">
-        <antcall target="run-generic-integration-test">
-            <param name="startDelay" value="10" />
-            <param name="target-server" value="jboss7" />
-        </antcall>
-    </target>
-
     <target name="integration-test-jboss-eap6">
         <antcall target="run-generic-integration-test">
             <param name="startDelay" value="10" />
@@ -288,14 +247,6 @@
         <concat>##teamcity[testFinished name='websphereportal8' flowId='websphereportal8']"</concat>
     </target>
 
-    <target name="integration-test-weblogic10">
-        <antcall target="run-generic-integration-test">
-            <param name="startDelay" value="600" />
-            <param name="target-port" value="7001" />
-            <param name="target-server" value="weblogic10" />
-        </antcall>
-    </target>
-
     <target name="integration-test-weblogic12">
         <antcall target="run-generic-integration-test">
             <param name="startDelay" value="600" />
@@ -305,16 +256,6 @@
     </target>
 
 
-    <target name="integration-test-weblogicPortal">
-        <fileset dir="integration-testscripts" id="html-test-files" includes="weblogic-portal/integration-test-WebLogic-Portal-10.3.2-portlet2.html" />
-        <pathconvert pathsep=" " property="testfiles" refid="html-test-files" />
-        <antcall target="run-generic-integration-test">
-            <param name="startDelay" value="600" />
-            <param name="target-port" value="7001" />
-            <param name="target-server" value="weblogicportal" />
-        </antcall>
-    </target>
-
     <!-- Upload demo, clean error screenshots and test deployment on all
         servers -->
     <target name="integration-test-all" unless="tests.integration.skip">
@@ -327,24 +268,16 @@
         <parallel>
             <antcall target="integration-test-liferay6" />
             <antcall target="integration-test-liferay6-theme" />
-            <antcall target="integration-test-weblogicPortal" />
-            <antcall target="integration-test-weblogic10" />
             <antcall target="integration-test-weblogic12" />
             <antcall target="integration-test-glassfish3" />
             <antcall target="integration-test-glassfish4" />
             <antcall target="integration-test-payara" />
-            <antcall target="integration-test-jboss4" />
-            <antcall target="integration-test-jboss5" />
-            <antcall target="integration-test-jboss6" />
-            <antcall target="integration-test-jboss7" />
             <antcall target="integration-test-jboss-eap6" />
             <antcall target="integration-test-wildfly8" />
             <antcall target="integration-test-wildfly9" />
             <antcall target="integration-test-wildfly10" />
-            <antcall target="integration-test-jetty7" />
             <antcall target="integration-test-jetty8" />
             <antcall target="integration-test-jetty9" />
-            <antcall target="integration-test-tomcat6" />
             <antcall target="integration-test-tomcat7" />
             <antcall target="integration-test-tomcat8" />
             <antcall target="integration-test-osgi" />
-- 
2.39.5