mirrors
/
vaadin-framework
mirror of https://github.com/vaadin/framework.git
Watch 1
Star 0
Fork 0
Code Issues 0 Releases 330 Wiki Activity
Browse Source

Remove TB2 test running support 

Change-Id: I59229cd4809ea4e624244ee19f641f838a9c5312
tags/8.0.0.alpha1
Artur Signell 7 years ago
parent
9bef047be1
commit
7b899665d0
2 changed files with 5 additions and 233 deletions
Split View Show Diff Stats
  1. 5
    61
      uitest/integration_tests.xml
  2. 0
    172
      uitest/test.xml

+ 5
- 61
uitest/integration_tests.xml View File

@@ -50,38 +50,6 @@
<scp file="${demo.war}" todir="${user}@${test.integration.server}:integration-tests/servers/demo.war" keyfile="${sshkey.file}" passphrase="${passphrase}" />
</target>

<!-- Run basic integration test test -->
<target name="legacy-integration-test">
<fail unless="testfiles" message="You need to specify the files to run using the 'testfiles' property" />
<subant target="run-tb2-tests" failonerror="false" antfile="test.xml">
<property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}" />
<property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}" />
<property name="com.vaadin.testbench.deployment.url" value="${deployment.url}" />
<property name="server.start.succeeded" value="1" />
<property name="browsers" value="${test_browsers}" />
<property name="testfiles" value="${testfiles}" />
<property name="test-output-dir" value="${integration_test.dir}/result/integration-test-output/${server-name}" />
<property name="retries" value="0" />
<property name="report.qualifier" value="integration-tb2/${server-name}" />

<fileset dir="." includes="test.xml" />
</subant>
</target>

<target name="integration-test-theme">
<subant target="run-tb2-tests" failonerror="false" antfile="test.xml">
<property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}" />
<property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}" />
<property name="com.vaadin.testbench.deployment.url" value="${deployment.url}" />
<property name="server.start.succeeded" value="1" />
<property name="testfiles" value="${testfiles-theme}" />
<property name="test-output-dir" value="${integration_test.dir}/result/integration-test-output/${server-name}" />
<property name="report.qualifier" value="integration-theme-tb2/${server-name}" />

<fileset dir="." includes="test.xml" />
</subant>
</target>

<target name="run-tb3-servlet-test">
<antcall target="run-tb3-test" inheritall="true">
<param name="junit.test.suite" value="com.vaadin.tests.tb3.ServletIntegrationTests" />
@@ -276,35 +244,11 @@
</condition>
</fail>

<antcontrib:if>
<isset property="testfiles" />
<antcontrib:then>
<echo>Starting legacy (TB2) test for ${target-server}</echo>
<antcall target="legacy-integration-test">
<param name="server-name" value="${target-server}" />
<param name="deployment.url" value="http://${target-host}:${target-port}" />
</antcall>
</antcontrib:then>
<antcontrib:else>
<echo>Starting TB3 test for ${target-server}</echo>
<antcall target="run-tb3-servlet-test">
<param name="server-name" value="${target-server}" />
<param name="deployment.url" value="http://${target-host}:${target-port}" />
</antcall>
</antcontrib:else>
</antcontrib:if>

<!-- Run theme tests in all browsers if there's a property
with the test files -->
<antcontrib:if>
<isset property="testfiles-theme" />
<antcontrib:then>
<antcall target="integration-test-theme">
<param name="server-name" value="${target-server}" />
<param name="deployment.url" value="http://${target-host}:${target-port}" />
</antcall>
</antcontrib:then>
</antcontrib:if>
<echo>Starting TB3 test for ${target-server}</echo>
<antcall target="run-tb3-servlet-test">
<param name="server-name" value="${target-server}" />
<param name="deployment.url" value="http://${target-host}:${target-port}" />
</antcall>

<!-- timeout in five minutes -->
<sshexec host="${target-host}" outputproperty="stop-output" timeout="600000" username="${user}" keyfile="${sshkey.file}" trust="yes" command="ant -f deploy.xml shutdown-and-cleanup" failonerror="false" />

+ 0
- 172
uitest/test.xml View File

@@ -1,172 +0,0 @@
<?xml version="1.0"?>
<project xmlns:antcontrib="antlib:net.sf.antcontrib" xmlns:ivy="antlib:org.apache.ivy.ant" name="Run Vaadin Testbench Tests" basedir="." default="run-and-clean-up">

<include file="../common.xml" />
<dirname property="test.xml.dir" file="${ant.file.Run Vaadin Testbench Tests}" />
<!-- ================================================================== -->
<!-- Configuration -->
<!-- ================================================================== -->
<!-- Browsers to use for testing -->
<property name="browsers-windows" value="winxp-ie8,win7-ie9,win7-ie10,winxp-firefox17-esr" />
<property name="browsers-linux" value="linux-firefox3,linux-opera10,linux-googlechrome8" />
<property name="browsers-mac" value="osx-firefox3,osx-opera10,osx-googlechrome8,osx-safari4,osx-safari5" />

<property name="browsers" value="${browsers-windows}" />

<!-- Number of times to retry a test if it fails -->
<property name="retries" value="2" />

<!-- Screen shot base directory -->
<fail unless="com.vaadin.testbench.screenshot.directory" message="The 'com.vaadin.testbench.screenshot.directory' property must be defined." />

<!-- Screen shot resolution -->
<property name="com.vaadin.testbench.screenshot.resolution" value="1500x850" />

<!-- Host running Testbench Hub -->
<property name="com.vaadin.testbench.tester.host" value="testbench-hub.intra.itmill.com" />

<property name="com.vaadin.testbench.screenshot.block.error" value="0.025" />
<property name="com.vaadin.testbench.debug" value="false" />


<target name="initialize">
<!-- classpath must include test bench jar and its dependencies -->
<path id="classpath">
<fileset dir="${com.vaadin.testbench.lib.dir}" includes="**/*.jar" />
</path>
</target>

<!-- fileset containing all TestBench tests to run -->
<fileset dir="${test.xml.dir}" id="html-test-files">
<include name="tb2/**/*.html" />
<exclude name="integration-testscripts/**/*.html" />
</fileset>

<!-- This target converts HTML tests files to java junit tests. One test
file for each browser is created. -->
<target name="create-tests" depends="initialize, remove-temp-testclasses">
<!-- Temporary output directory, created and removed by this script -->
<fail unless="test-output-dir" message="The 'test-output-dir' property must be defined." />
<property name="class-dir" value="${test-output-dir}/classes" />

<pathconvert pathsep=" " property="testfiles" refid="html-test-files" />

<java classname="com.vaadin.testbench.util.TestConverter" classpathref="classpath" fork="true">
<sysproperty key="com.vaadin.testbench.test.retries" value="${retries}" />
<jvmarg value="-Duser.language=en" />
<jvmarg value="-Duser.country=US" />
<arg value="${test-output-dir}" />
<arg value="${browsers}" />
<arg line="${testfiles}" />
</java>
</target>


<!-- This target complies the generated java junit tests. -->
<target name="compile-tests" depends="create-tests">
<mkdir dir="${class-dir}" />
<javac includeantruntime="false" srcdir="${test-output-dir}" destdir="${class-dir}" debug="on" fork="yes" failonerror="false" encoding="UTF8">
<classpath>
<path refid="classpath" />
</classpath>
</javac>
</target>

<!-- ================================================================== -->
<!-- Running Tests -->
<!-- ================================================================== -->

<target name="check-parameters">
<fail unless="com.vaadin.testbench.lib.dir" message="The 'com.vaadin.testbench.lib.dir' property must be defined." />
<fail unless="com.vaadin.testbench.tester.host" message="The 'com.vaadin.testbench.tester.host' property must be defined." />
<fail unless="com.vaadin.testbench.deployment.url" message="The 'com.vaadin.testbench.deployment.url' property must be defined." />
</target>

<target name="run-tb2-tests" depends="check-parameters,compile-tests">
<property name="report.qualifier" value="tb2" />
<property name="report.dir" location="${test.xml.dir}/result/reports-${report.qualifier}" />
<delete dir="${report.dir}" />
<mkdir dir="${report.dir}" />
<fileset dir="${test-output-dir}" id="tests-fileset">
<include name="**/**.java" />
</fileset>

<antcontrib:for threadCount="30" parallel="true" keepgoing="true" param="target">
<path>
<fileset refid="tests-fileset" />
</path>
<sequential>
<antcall target="execute-tests">
<param name="target" value="@{target}" />
<reference refid="classpath" />
</antcall>
</sequential>
</antcontrib:for>
</target>

<!-- This target runs the generated and compiled junit tests -->
<target name="execute-tests">
<!-- Junit does not create the report dir so we need to ensure it
exists -->
<mkdir dir="${report.dir}" />
<junit fork="yes" showoutput="no" printsummary="no" maxmemory="96m">
<classpath>
<path refid="classpath" />
<pathelement path="${class-dir}" />
</classpath>

<formatter type="xml" />

<jvmarg value="-Dcom.vaadin.testbench.tester.host=${com.vaadin.testbench.tester.host}" />
<jvmarg value="-Dcom.vaadin.testbench.deployment.url=${com.vaadin.testbench.deployment.url}" />
<!-- Define where the reference screenshots and diff files are
saved -->
<jvmarg value="-Dcom.vaadin.testbench.screenshot.directory=${com.vaadin.testbench.screenshot.directory}" />
<!-- Resolution for screenshots -->
<jvmarg value="-Dcom.vaadin.testbench.screenshot.resolution=${com.vaadin.testbench.screenshot.resolution}" />
<jvmarg value="-Dcom.vaadin.testbench.debug=${com.vaadin.testbench.debug}" />
<jvmarg value="-Dcom.vaadin.testbench.screenshot.block.error=${com.vaadin.testbench.screenshot.block.error}" />


<jvmarg value="-Djava.awt.headless=true" />

<!-- true/false system arguments -->
<jvmarg value="-Dcom.vaadin.testbench.screenshot.softfail=${com.vaadin.testbench.screenshot.softfail}" />
<jvmarg value="-Dcom.vaadin.testbench.screenshot.reference.debug=${com.vaadin.testbench.screenshot.reference.debug}" />
<jvmarg value="-Dcom.vaadin.testbench.screenshot.cursor=${com.vaadin.testbench.screenshot.cursor}" />

<batchtest todir="${report.dir}">
<filelist dir="${test-output-dir}" files="${target}" />
</batchtest>
</junit>

</target>

<!-- Remove temporary source and compiled java files -->
<target name="remove-temp-testclasses">
<delete failonerror="false">
<fileset dir="${test-output-dir}">
<include name="**/**.java" />
<include name="**/**.class" />
</fileset>
</delete>
</target>

<!-- Remove old error screenshots -->
<target name="remove-error-screens">
<mkdir dir="${com.vaadin.testbench.screenshot.directory}/errors" />
<delete>
<fileset dir="${com.vaadin.testbench.screenshot.directory}/errors">
<include name="**/**.*" />
</fileset>
</delete>
</target>

<!-- ================================================================== -->
<!-- Main Targets -->
<!-- ================================================================== -->

<!-- The default target. -->
<target name="run-and-clean-up" depends="check-parameters,remove-error-screens,run-tb2-tests" />
</project>

Write Preview
Loading…
Cancel
Save