Parcourir la source

Remove WebSphere 8 and Glassfish 3 tests

WebSphere 8 prior to 8.5.5.9 does not support Java 8.
Glassfish 3 does not support Java 8 out of the box.

Change-Id: I028a0aaf0dc285cc6e43a4e773ca6084e875db81
feature/vaadin8-sass-valo-only
Henri Sara il y a 7 ans
Parent
révision
ba5ef85bc8

+ 0
- 30
uitest/integration_tests.xml Voir le fichier

@@ -180,12 +180,6 @@
<param name="target-port" value="80" />
</antcall>
</target>
<target name="integration-test-glassfish3">
<antcall target="run-generic-integration-test">
<param name="startDelay" value="10" />
<param name="target-server" value="glassfish3" />
</antcall>
</target>
<target name="integration-test-glassfish4">
<antcall target="run-generic-integration-test">
<param name="startDelay" value="10" />
@@ -225,28 +219,6 @@
</antcall>
</target>

<target name="integration-test-websphere8">
<antcall target="run-generic-integration-test">
<param name="startDelay" value="600" />
<param name="target-port" value="9080" />
<param name="target-server" value="websphere8" />
</antcall>
</target>

<target name="integration-test-websphereportal8">
<concat>##teamcity[testStarted name='websphereportal8' flowId='websphereportal8']</concat>
<antcall target="run-tb3-test" inheritall="true">
<param name="junit.test.suite" value="com.vaadin.tests.integration.WebSpherePortalIntegrationTest" />
<param name="server-name" value="websphereportal8" />

<!-- Fill out dummy values for params required by run-tb3-test target -->
<param name="test.integration.server" value="" />
<param name="test.integration.user" value="" />
<param name="test.integration.antfile" value="" />
</antcall>
<concat>##teamcity[testFinished name='websphereportal8' flowId='websphereportal8']"</concat>
</target>

<target name="integration-test-weblogic12">
<antcall target="run-generic-integration-test">
<param name="startDelay" value="600" />
@@ -269,7 +241,6 @@
<antcall target="integration-test-liferay6" />
<antcall target="integration-test-liferay6-theme" />
<antcall target="integration-test-weblogic12" />
<antcall target="integration-test-glassfish3" />
<antcall target="integration-test-glassfish4" />
<antcall target="integration-test-payara" />
<antcall target="integration-test-jboss-eap6" />
@@ -282,7 +253,6 @@
<antcall target="integration-test-tomcat8" />
<antcall target="integration-test-osgi" />
<antcall target="integration-test-tomcat7apacheproxy" />
<antcall target="integration-test-websphere8" />
</parallel>

</target>

+ 0
- 163
uitest/src/test/java/com/vaadin/tests/integration/WebSpherePortalIntegrationTest.java Voir le fichier

@@ -1,163 +0,0 @@
/*
* Copyright 2000-2014 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 static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;

import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;

import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.openqa.selenium.By;
import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.WebDriverWait;

import com.jcraft.jsch.ChannelExec;
import com.jcraft.jsch.ChannelSftp;
import com.jcraft.jsch.JSch;
import com.jcraft.jsch.JSchException;
import com.jcraft.jsch.Session;
import com.jcraft.jsch.SftpException;
import com.vaadin.tests.tb3.PrivateTB3Configuration;

public class WebSpherePortalIntegrationTest extends PrivateTB3Configuration {

@BeforeClass
public static void deployPortlet() throws JSchException, SftpException {
Session session = openSession();

uploadDemoApplication(session);

sendCommand(session, "ant -f deploy.xml get-lock startup-and-deploy");

session.disconnect();
}

private static void uploadDemoApplication(Session session)
throws JSchException, SftpException {
ChannelSftp sftpChannel = (ChannelSftp) session.openChannel("sftp");
sftpChannel.connect();

String applicationPath = System.getProperty("demo.war");
if (new File(applicationPath).exists()) {
sftpChannel.put(applicationPath, "demo.war");
sftpChannel.disconnect();
} else {
sftpChannel.disconnect();
throw new AssertionError("Demo application not found at "
+ applicationPath);
}
}

private static void sendCommand(Session session, String command)
throws JSchException {
ChannelExec channel = (ChannelExec) session.openChannel("exec");
channel.setCommand(command);
BufferedReader in;
try {
in = new BufferedReader(new InputStreamReader(
channel.getInputStream()));

channel.connect();

String msg = null;

while ((msg = in.readLine()) != null) {
System.out.println(msg);
}
} catch (IOException e) {
e.printStackTrace();
}

channel.disconnect();
}

private static Session openSession() throws JSchException {
JSch jsch = new JSch();
Session session = jsch.getSession("integration",
"websphereportal8.devnet.vaadin.com", 22);
jsch.addIdentity("~/.ssh/id_dsa");
session.setConfig("StrictHostKeyChecking", "no");

session.connect();
return session;
}

@AfterClass
public static void teardown() throws JSchException {
Session session = openSession();

sendCommand(session, "ant -f deploy.xml release-lock");

session.disconnect();
}

@Override
protected java.lang.String getTestUrl() {
return "http://websphereportal8.devnet.vaadin.com:10039/wps/portal";
}

@Override
public void setup() throws Exception {
super.setup();

openTestURL();

if (!isLoggedIn()) {
login();
}

waitUntilPortletIsLoaded();
}

private void waitUntilPortletIsLoaded() {
WebDriverWait wait = new WebDriverWait(driver, 15);
wait.until(ExpectedConditions.visibilityOfElementLocated(By
.className("v-app")));
}

private boolean isLoggedIn() {
return driver.findElements(By.linkText("Log Out")).size() == 1;
}

private void login() {
driver.findElement(By.linkText("Log In")).click();
driver.findElement(By.id("userID")).sendKeys("test");
driver.findElement(By.id("password")).sendKeys("testtest");

hitButton("login.button.login");
}

@Test
public void portletHasExpectedLayout() throws IOException {
compareScreen("initial");
}

@Test
public void viewModeIsSetToEdit() throws IOException {
driver.findElement(By.linkText("Edit")).click();

assertThat(driver.findElement(By.tagName("input")).isEnabled(),
is(true));

}

}

Chargement…
Annuler
Enregistrer