Change-Id: I3c718232364f5ca7cce7131fa7685e4a2b833120tags/7.1.8
@@ -92,7 +92,7 @@ | |||
<servlet-class>com.vaadin.server.VaadinServlet</servlet-class> | |||
<init-param> | |||
<param-name>UI</param-name> | |||
<param-value>com.vaadin.tests.integration.IntegrationTestUI</param-value> | |||
<param-value>com.vaadin.tests.integration.ServletIntegrationUI</param-value> | |||
</init-param> | |||
<async-supported>true</async-supported> | |||
</servlet> |
@@ -86,7 +86,7 @@ | |||
<servlet-class>com.vaadin.server.VaadinServlet</servlet-class> | |||
<init-param> | |||
<param-name>UI</param-name> | |||
<param-value>com.vaadin.tests.integration.IntegrationTestUI</param-value> | |||
<param-value>com.vaadin.tests.integration.ServletIntegrationUI</param-value> | |||
</init-param> | |||
</servlet> | |||
<servlet-mapping> |
@@ -32,7 +32,7 @@ import com.vaadin.tests.tb3.PrivateTB3Configuration; | |||
* @author Vaadin Ltd | |||
*/ | |||
@RunWith(IntegrationTestRunner.class) | |||
public abstract class AbstractIntegrationTestTB3 extends | |||
public abstract class AbstractIntegrationTest extends | |||
PrivateTB3Configuration { | |||
@Override | |||
protected String getBaseURL() { |
@@ -26,8 +26,8 @@ import org.openqa.selenium.WebElement; | |||
* | |||
* @author Vaadin Ltd | |||
*/ | |||
public abstract class ServletIntegrationTestTB3 extends | |||
AbstractIntegrationTestTB3 { | |||
public abstract class AbstractServletIntegrationTest extends | |||
AbstractIntegrationTest { | |||
@Test | |||
public void runTest() throws IOException, AssertionError { |
@@ -45,7 +45,7 @@ public class IntegrationTestRunner extends TB3Runner { | |||
*/ | |||
@Override | |||
protected String testName(FrameworkMethod method) { | |||
if (AbstractIntegrationTestTB3.class.isAssignableFrom(testClass)) { | |||
if (AbstractIntegrationTest.class.isAssignableFrom(testClass)) { | |||
return System.getProperty("server-name"); | |||
} else { | |||
return super.testName(method); |
@@ -25,11 +25,6 @@ import com.vaadin.shared.ui.ui.Transport; | |||
* @author Vaadin Ltd | |||
*/ | |||
@Push(transport = Transport.STREAMING) | |||
public class IntegrationTestStreaming extends IntegrationTestUI { | |||
public static class IntegrationTestStreamingTB3 extends | |||
ServletIntegrationTestTB3 { | |||
// Uses the test method declared in the super class | |||
} | |||
public class ServletIntegrationStreamingUI extends ServletIntegrationUI { | |||
} |
@@ -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 ServletIntegrationStreamingUITest extends | |||
AbstractServletIntegrationTest { | |||
// Uses the test method declared in the super class | |||
} |
@@ -11,11 +11,7 @@ import com.vaadin.ui.Table; | |||
import com.vaadin.ui.UI; | |||
import com.vaadin.ui.VerticalLayout; | |||
public class IntegrationTestUI extends UI { | |||
public class IntegrationTestXhrTB3 extends ServletIntegrationTestTB3 { | |||
// Uses the test method declared in the super class | |||
} | |||
public class ServletIntegrationUI extends UI { | |||
@Override | |||
protected void init(VaadinRequest request) { |
@@ -0,0 +1,20 @@ | |||
/* | |||
* 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 ServletIntegrationUITest extends AbstractServletIntegrationTest { | |||
// Uses the test method declared in the super class | |||
} |
@@ -26,11 +26,7 @@ import com.vaadin.shared.ui.ui.Transport; | |||
* @author Vaadin Ltd | |||
*/ | |||
@Push(transport = Transport.WEBSOCKET) | |||
public class IntegrationTestWebsocket extends IntegrationTestUI { | |||
public class IntegrationTestWebsocketTB3 extends ServletIntegrationTestTB3 { | |||
// Uses the test method declared in the super class | |||
} | |||
public class ServletIntegrationWebsocketUI extends ServletIntegrationUI { | |||
/* | |||
* (non-Javadoc) |
@@ -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 ServletIntegrationWebsocketUITest extends | |||
AbstractServletIntegrationTest { | |||
// Uses the test method declared in the super class | |||
} |
@@ -19,7 +19,7 @@ package com.vaadin.tests.tb3; | |||
import org.junit.runner.RunWith; | |||
import org.junit.runners.model.InitializationError; | |||
import com.vaadin.tests.integration.ServletIntegrationTestTB3; | |||
import com.vaadin.tests.integration.AbstractServletIntegrationTest; | |||
import com.vaadin.tests.tb3.ServletIntegrationTests.ServletIntegrationTestSuite; | |||
@RunWith(ServletIntegrationTestSuite.class) | |||
@@ -28,7 +28,7 @@ public class ServletIntegrationTests { | |||
public static class ServletIntegrationTestSuite extends TB3TestSuite { | |||
public ServletIntegrationTestSuite(Class<?> klass) | |||
throws InitializationError { | |||
super(klass, ServletIntegrationTestTB3.class, | |||
super(klass, AbstractServletIntegrationTest.class, | |||
"com.vaadin.tests.integration", new String[] {}); | |||
} | |||
} |