diff options
| author | Henri Sara <henri.sara@itmill.com> | 2011-08-17 12:34:53 +0000 |
|---|---|---|
| committer | Henri Sara <henri.sara@itmill.com> | 2011-08-17 12:34:53 +0000 |
| commit | aaa1b378c923ff52df94963496613c82fbfcf8d9 (patch) | |
| tree | 1b25576fa6621f0ff0307f81b2a9cf760f2008bd | |
| parent | 5df3f8a8266eb600531a24b616502f923cc50821 (diff) | |
| download | vaadin-framework-aaa1b378c923ff52df94963496613c82fbfcf8d9.tar.gz vaadin-framework-aaa1b378c923ff52df94963496613c82fbfcf8d9.zip | |
#7433 separate servlet configuration in web.xml to enable GAE testing
svn changeset:20449/svn branch:6.7
| -rw-r--r-- | WebContent/WEB-INF/web.xml | 15 | ||||
| -rw-r--r-- | tests/integration-testscripts/GoogleAppEngine/integration-test-GAE.html | 6 |
2 files changed, 18 insertions, 3 deletions
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index 2f0a69cf5a..b5cd3fa1c8 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -29,11 +29,26 @@ </init-param>
</servlet>
+ <!-- For testing GAE - the deployment script changes this to use GAEApplicationServlet -->
+ <servlet>
+ <servlet-name>IntegrationTest</servlet-name>
+ <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>
+ <init-param>
+ <param-name>application</param-name>
+ <param-value>com.vaadin.tests.integration.IntegrationTestApplication</param-value>
+ </init-param>
+ </servlet>
+
<servlet-mapping>
<servlet-name>VaadinApplicationRunner</servlet-name>
<url-pattern>/run/*</url-pattern>
</servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>IntegrationTest</servlet-name>
+ <url-pattern>/integration/*</url-pattern>
+ </servlet-mapping>
+
<welcome-file-list>
<welcome-file>index.html</welcome-file>
</welcome-file-list>
diff --git a/tests/integration-testscripts/GoogleAppEngine/integration-test-GAE.html b/tests/integration-testscripts/GoogleAppEngine/integration-test-GAE.html index dee7b6da69..3f5ec1ce90 100644 --- a/tests/integration-testscripts/GoogleAppEngine/integration-test-GAE.html +++ b/tests/integration-testscripts/GoogleAppEngine/integration-test-GAE.html @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>openAndWait</td> - <td>/run/com.vaadin.tests.integration.IntegrationTestApplication?restartApplication</td> + <td>/integration/?restartApplication</td> <td></td> </tr> <tr> @@ -23,7 +23,7 @@ </tr> <tr> <td>mouseClick</td> - <td>vaadin=runcomvaadintestsintegrationIntegrationTestApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td> + <td>vaadin=integration::/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td> <td>51,13</td> </tr> <tr> @@ -33,7 +33,7 @@ </tr> <tr> <td>assertText</td> - <td>vaadin=runcomvaadintestsintegrationIntegrationTestApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VLabel[0]</td> + <td>vaadin=integration::/VVerticalLayout[0]/ChildComponentContainer[1]/VLabel[0]</td> <td>FI</td> </tr> |