From 5d8b1862b63d32070b4084d7e49cae1f4bc66953 Mon Sep 17 00:00:00 2001
From: Artur Signell
Date: Mon, 18 Mar 2013 13:56:56 +0200
Subject: [PATCH] Unified all portal integration tests to be based on
JSR286Portlet (#8013, #9566, #11314)
All portal tests are now based on the same test script. Portal tests avoid Vaadin locators to avoid random problems with the portlet id changing between test runs.
* eXo 3 test must be run on Firefox, does not work in Chrome
* Liferay theme test is now a separate test which does not depend on the Liferay integration test
* Changing to maximized state using an action URL does not work with GateIn or eXo
* The edit mode link does not work in WebLogic Portal as WebLogic feels it is not an allowed mode for the portlet
Change-Id: I7a683688d8ffc611e211f8a60889a34b233b81c9
---
WebContent/WEB-INF/portlet.xml | 6 +-
...ntegration-test-GateIn-3.1.0-portlet2.html | 131 ++++++++-
...tegration-test-liferay-5.2.3-portlet2.html | 118 +++++---
.../Liferay6-and-6EE-theme-deploy.html | 146 ++++++++++
.../Liferay-6/Liferay6-theme.html | 18 +-
.../integration-test-liferay-6.0.5.html | 133 ++++++++-
.../Liferay-6EE/Liferay6EE-theme.html | 19 +-
.../common/portlet_test.tpl | 134 +++++++++
.../integration-test-eXo-3.0.3-portlet2.html | 254 +++++++++++++-----
...-test-WebLogic-Portal-10.3.2-portlet2.html | 139 ++++++++--
uitest/integration_tests.xml | 29 +-
.../tests/integration/JSR286Portlet.java | 214 +++++++++++++++
.../integration/JSR286PortletApplication.java | 195 --------------
13 files changed, 1168 insertions(+), 368 deletions(-)
create mode 100644 uitest/integration-testscripts/Liferay-6/Liferay6-and-6EE-theme-deploy.html
create mode 100644 uitest/integration-testscripts/common/portlet_test.tpl
create mode 100644 uitest/src/com/vaadin/tests/integration/JSR286Portlet.java
delete mode 100644 uitest/src/com/vaadin/tests/integration/JSR286PortletApplication.java
diff --git a/WebContent/WEB-INF/portlet.xml b/WebContent/WEB-INF/portlet.xml
index 195269eb61..45ce1eee83 100644
--- a/WebContent/WEB-INF/portlet.xml
+++ b/WebContent/WEB-INF/portlet.xml
@@ -6,10 +6,10 @@
JSR286TestPortletVaadin Portlet 2.0 Test
- com.vaadin.server.LegacyVaadinPortlet
+ com.vaadin.server.VaadinPortlet
- application
- com.vaadin.tests.integration.JSR286PortletApplication
+ ui
+ com.vaadin.tests.integration.JSR286Portletwidgetset
diff --git a/uitest/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-portlet2.html b/uitest/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-portlet2.html
index 5d2d4c3445..7df5894f15 100644
--- a/uitest/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-portlet2.html
+++ b/uitest/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-portlet2.html
@@ -172,21 +172,146 @@