diff options
| author | Build Agent <build@vaadin.com> | 2014-02-13 13:17:58 +0200 |
|---|---|---|
| committer | Build Agent <build@vaadin.com> | 2014-02-13 13:17:58 +0200 |
| commit | 3f07fb247e87deb19bef0f07004161c60443c829 (patch) | |
| tree | cb1c82b171514a75d637e9a1190a20a4b945f6e7 /uitest/src/com/vaadin/tests/integration | |
| parent | 6f5b334247e024143b82c1c9e0c84b41d9bd2abb (diff) | |
| parent | ef208a686c9b32a66d317ceaf571a1b0387625bb (diff) | |
| download | vaadin-framework-3f07fb247e87deb19bef0f07004161c60443c829.tar.gz vaadin-framework-3f07fb247e87deb19bef0f07004161c60443c829.zip | |
Merge changes from origin/7.1
98aff2b Fix caption lost issue related to focus changing (#12967)
af96612 Test using Tomcat 7 behind Apache proxy (#13302)
ad49fe3 Test using Wildfly 8 (currently CR1) (#13167)
6d8b9e5 Servlet test for push with default parameters (#13299)
d88e409 Added proper escaping to OptionGroup item icon URLs (#13310)
e680b8f Changed getAbsoluteUrl to use the correct escaping method (#13311)
fe6ea57 Release notes updated to describe #13310 #13311
ef208a6 Javadoc formatting fixup
Change-Id: I9cedc16c69b25cc89dd4e4a6812d29019e6e0e0a
Diffstat (limited to 'uitest/src/com/vaadin/tests/integration')
| -rw-r--r-- | uitest/src/com/vaadin/tests/integration/ServletIntegrationDefaultPushUI.java | 29 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/integration/ServletIntegrationDefaultPushUITest.java | 21 |
2 files changed, 50 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationDefaultPushUI.java b/uitest/src/com/vaadin/tests/integration/ServletIntegrationDefaultPushUI.java new file mode 100644 index 0000000000..d6def8d69c --- /dev/null +++ b/uitest/src/com/vaadin/tests/integration/ServletIntegrationDefaultPushUI.java @@ -0,0 +1,29 @@ +/* + * Copyright 2000-2013 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.tests.integration; + +import com.vaadin.annotations.Push; + +/** + * Server test which uses the default push mechanisms + * + * @since 7.1.12 + * @author Vaadin Ltd + */ +@Push +public class ServletIntegrationDefaultPushUI extends ServletIntegrationUI { + +} diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationDefaultPushUITest.java b/uitest/src/com/vaadin/tests/integration/ServletIntegrationDefaultPushUITest.java new file mode 100644 index 0000000000..5f50cdb95d --- /dev/null +++ b/uitest/src/com/vaadin/tests/integration/ServletIntegrationDefaultPushUITest.java @@ -0,0 +1,21 @@ +/* + * Copyright 2000-2013 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.tests.integration; + +public class ServletIntegrationDefaultPushUITest extends + AbstractServletIntegrationTest { + // Uses the test method declared in the super class +}
\ No newline at end of file |