[Z3lab-checkins] r2477 - cpsskins/branches/jmo-perspectives/ui/framework/tests/unit
Author: jmorliaguet
Date: Sun Feb 26 13:41:47 2006
New Revision: 2477
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_ctal_test.html
Log:
- test optimization the document only needs to be parsed once.
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_ctal_test.html
==
---
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_ctal_test.html
(original)
+++
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_ctal_test.html
Sun Feb 26 13:41:47 2006
@@ -331,13 +331,14 @@
return text.toLowerCase();
}
+ try {
+ctal.process_ctal(document, data);
+ } catch (e) {
+ }
+
new Test.Unit.Runner({
setup: function() {
- try {
-ctal.process_ctal(document, data);
- } catch (e) {
- }
},
testDataStructure: function() { with(this) {
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
[Z3lab-checkins] r2478 - cpsskins/branches/jmo-perspectives/ui/framework
Author: jmorliaguet
Date: Sun Feb 26 14:37:35 2006
New Revision: 2478
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/ctal.js
Log:
- fix for IE and optimizations (tmpl.attributes is extremely costly under IE
since all node attributes even those that are not in the HTML are listed)
Modified: cpsskins/branches/jmo-perspectives/ui/framework/ctal.js
==
--- cpsskins/branches/jmo-perspectives/ui/framework/ctal.js (original)
+++ cpsskins/branches/jmo-perspectives/ui/framework/ctal.js Sun Feb 26
14:37:35 2006
@@ -182,26 +182,21 @@
ctal.process_ctal = function(tmpl, data) {
var recurse = true;
+ var parsers, ctal_attr, ctal_attr_name, attr;
if (tmpl.nodeType == 1) {
-var parsers = ctal.parsers;
+parsers = ctal.parsers;
for (ctal_attr in parsers) {
- var attrs = tmpl.attributes;
- for (i=0; iattrs.length; i++) {
-var attrnode = attrs[i];
-var attrname = attrnode.nodeName;
-if (attrname != ctal: + ctal_attr) {
- continue;
-}
-tmpl.removeAttribute(ctal: + ctal_attr);
+ ctal_attr_name = ctal: + ctal_attr;
+ attr = tmpl.getAttribute(ctal_attr_name);
+ if (attr != null) {
+tmpl.removeAttribute(ctal_attr_name);
// For Opera
tmpl.removeAttribute(ctal_attr);
-
var parser = parsers[ctal_attr];
if (!parser.recurse) {
recurse = false;
}
-parser.parse(tmpl, attrnode.value, data)
-break;
+parser.parse(tmpl, attr, data)
}
}
}
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
[Z3lab-checkins] r2479 - cpsskins/branches/jmo-perspectives/ui/framework/tests/unit
Author: jmorliaguet
Date: Sun Feb 26 15:11:20 2006
New Revision: 2479
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_ctal_test.html
Log:
- simpler test syntax
- we remove line breaks when testing HTML
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_ctal_test.html
==
---
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_ctal_test.html
(original)
+++
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_ctal_test.html
Sun Feb 26 15:11:20 2006
@@ -328,42 +328,40 @@
function htmlOf(node) {
var text = $(node).innerHTML;
-return text.toLowerCase();
+return text.toLowerCase().replace(/\r/g, '').replace(/\n/g,'');
}
try {
ctal.process_ctal(document, data);
- } catch (e) {
- }
+ } catch (e) {}
- new Test.Unit.Runner({
+ var inspect = Test.Unit.inspect;
-setup: function() {
-},
+ new Test.Unit.Runner({
testDataStructure: function() { with(this) {
assertEqual(1, data['a']);
assertEqual(2, data['b']);
assertEqual(3, data['c']['d']);
assertEqual(4, data['c']['e']);
- assertEqual($A([4, 5, 6]).inspect(), $A(data['f']).inspect());
- assertEqual($H({h: 7, i: 8, j: 9}).inspect(),
$H(data['g'][0]).inspect());
+ assertEqual(inspect([4, 5, 6]), inspect(data['f']));
+ assertEqual(inspect({h: 7, i: 8, j: 9}), inspect(data['g'][0]));
assertEqual(10, data['k']['l']['m']);
assertEqual(1, data['ctrue']);
assertEqual(0, data['cfalse']);
}},
testPrivateAPI: function() { with(this) {
- assertEqual($A(['style', '']).inspect(),
- $A(ctal.get_nameexpr('style')).inspect());
- assertEqual($A(['style', 'string:1']).inspect(),
- $A(ctal.get_nameexpr('style string:1')).inspect());
- assertEqual($A(['style', 'string:1']).inspect(),
- $A(ctal.get_nameexpr(' style string:1 ')).inspect());
- assertEqual($A(['style', 'a/b/c']).inspect(),
- $A(ctal.get_nameexpr(' style a/b/c')).inspect());
- assertEqual($A(['style', 'a/b/c; color a/b']).inspect(),
- $A(ctal.get_nameexpr('style a/b/c; color a/b')).inspect());
+ assertEqual(inspect(['style', '']),
+ inspect(ctal.get_nameexpr('style')));
+ assertEqual(inspect(['style', 'string:1']),
+ inspect(ctal.get_nameexpr('style string:1')));
+ assertEqual(inspect(['style', 'string:1']),
+ inspect(ctal.get_nameexpr(' style string:1 ')));
+ assertEqual(inspect(['style', 'a/b/c']),
+ inspect(ctal.get_nameexpr(' style a/b/c')));
+ assertEqual(inspect(['style', 'a/b/c; color a/b']),
+ inspect(ctal.get_nameexpr('style a/b/c; color a/b')));
}},
testTALContent: function() { with(this) {
@@ -422,8 +420,11 @@
}},
testTALAttributesTALContent: function() { with(this) {
- assertEqual('a alt=q href=http://r/;s/a', htmlOf(e15));
- assertEqual('a alt=q href=http://r/;s/a', htmlOf(e15b));
+ assert(htmlOf(e15) == 'a alt=q href=http://r/;s/a' ||
+ htmlOf(e15) == 'a href=http://r/; alt=qs/a');
+
+ assert(htmlOf(e15b) == 'a alt=q href=http://r/;s/a' ||
+ htmlOf(e15b) == 'a href=http://r/; alt=qs/a');
}},
testTALReplace: function() { with(this) {
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
[Z3lab-checkins] r2481 - cpsskins/branches/jmo-perspectives/ui/framework/tests/unit
Author: jmorliaguet
Date: Sun Feb 26 16:27:48 2006
New Revision: 2481
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_widgets_test.html
Log:
- test update
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_widgets_test.html
==
---
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_widgets_test.html
(original)
+++
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_widgets_test.html
Sun Feb 26 16:27:48 2006
@@ -29,6 +29,12 @@
div
+ ins class=controller
+ {id: show-hide-tooltip,
+ type: focus observer
+ }
+ /ins
+
ins class=model
{data: {
hint:Tooltip hint for e0
@@ -46,7 +52,9 @@
ins class=view
{widget: {
type: tooltip
- }}
+ },
+ controllers: [show-hide-tooltip]
+ }
/ins
/div
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
[Z3lab-checkins] r2482 - cpsskins/branches/jmo-perspectives/ui/framework/tests/unit
Author: jmorliaguet
Date: Sun Feb 26 16:41:20 2006
New Revision: 2482
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_test.html
Log:
- test fixes
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_test.html
==
---
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_test.html
(original)
+++
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_test.html
Sun Feb 26 16:41:20 2006
@@ -229,7 +229,9 @@
var e6 = $('e6');
function isVisible(element) {
-return $(element).style.display != 'none';
+var element = $(element);
+if (!element) { return false };
+return element.style.display != 'none';
}
var handler = function() {}
@@ -491,127 +493,120 @@
/* Perspectives */
testSwitchPerspectives: function() { with(this) {
- var p1 = $(p1).parentNode;
- var p1_2 = $(p1_2).parentNode;
- var p2_3 = $(p2_3).parentNode;
- var p2_3_1 = $(p2_3_1).parentNode;
- var p2 = $(p2).parentNode;
- var p3 = $(p3).parentNode;
- var p4 = $(p4).parentNode;
-
- assert(!isVisible(p1));
- assert(!isVisible(p1_2));
- assert(!isVisible(p2_3));
- assert(!isVisible(p2_3_1));
- assert(!isVisible(p2));
- assert(!isVisible(p3));
- assert(!isVisible(p4));
+
+ assert(!isVisible(p1));
+ assert(!isVisible(p1_2));
+ assert(!isVisible(p2_3));
+ assert(!isVisible(p2_3_1));
+ assert(!isVisible(p2));
+ assert(!isVisible(p3));
+ assert(!isVisible(p4));
CPSSkins.switchPerspective(1);
- assert(isVisible(p1));
- assert(isVisible(p2));
- assert(!isVisible(p1_2));
- assert(!isVisible(p2_3));
- assert(!isVisible(p2_3_1));
- assert(!isVisible(p3));
- assert(!isVisible(p4));
+ assert(isVisible(p1));
+ assert(isVisible(p2));
+ assert(!isVisible(p1_2));
+ assert(!isVisible(p2_3));
+ assert(!isVisible(p2_3_1));
+ assert(!isVisible(p3));
+ assert(!isVisible(p4));
CPSSkins.switchPerspective(2);
- assert(isVisible(p2));
- assert(!isVisible(p1));
- assert(!isVisible(p1_2));
- assert(!isVisible(p2_3));
- assert(!isVisible(p2_3_1));
- assert(!isVisible(p3));
- assert(!isVisible(p4));
+ assert(isVisible(p2));
+ assert(!isVisible(p1));
+ assert(!isVisible(p1_2));
+ assert(!isVisible(p2_3));
+ assert(!isVisible(p2_3_1));
+ assert(!isVisible(p3));
+ assert(!isVisible(p4));
CPSSkins.switchPerspective(3);
- assert(isVisible(p3));
- assert(!isVisible(p1));
- assert(!isVisible(p1_2));
- assert(!isVisible(p2_3));
- assert(!isVisible(p2_3_1));
- assert(!isVisible(p2));
- assert(!isVisible(p4));
+ assert(isVisible(p3));
+ assert(!isVisible(p1));
+ assert(!isVisible(p1_2));
+ assert(!isVisible(p2_3));
+ assert(!isVisible(p2_3_1));
+ assert(!isVisible(p2));
+ assert(!isVisible(p4));
CPSSkins.switchPerspective(4);
- assert(isVisible(p4));
- assert(!isVisible(p1));
- assert(!isVisible(p1_2));
- assert(!isVisible(p2_3));
- assert(!isVisible(p2_3_1));
- assert(!isVisible(p2));
- assert(!isVisible(p3));
+ assert(isVisible(p4));
+ assert(!isVisible(p1));
+ assert(!isVisible(p1_2));
+ assert(!isVisible(p2_3));
+ assert(!isVisible(p2_3_1));
+ assert(!isVisible(p2));
+ assert(!isVisible(p3));
CPSSkins.switchPerspective(1/2);
- assert(isVisible(p1));
- assert(isVisible(p2)); // visible because p2 is visible in perspective 1
- assert(isVisible(p1_2));
- assert(!isVisible(p2_3));
- assert(!isVisible(p2_3_1));
- assert(!isVisible(p3));
- assert(!isVisible(p4));
+ assert(isVisible(p1));
+ assert(isVisible(p2)); // visible because p2 is visible in perspective
1
+ assert(isVisible(p1_2));
+ assert(!isVisible(p2_3));
+ assert(!isVisible(p2_3_1));
+ assert(!isVisible(p3));
+ assert(!isVisible(p4));
CPSSkins.switchPerspective(2/3);
- assert(isVisible(p2));
- assert(isVisible(p2_3));
- assert(!isVisible(p1));
- assert(!isVisible(p1_2));
- assert(!isVisible(p2_3_1));
- assert(!isVisible(p3));
- assert(!isVisible(p4));
+ assert(isVisible(p2));
+ assert(isVisible(p2_3));
+ assert(!isVisible(p1));
+ assert(!isVisible(p1_2));
+ assert(!isVisible(p2_3_1));
+ assert(!isVisible(p3));
+ assert(!isVisible(p4));
CPSSkins.switchPerspective(2/3/1);
- assert(isVisible(p2));
- assert(isVisible(p2_3));
- assert(isVisible(p2_3_1));
- assert(!isVisible(p1));
- assert(!isVisible(p1_2));
- assert(!isVisible(p3));
- assert(!isVisible(p4));
+ assert(isVisible(p2));
+
