[Checkins] SVN: zc.testbrowser/trunk/src/zc/testbrowser/real. Call
more functions to from JSFunctionProxy. This will be enaugh
for now, IMHO.
Justas SadzeviÃÂius
justas at pov.lt
Thu Sep 27 12:24:25 EDT 2007
Log message for revision 80242:
Call more functions to from JSFunctionProxy. This will be enaugh for now, IMHO.
Changed:
U zc.testbrowser/trunk/src/zc/testbrowser/real.js
U zc.testbrowser/trunk/src/zc/testbrowser/real.py
-=-
Modified: zc.testbrowser/trunk/src/zc/testbrowser/real.js
===================================================================
--- zc.testbrowser/trunk/src/zc/testbrowser/real.js 2007-09-27 16:09:37 UTC (rev 80241)
+++ zc.testbrowser/trunk/src/zc/testbrowser/real.js 2007-09-27 16:24:24 UTC (rev 80242)
@@ -559,6 +559,6 @@
tb_tokens[tb_next_token] = elements[c];
tokens.push(tb_next_token++);
}
- return tokens.toSource();
+ return tokens;
}
Modified: zc.testbrowser/trunk/src/zc/testbrowser/real.py
===================================================================
--- zc.testbrowser/trunk/src/zc/testbrowser/real.py 2007-09-27 16:09:37 UTC (rev 80241)
+++ zc.testbrowser/trunk/src/zc/testbrowser/real.py 2007-09-27 16:24:24 UTC (rev 80242)
@@ -353,7 +353,7 @@
@property
def text(self):
- return self.browser.execute('tb_get_link_text(%s)' % self.token)
+ return str(self.browser.js.tb_get_link_text(self.token))
def __repr__(self):
return "<%s text=%r url=%r>" % (
@@ -469,9 +469,7 @@
@property
def multiple(self):
- multiple = self.browser.execute('tb_is_listcontrol_multiple(%s)' % (
- self.token))
- return simplejson.loads(multiple)
+ return self.browser.js.tb_is_listcontrol_multiple(self.token)
@apply
def displayValue():
@@ -490,8 +488,7 @@
@property
def acts_as_single(self):
- return simplejson.loads(self.browser.execute(
- 'tb_act_as_single(%s)' % (self.token)))
+ return self.browser.js.tb_act_as_single(self.token)
@apply
def value():
@@ -507,9 +504,7 @@
if self.acts_as_single:
# expects a single value
- self.browser.execute('tb_set_checked(%s, %s)' %
- (self.token, simplejson.dumps(bool(value))))
- #raise NotImplementedError
+ self.browser.js.tb_set_checked(self.token, bool(value))
else:
# expects a list of control ids
self.browser.js.tb_set_listcontrol_value(self.token, value)
@@ -530,10 +525,9 @@
if self._browser_counter != self.browser._counter:
raise zc.testbrowser.interfaces.ExpiredError
res = []
- tokens = self.browser.execute(
- 'tb_get_listcontrol_item_tokens(%r)' % self.token)
+ tokens = self.browser.js.tb_get_listcontrol_item_tokens(self.token)
return [ItemControl(token, self.browser)
- for token in simplejson.loads(tokens)]
+ for token in tokens]
def getControl(self, label=None, value=None, index=None):
if self._browser_counter != self.browser._counter:
@@ -549,7 +543,7 @@
def click(self):
if self._browser_counter != self.browser._counter:
raise zc.testbrowser.interfaces.ExpiredError
- self.browser.execute('tb_click_token(%s)' % self.token)
+ self.browser.js.tb_click_token(self.token)
self.browser._changed()
@@ -559,10 +553,7 @@
def click(self, coord=(1,1)):
if self._browser_counter != self.browser._counter:
raise zc.testbrowser.interfaces.ExpiredError
- self.browser.execute('tb_click_token(%s, %s, %s)' % (
- self.token,
- simplejson.dumps(coord[0]),
- simplejson.dumps(coord[1])))
+ self.browser.js.tb_click_token(self.token, *coord)
self.browser._changed()
@property
@@ -603,15 +594,12 @@
def selected():
def fget(self):
- return simplejson.loads(self.browser.execute(
- 'tb_get_checked(%s)' % self.token))
- return False
+ return self.browser.js.tb_get_checked(self.token)
def fset(self, value):
if self._browser_counter != self.browser._counter:
raise zc.testbrowser.interfaces.ExpiredError
- self.browser.execute('tb_set_checked(%s, %s)' %
- (self.token, simplejson.dumps(bool(value))))
+ self.browser.js.tb_set_checked(self.token, bool(value))
return property(fget, fset)
@@ -701,11 +689,7 @@
else:
button = self.browser.getControlToken(
label, name, index, self.token)
- self.browser.execute('tb_click_token(%s, %s, %s)' % (
- button,
- simplejson.dumps(coord[0]),
- simplejson.dumps(coord[1])))
-
+ self.browser.js.tb_click_token(button, *coord)
self.browser.stop_timer()
self.browser._changed()
More information about the Checkins
mailing list