diff options
author | Artur Signell <artur.signell@itmill.com> | 2009-10-06 14:48:48 +0000 |
---|---|---|
committer | Artur Signell <artur.signell@itmill.com> | 2009-10-06 14:48:48 +0000 |
commit | 531f49304ea3abe2885f1c1166a90639410bb001 (patch) | |
tree | 19ed59a9e8d200332569fdddb236831365420bea | |
parent | 5df2c4c36e07ab3785c25cdad8cd4660fb205c21 (diff) | |
parent | bf0126f124908dd2b45a52abd49958dd0479adc8 (diff) | |
download | vaadin-framework-531f49304ea3abe2885f1c1166a90639410bb001.tar.gz vaadin-framework-531f49304ea3abe2885f1c1166a90639410bb001.zip |
Merged test changes
svn changeset:9116/svn branch:6.2
-rw-r--r-- | src/com/vaadin/tests/components/caption/LargeCaptionIcon.html | 10 | ||||
-rw-r--r-- | src/com/vaadin/tests/components/datefield/DisabledDateFieldWidth | 52 | ||||
-rw-r--r-- | src/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java | 42 | ||||
-rw-r--r-- | tests/scripts/demos-except-sampler.html | 77 | ||||
-rw-r--r-- | tests/scripts/sampler-all-samples.html | 188 | ||||
-rw-r--r-- | tests/test.xml | 9 |
6 files changed, 239 insertions, 139 deletions
diff --git a/src/com/vaadin/tests/components/caption/LargeCaptionIcon.html b/src/com/vaadin/tests/components/caption/LargeCaptionIcon.html index 61a014c975..d2928cf4c3 100644 --- a/src/com/vaadin/tests/components/caption/LargeCaptionIcon.html +++ b/src/com/vaadin/tests/components/caption/LargeCaptionIcon.html @@ -17,6 +17,11 @@ <td></td> </tr> <tr> + <td>pause</td> + <td>500</td> + <td></td> +</tr> +<tr> <td>screenCapture</td> <td></td> <td></td> @@ -27,6 +32,11 @@ <td></td> </tr> <tr> + <td>pause</td> + <td>500</td> + <td></td> +</tr> +<tr> <td>screenCapture</td> <td></td> <td></td> diff --git a/src/com/vaadin/tests/components/datefield/DisabledDateFieldWidth b/src/com/vaadin/tests/components/datefield/DisabledDateFieldWidth new file mode 100644 index 0000000000..48b11e1f7c --- /dev/null +++ b/src/com/vaadin/tests/components/datefield/DisabledDateFieldWidth @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="http://localhost:8888/" /> +<title>DisabledDateFieldWidth</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">DisabledDateFieldWidth</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/run/com.vaadin.tests.components.datefield.DisabledDateFieldWidth</td> + <td></td> +</tr> +<tr> + <td>waitForVaadin</td> + <td></td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>vaadin=runcomvaadintestscomponentsdatefieldDisabledDateFieldWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>waitForVaadin</td> + <td></td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>vaadin=runcomvaadintestscomponentsdatefieldDisabledDateFieldWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>waitForVaadin</td> + <td></td> + <td></td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/src/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java b/src/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java new file mode 100644 index 0000000000..3f26e106ee --- /dev/null +++ b/src/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java @@ -0,0 +1,42 @@ +package com.vaadin.tests.components.datefield;
+
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.DateField;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Button.ClickEvent;
+
+public class DisabledDateFieldWidth extends TestBase {
+ @Override
+ public void setup() {
+
+ final DateField dateField1 = new DateField("DateField");
+ dateField1.setResolution(DateField.RESOLUTION_YEAR);
+ dateField1.setEnabled(false);
+
+ Button button = new Button("Repaint datefield",
+ new Button.ClickListener() {
+ public void buttonClick(ClickEvent event) {
+ dateField1.requestRepaint();
+ }
+ });
+
+ GridLayout gl = new GridLayout(3, 1);
+ gl.addComponent(dateField1);
+ gl.addComponent(button);
+
+ addComponent(gl);
+ }
+
+ @Override
+ protected String getDescription() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ protected Integer getTicketNumber() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+}
diff --git a/tests/scripts/demos-except-sampler.html b/tests/scripts/demos-except-sampler.html index d534a8a0b9..c4ddcd15c2 100644 --- a/tests/scripts/demos-except-sampler.html +++ b/tests/scripts/demos-except-sampler.html @@ -12,29 +12,29 @@ <tr><td rowspan="1" colspan="3">demos-except-sampler</td></tr> </thead><tbody> <tr> - <td>open</td> + <td>openAndWait</td> <td>/</td> <td></td> </tr> <tr> - <td>waitForVaadinAndWait</td> + <td>waitForVaadin</td> <td></td> <td></td> </tr> <!--Removed Reservr test as the google maps "invalid key" alert box cannot be handled --> <tr> - <td>mouseClick</td> + <td>mouseClickAndWait</td> <td>link=VaadinTunes – advanced layout & theme</td> <td>134,11</td> </tr> <tr> - <td>waitForVaadinAndWait</td> + <td>waitForVaadin</td> <td></td> <td></td> </tr> <tr> <td>pause</td> - <td>500</td> + <td>1000</td> <td></td> </tr> <tr> @@ -43,28 +43,28 @@ <td></td> </tr> <tr> - <td>open</td> + <td>openAndWait</td> <td>/</td> <td></td> </tr> <tr> - <td>waitForVaadinAndWait</td> + <td>waitForVaadin</td> <td></td> <td></td> </tr> <tr> - <td>mouseClick</td> + <td>mouseClickAndWait</td> <td>link=Coverflow – Flex integration</td> <td>96,11</td> </tr> <tr> - <td>waitForVaadinAndWait</td> - <td></td> + <td>pause</td> + <td>1000</td> <td></td> </tr> <tr> - <td>pause</td> - <td>2000</td> + <td>waitForVaadin</td> + <td></td> <td></td> </tr> <tr> @@ -78,28 +78,28 @@ <td></td> </tr> <tr> - <td>open</td> + <td>openAndWait</td> <td>/</td> <td></td> </tr> <tr> - <td>waitForVaadinAndWait</td> + <td>waitForVaadin</td> <td></td> <td></td> </tr> <tr> - <td>mouseClick</td> + <td>mouseClickAndWait</td> <td>link=Reindeer theme – see available styles</td> <td>88,9</td> </tr> <tr> - <td>waitForVaadinAndWait</td> - <td></td> + <td>pause</td> + <td>1000</td> <td></td> </tr> <tr> - <td>pause</td> - <td>500</td> + <td>waitForVaadin</td> + <td></td> <td></td> </tr> <tr> @@ -113,22 +113,27 @@ <td></td> </tr> <tr> - <td>open</td> + <td>openAndWait</td> <td>/</td> <td></td> </tr> <tr> - <td>waitForVaadinAndWait</td> + <td>waitForVaadin</td> <td></td> <td></td> </tr> <tr> - <td>mouseClick</td> + <td>mouseClickAndWait</td> <td>link=Hello world</td> <td>36,8</td> </tr> <tr> - <td>waitForVaadinAndWait</td> + <td>pause</td> + <td>1000</td> + <td></td> +</tr> +<tr> + <td>waitForVaadin</td> <td></td> <td></td> </tr> @@ -143,22 +148,27 @@ <td></td> </tr> <tr> - <td>open</td> + <td>openAndWait</td> <td>/</td> <td></td> </tr> <tr> - <td>waitForVaadinAndWait</td> + <td>waitForVaadin</td> <td></td> <td></td> </tr> <tr> - <td>mouseClick</td> + <td>mouseClickAndWait</td> <td>link=Calculator</td> <td>49,2</td> </tr> <tr> - <td>waitForVaadinAndWait</td> + <td>pause</td> + <td>1000</td> + <td></td> +</tr> +<tr> + <td>waitForVaadin</td> <td></td> <td></td> </tr> @@ -208,22 +218,27 @@ <td></td> </tr> <tr> - <td>open</td> + <td>openAndWait</td> <td>/</td> <td></td> </tr> <tr> - <td>waitForVaadinAndWait</td> + <td>waitForVaadin</td> <td></td> <td></td> </tr> <tr> - <td>mouseClick</td> + <td>mouseClickAndWait</td> <td>link=Colorpicker – creating new widgets</td> <td>61,9</td> </tr> <tr> - <td>waitForVaadinAndWait</td> + <td>pause</td> + <td>1000</td> + <td></td> +</tr> +<tr> + <td>waitForVaadin</td> <td></td> <td></td> </tr> diff --git a/tests/scripts/sampler-all-samples.html b/tests/scripts/sampler-all-samples.html index 1a62b8061f..9eb9d17aef 100644 --- a/tests/scripts/sampler-all-samples.html +++ b/tests/scripts/sampler-all-samples.html @@ -12,7 +12,7 @@ <tr><td rowspan="1" colspan="3">sampler-all-samples</td></tr> </thead><tbody> <tr> - <td>open</td> + <td>openAndWait</td> <td>/</td> <td></td> </tr> @@ -22,12 +22,17 @@ <td></td> </tr> <tr> - <td>mouseClick</td> + <td>mouseClickAndWait</td> <td>//div[@id='sampler']/a/strong</td> <td>96,14</td> </tr> <tr> - <td>waitForVaadinAndWait</td> + <td>pause</td> + <td>1000</td> + <td></td> +</tr> +<tr> + <td>waitForVaadin</td> <td></td> <td></td> </tr> @@ -45,7 +50,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>1</td> </tr> <tr> <td>mouseClick</td> @@ -60,7 +65,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>2</td> </tr> <tr> <td>mouseClick</td> @@ -75,7 +80,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>3</td> </tr> <tr> <td>mouseClick</td> @@ -90,7 +95,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>4</td> </tr> <tr> <td>mouseClick</td> @@ -105,7 +110,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>5</td> </tr> <tr> <td>mouseClick</td> @@ -120,7 +125,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>6</td> </tr> <tr> <td>mouseClick</td> @@ -135,7 +140,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>7</td> </tr> <tr> <td>mouseClick</td> @@ -150,7 +155,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>8</td> </tr> <tr> <td>mouseClick</td> @@ -165,7 +170,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>9</td> </tr> <tr> <td>mouseClick</td> @@ -178,11 +183,6 @@ <td></td> </tr> <tr> - <td>screenCapture</td> - <td></td> - <td></td> -</tr> -<tr> <td>mouseClick</td> <td>vaadin=sampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[7]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</td> <td>11,13</td> @@ -193,11 +193,6 @@ <td></td> </tr> <tr> - <td>screenCapture</td> - <td></td> - <td></td> -</tr> -<tr> <td>mouseClick</td> <td>vaadin=sampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[7]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</td> <td>11,13</td> @@ -208,11 +203,6 @@ <td></td> </tr> <tr> - <td>screenCapture</td> - <td></td> - <td></td> -</tr> -<tr> <td>mouseClick</td> <td>vaadin=sampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[7]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</td> <td>11,13</td> @@ -223,11 +213,6 @@ <td></td> </tr> <tr> - <td>screenCapture</td> - <td></td> - <td></td> -</tr> -<tr> <td>mouseClick</td> <td>vaadin=sampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[7]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</td> <td>11,13</td> @@ -240,7 +225,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>14</td> </tr> <tr> <td>mouseClick</td> @@ -255,7 +240,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>15</td> </tr> <tr> <td>mouseClick</td> @@ -270,7 +255,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>16</td> </tr> <tr> <td>mouseClick</td> @@ -285,7 +270,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>17</td> </tr> <tr> <td>mouseClick</td> @@ -300,7 +285,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>18</td> </tr> <tr> <td>mouseClick</td> @@ -315,7 +300,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>19</td> </tr> <tr> <td>mouseClick</td> @@ -330,7 +315,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>20</td> </tr> <tr> <td>mouseClick</td> @@ -345,7 +330,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>21</td> </tr> <tr> <td>mouseClick</td> @@ -360,7 +345,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>22</td> </tr> <tr> <td>mouseClick</td> @@ -375,7 +360,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>23</td> </tr> <tr> <td>mouseClick</td> @@ -390,7 +375,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>24</td> </tr> <tr> <td>mouseClick</td> @@ -405,7 +390,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>25</td> </tr> <tr> <td>mouseClick</td> @@ -420,7 +405,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>26</td> </tr> <tr> <td>mouseClick</td> @@ -435,7 +420,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>27</td> </tr> <tr> <td>mouseClick</td> @@ -450,7 +435,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>28</td> </tr> <tr> <td>mouseClick</td> @@ -465,7 +450,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>29</td> </tr> <tr> <td>mouseClick</td> @@ -480,7 +465,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>30</td> </tr> <tr> <td>mouseClick</td> @@ -495,7 +480,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>31</td> </tr> <tr> <td>mouseClick</td> @@ -510,7 +495,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>32</td> </tr> <tr> <td>mouseClick</td> @@ -525,7 +510,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>33</td> </tr> <tr> <td>mouseClick</td> @@ -540,7 +525,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>34</td> </tr> <tr> <td>mouseClick</td> @@ -555,7 +540,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>35</td> </tr> <tr> <td>mouseClick</td> @@ -570,7 +555,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>36</td> </tr> <tr> <td>mouseClick</td> @@ -585,7 +570,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>37</td> </tr> <tr> <td>mouseClick</td> @@ -600,7 +585,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>38</td> </tr> <tr> <td>mouseClick</td> @@ -615,7 +600,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>39</td> </tr> <tr> <td>mouseClick</td> @@ -630,7 +615,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>40</td> </tr> <tr> <td>mouseClick</td> @@ -645,7 +630,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>41</td> </tr> <tr> <td>mouseClick</td> @@ -660,7 +645,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>42</td> </tr> <tr> <td>mouseClick</td> @@ -675,7 +660,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>43</td> </tr> <tr> <td>mouseClick</td> @@ -690,7 +675,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>44</td> </tr> <tr> <td>mouseClick</td> @@ -705,7 +690,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>45</td> </tr> <tr> <td>mouseClick</td> @@ -720,7 +705,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>46</td> </tr> <tr> <td>mouseClick</td> @@ -735,7 +720,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>47</td> </tr> <tr> <td>mouseClick</td> @@ -750,7 +735,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>48</td> </tr> <tr> <td>mouseClick</td> @@ -765,7 +750,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>49</td> </tr> <tr> <td>mouseClick</td> @@ -780,7 +765,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>50</td> </tr> <tr> <td>mouseClick</td> @@ -793,11 +778,6 @@ <td></td> </tr> <tr> - <td>screenCapture</td> - <td></td> - <td></td> -</tr> -<tr> <td>mouseClick</td> <td>vaadin=sampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[7]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</td> <td>11,13</td> @@ -810,7 +790,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>52</td> </tr> <tr> <td>mouseClick</td> @@ -825,7 +805,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>53</td> </tr> <tr> <td>mouseClick</td> @@ -840,7 +820,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>54</td> </tr> <tr> <td>mouseClick</td> @@ -855,7 +835,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>55</td> </tr> <tr> <td>mouseClick</td> @@ -870,7 +850,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>56</td> </tr> <tr> <td>mouseClick</td> @@ -885,7 +865,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>57</td> </tr> <tr> <td>mouseClick</td> @@ -900,7 +880,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>58</td> </tr> <tr> <td>mouseClick</td> @@ -915,7 +895,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>59</td> </tr> <tr> <td>mouseClick</td> @@ -930,7 +910,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>60</td> </tr> <tr> <td>mouseClick</td> @@ -945,7 +925,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>61</td> </tr> <tr> <td>mouseClick</td> @@ -960,7 +940,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>62</td> </tr> <tr> <td>mouseClick</td> @@ -975,7 +955,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>63</td> </tr> <tr> <td>mouseClick</td> @@ -990,7 +970,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>64</td> </tr> <tr> <td>mouseClick</td> @@ -1005,7 +985,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>65</td> </tr> <tr> <td>mouseClick</td> @@ -1020,7 +1000,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>66</td> </tr> <tr> <td>mouseClick</td> @@ -1035,7 +1015,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>67</td> </tr> <tr> <td>mouseClick</td> @@ -1050,7 +1030,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>68</td> </tr> <tr> <td>mouseClick</td> @@ -1065,7 +1045,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>69</td> </tr> <tr> <td>mouseClick</td> @@ -1080,7 +1060,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>70</td> </tr> <tr> <td>mouseClick</td> @@ -1095,7 +1075,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>71</td> </tr> <tr> <td>mouseClick</td> @@ -1110,7 +1090,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>72</td> </tr> <tr> <td>mouseClick</td> @@ -1125,7 +1105,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>73</td> </tr> <tr> <td>mouseClick</td> @@ -1140,7 +1120,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>74</td> </tr> <tr> <td>mouseClick</td> @@ -1155,7 +1135,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>75</td> </tr> <tr> <td>mouseClick</td> @@ -1170,7 +1150,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>76</td> </tr> <tr> <td>mouseClick</td> @@ -1185,7 +1165,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>77</td> </tr> <tr> <td>mouseClick</td> @@ -1200,7 +1180,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>78</td> </tr> <tr> <td>mouseClick</td> @@ -1215,7 +1195,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>79</td> </tr> <tr> <td>mouseClick</td> @@ -1230,7 +1210,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>80</td> </tr> <tr> <td>mouseClick</td> @@ -1245,7 +1225,7 @@ <tr> <td>screenCapture</td> <td></td> - <td></td> + <td>81</td> </tr> </tbody></table> diff --git a/tests/test.xml b/tests/test.xml index 2f7317e9d0..6c1b3ca074 100644 --- a/tests/test.xml +++ b/tests/test.xml @@ -22,7 +22,7 @@ </fileset> <!-- This target converts HTML tests files to java junit tests. One test file for each browser is created. --> - <target name="create-tests"> + <target name="create-tests" depends="remove-temp-testclasses"> <fileset id="tests"> <include /> </fileset> @@ -95,7 +95,7 @@ </target> <!-- This target runs the generated and compiled junit tests --> - <target name="execute-tests" depends="compile-tests,remove-error-screens"> + <target name="execute-tests" depends="remove-error-screens,compile-tests"> <junit fork="yes" printsummary="withOutAndErr"> <classpath> <path refid="classpath" /> @@ -122,10 +122,11 @@ </target> <!-- Remove temporary source and compiled java files --> - <target name="remove-temp-files"> + <target name="remove-temp-testclasses"> <delete> <fileset dir="${test-output-dir}"> <include name="**/**.java" /> + <include name="**/**.class" /> </fileset> </delete> </target> @@ -145,7 +146,7 @@ <!-- ================================================================== --> <!-- The default target. --> - <target name="run-and-clean-up" depends="check-parameters, run-tests,remove-temp-files"> + <target name="run-and-clean-up" depends="check-parameters, run-tests,remove-temp-testclasses"> </target> <!-- Also starts the server. --> |