summaryrefslogtreecommitdiffstats
path: root/o3d
diff options
context:
space:
mode:
authorkkania@google.com <kkania@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-08 19:02:21 +0000
committerkkania@google.com <kkania@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-08 19:02:21 +0000
commitb0d580abe4564811b1cebbbaf42be36bfea9a750 (patch)
tree634a61cf326cf0336d2f4b86d654c41621c192e9 /o3d
parentd99cdfdc14e07927af392c95d7245abc091c5b53 (diff)
downloadchromium_src-b0d580abe4564811b1cebbbaf42be36bfea9a750.zip
chromium_src-b0d580abe4564811b1cebbbaf42be36bfea9a750.tar.gz
chromium_src-b0d580abe4564811b1cebbbaf42be36bfea9a750.tar.bz2
Drastically improves selenium testing performance with IE by using ids for input elements.
Review URL: http://codereview.chromium.org/271023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28421 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
-rw-r--r--o3d/samples/customcamera.html36
-rw-r--r--o3d/tests/selenium/samples_tests.py15
2 files changed, 28 insertions, 23 deletions
diff --git a/o3d/samples/customcamera.html b/o3d/samples/customcamera.html
index 9a3b03c..e3c7538 100644
--- a/o3d/samples/customcamera.html
+++ b/o3d/samples/customcamera.html
@@ -330,17 +330,21 @@ set the position of the camera.
<tbody>
<tr>
<td>Eye</td>
- <td><input name="eyeX"
+ <td><input id="eyeX"
+ name="eyeX"
type="text"
onblur="validateFloat(this)"/></td>
- <td><input name="eyeY"
+ <td><input id="eyeY"
+ name="eyeY"
type="text"
onblur="validateFloat(this)"/></td>
- <td><input name="eyeZ"
+ <td><input id="eyeZ"
+ name="eyeZ"
type="text"
onblur="validateFloat(this)"/></td>
<td rowspan="2">
- <input name="btnSet"
+ <input id="btnSet"
+ name="btnSet"
type="button"
value="Set camera"
onClick="setCamera()"/>
@@ -348,29 +352,36 @@ set the position of the camera.
</tr>
<tr>
<td>Target</td>
- <td><input name="targetX"
+ <td><input id="targetX"
+ name="targetX"
type="text"
onblur="validateFloat(this)"/></td>
- <td><input name="targetY"
+ <td><input id="targetY"
+ name="targetY"
type="text"
onblur="validateFloat(this)"/></td>
- <td><input name="targetZ"
+ <td><input id="targetZ"
+ name="targetZ"
type="text"
onblur="validateFloat(this)"/></td>
</tr>
<tr>
<td>Up vector</td>
- <td><input name="upX"
+ <td><input id="upX"
+ name="upX"
type="text"
onblur="validateFloat(this)"/></td>
- <td><input name="upY"
+ <td><input id="upY"
+ name="upY"
type="text"
onblur="validateFloat(this)"/></td>
- <td><input name="upZ"
+ <td><input id="upZ"
+ name="upZ"
type="text"
onblur="validateFloat(this)"/></td>
<td>
- <input name="btnDefault"
+ <input id="btnDefault"
+ name="btnDefault"
type="button"
value="Restore default camera"
onClick="setDefaultCameraValues()"/>
@@ -378,7 +389,8 @@ set the position of the camera.
</tr>
<tr>
<td colspan="5" style="text-align:center">
- <input name="btnAnimate"
+ <input id="btnAnimate"
+ name="btnAnimate"
type="button"
value="Animate"
onClick="toggleAnimate()"/>
diff --git a/o3d/tests/selenium/samples_tests.py b/o3d/tests/selenium/samples_tests.py
index b15592e..0a83eb5 100644
--- a/o3d/tests/selenium/samples_tests.py
+++ b/o3d/tests/selenium/samples_tests.py
@@ -180,28 +180,21 @@ class SampleTests(selenium_utilities.SeleniumTestCase):
self.assertEqual("null", s.get_eval("window.undefined_symbol_xxxyyy"))
# Try different views of the camera
- time.sleep(1)
+ # Set delay between each operation at 100ms.
+ s.set_speed(100)
s.type("eyeX", "5")
- time.sleep(1)
s.type("eyeY", "5")
- time.sleep(1)
s.type("eyeZ", "5")
- time.sleep(1)
s.click("btnSet")
- time.sleep(1)
s.type("eyeX", "2")
- time.sleep(1)
s.type("eyeY", "3")
- time.sleep(1)
s.type("eyeZ", "2")
- time.sleep(1)
s.type("upX", "1")
- time.sleep(1)
s.type("upY", "0")
- time.sleep(1)
s.click("btnSet")
- time.sleep(2)
+ # Reset delay to default value, 0ms.
+ s.set_speed(0)
# Capture screenshot
self.assertTrue(selenium_utilities.TakeScreenShot(s, self.browser,