Artur Signell
04dabc72d1
Merge remote-tracking branch 'origin/6.8'
...
Conflicts:
src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
tests/test.xml
2012-02-03 22:26:47 +02:00
Artur Signell
4ede774d6c
Merge commit '98737932a588f1b4a8f8115f2545da63ae7f4e4a'
...
Conflicts:
WebContent/VAADIN/themes/base/button/button.css
WebContent/VAADIN/themes/runo/button/button.css
tests/integration_tests.xml
2012-02-03 22:20:34 +02:00
Artur Signell
dec81152ae
#8342 Test using Firefox 10
...
svn changeset:22876/svn branch:6.7
2012-02-03 12:24:52 +00:00
Artur Signell
98737932a5
#8311 Converted CRLF -> LF in css/html/xml files
...
svn changeset:22852/svn branch:6.7
2012-02-02 09:20:29 +00:00
Artur Signell
c1f26940cd
Merged 'b1ae3cd70e2ca4656bb28f77ca79fe0efd29dd67' (origin/6.8)
...
Conflicts:
WebContent/release-notes.html
tests/server-side/com/vaadin/tests/server/LicenseInJavaFiles.java
2012-01-31 15:33:01 +02:00
Artur Signell
8cc1ee0aa0
Merge remote-tracking branch 'origin/6.8'
...
Conflicts:
WebContent/VAADIN/themes/base/table/table.css
WebContent/release-notes.html
build/build.xml
src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java
src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
src/com/vaadin/terminal/gwt/client/ui/VSlider.java
src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java
src/com/vaadin/terminal/gwt/client/ui/VWindow.java
src/com/vaadin/ui/Table.java
tests/integration_tests.xml
tests/test.xml
tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
2012-01-27 14:17:08 +02:00
Artur Signell
94dddf055a
[merge from 6.7] Attempt at evening the load of the integration tests by starting all lightweight servers immediately and the more heavy servers later on
...
svn changeset:22779/svn branch:6.8
2012-01-27 08:17:27 +00:00
Artur Signell
31f14a53c6
[merge from 6.7] #8272 Enabled Weblogic 12 test
...
svn changeset:22778/svn branch:6.8
2012-01-27 08:16:00 +00:00
Artur Signell
1393fa2b95
[merge from 6.7] #8271 Enabled Jetty 8 test
...
svn changeset:22777/svn branch:6.8
2012-01-27 08:15:30 +00:00
Artur Signell
8225e06579
[merge from 6.7] Disable weblogic 12 test for now
...
svn changeset:22775/svn branch:6.8
2012-01-27 08:12:04 +00:00
Artur Signell
9d8b8ee437
[merge from 6.7] #8272 Test automatically using WebLogic 12
...
svn changeset:22772/svn branch:6.8
2012-01-27 07:59:37 +00:00
Johannes Dahlström
4f50c1b2c0
Integration test fixes
...
svn changeset:22747/svn branch:6.8
2012-01-23 13:20:15 +00:00
Johannes Dahlström
272923e032
Merge from 6.7
...
svn changeset:22729/svn branch:6.8
2012-01-20 10:30:03 +00:00
Artur Signell
ab6a049e2f
Attempt at evening the load of the integration tests by starting all lightweight servers immediately and the more heavy servers later on
...
svn changeset:22720/svn branch:6.7
2012-01-19 19:51:19 +00:00
Artur Signell
6abe5920cc
#8272 Enabled Weblogic 12 test
...
svn changeset:22715/svn branch:6.7
2012-01-19 17:04:15 +00:00
Artur Signell
6da82c3ed2
#8271 Enabled Jetty 8 test
...
svn changeset:22711/svn branch:6.7
2012-01-19 16:17:37 +00:00
Artur Signell
d4f04f7adc
Disable weblogic 12 test for now
...
svn changeset:22680/svn branch:6.7
2012-01-17 16:57:03 +00:00
Artur Signell
a2c034e7b8
#8272 Test automatically using WebLogic 12
...
svn changeset:22673/svn branch:6.7
2012-01-17 15:31:58 +00:00
Leif Åstrand
0fff9b0fab
Update integration tests to use ff9
2012-01-12 09:30:38 +02:00
Johannes Dahlström
d90f3ed208
Add Firefox 9 and Chrome 16 to tested browsers, remove Firefox 4-8, Chrome 15
...
svn changeset:22557/svn branch:6.8
2012-01-09 14:42:26 +00:00
Leif Åstrand
2cd9ee04d4
Add antcontrib: prefix to an if block
2011-12-21 10:56:41 +02:00
Leif Åstrand
fee521c537
Add one missing antcontrib: prefix
2011-12-20 16:23:17 +02:00
Mikael Vappula
9402854b28
Ant scp task is not in ant contrib, reverted faulty namespace decl.
2011-12-20 13:57:45 +02:00
Mikael Vappula
88c19b8979
Added xml namespace declaration for tasks in ant contrib
2011-12-20 13:34:45 +02:00
Mikael Vappula
c1ac1f6b1f
Cleaned up Ivy configuration
...
Targets related to Ivy configuration are now in separate common.xml file
which is imported to main build files.
2011-12-02 15:05:24 +02:00
Leif Åstrand
e578248b13
Merge remote branch 'origin/6.8'
...
Conflicts:
tests/integration_tests.xml
2011-11-22 12:14:22 +02:00
Henri Sara
d8e680ed8f
Merged some changes from 6.7 to 6.8
...
svn changeset:22016/svn branch:6.8
2011-11-16 10:39:05 +00:00
Leif Åstrand
7d7e06b90c
Run integration tests with Safari 5 instead of Firefox 3.6 ( #7396 )
2011-11-11 09:52:25 +02:00
Leif Åstrand
2eff8c02ab
Merge remote-tracking branch 'origin/6.8' into master
2011-11-08 17:28:27 +02:00
Leif Åstrand
b1631651fb
Don't test with JBoss AS 3 and Tomcat 4 any more because of dropped
...
support for servlet 2.3
2011-10-31 14:38:12 +02:00
Leif Åstrand
0cd52aea2c
Added output of some debug information
...
svn changeset:21813/svn branch:6.7
2011-10-27 09:52:51 +00:00
Leif Åstrand
70cda8a223
Added testing for jboss6 ( #7371 ) and jboss7 ( #7372 )
...
Moved more stuff inside a try-finally block
svn changeset:21774/svn branch:6.7
2011-10-21 12:26:29 +00:00
Leif Åstrand
f1f87c150e
Improved error handling for integration tests
...
svn changeset:21756/svn branch:6.7
2011-10-20 07:42:53 +00:00
Leif Åstrand
402407c7b9
Added some timeouts to avoid build going on forever
...
Prefix remote output with server name to make it easier to interpret the build logs
Generalized the teamcity escaping
svn changeset:21730/svn branch:6.7
2011-10-18 09:17:33 +00:00
Leif Åstrand
1c38a69e4f
Added random delay before starting the quicker servers to avoid contention in the beginning
...
Automatically update more base files before starting the actual tests
svn changeset:21719/svn branch:6.7
2011-10-17 13:04:06 +00:00
Leif Åstrand
06c008c2fb
Improved escaping of error messages passed to teamcity
...
svn changeset:21713/svn branch:6.7
2011-10-17 10:34:04 +00:00
Leif Åstrand
74542ad91f
New infrastructure for running integration tests in parallel
...
svn changeset:21707/svn branch:6.7
2011-10-13 14:36:41 +00:00
Henri Sara
3dd695f3c6
Temporarily disabled Liferay 6 EE integration test - WAR deployment often fails on first attempt on Liferay 6 EE.
...
svn changeset:21640/svn branch:6.7
2011-10-07 10:58:07 +00:00
Henri Sara
5a5db18cde
Correction to running GAE tests in parallel with other integration tests
...
svn changeset:20474/svn branch:6.7
2011-08-18 13:03:22 +00:00
Henri Sara
a25b677763
#7178 New servlet integration test not using the address book demo, related screenshots
...
svn changeset:20342/svn branch:6.7
2011-08-12 09:53:31 +00:00
Henri Sara
39605c944f
WebLogic portal integration test using a separate test portlet
...
svn changeset:20299/svn branch:6.7
2011-08-11 12:04:08 +00:00
Henri Sara
f812bc4bf7
eXo portal integration test using a separate test portlet
...
svn changeset:20293/svn branch:6.7
2011-08-11 09:19:20 +00:00
Henri Sara
48af8750fd
#4497 GateIn Portlet2 test
...
svn changeset:20283/svn branch:6.7
2011-08-11 06:40:55 +00:00
Henri Sara
f34695c63c
#7266 removed dependencies from integration tests to Sampler: Liferay 5; fixed Liferay 5 portlet 2 integration test
...
svn changeset:20096/svn branch:6.7
2011-08-03 10:45:37 +00:00
Henri Sara
2d3763b817
#7266 eliminate use of Sampler in GAE integration test
...
svn changeset:20094/svn branch:6.7
2011-08-03 09:53:00 +00:00
Henri Sara
a99850a634
#7266 eliminate use of Sampler in GateIn integration test, related new screenshots
...
svn changeset:20092/svn branch:6.7
2011-08-03 08:06:27 +00:00
Henri Sara
493f179c25
#7266 converted most integration tests not to use Sampler, related screenshot updates
...
svn changeset:20086/svn branch:6.7
2011-08-03 05:07:28 +00:00
Henri Sara
577d3578bd
Switch back to using Firefox 3.6 for integration tests until tests fixed
...
svn changeset:20071/svn branch:6.7
2011-08-02 06:33:44 +00:00
Henri Sara
f53c8e61fd
Fixed: execute integration tests with Chrome
...
svn changeset:20066/svn branch:6.7
2011-08-01 13:52:24 +00:00
Henri Sara
1bdc1366d7
Run integration tests with Chrome
...
svn changeset:20065/svn branch:6.7
2011-08-01 13:16:59 +00:00