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"));
+ assert(isVisible("p2_3"));
+ assert(isVisible("p2_3_1"));
+ assert(!isVisible("p1"));
+ assert(!isVisible("p1_2"));
+ assert(!isVisible("p3"));
+ assert(!isVisible("p4"));
/* Navigating in the perspective path */
// Moving up one level
- assertEqual("2/3/1", CPSSkins._current_perspective);
+ assertEqual("2/3/1", CPSSkins._currentPerspective);
CPSSkins.switchPerspective("..");
- assertEqual("2/3", CPSSkins._current_perspective);
+ assertEqual("2/3", CPSSkins._currentPerspective);
CPSSkins.switchPerspective("..");
- assertEqual("2", CPSSkins._current_perspective);
+ assertEqual("2", CPSSkins._currentPerspective);
CPSSkins.switchPerspective("..");
- assertEqual("", CPSSkins._current_perspective);
+ assertEqual("", CPSSkins._currentPerspective);
// Moving down
CPSSkins.switchPerspective("./2");
- assertEqual("2", CPSSkins._current_perspective);
+ assertEqual("2", CPSSkins._currentPerspective);
CPSSkins.switchPerspective("./1");
- assertEqual("2/1", CPSSkins._current_perspective);
+ assertEqual("2/1", CPSSkins._currentPerspective);
CPSSkins.switchPerspective("./3");
- assertEqual("2/1/3", CPSSkins._current_perspective);
+ assertEqual("2/1/3", CPSSkins._currentPerspective);
CPSSkins.switchPerspective("./4/5");
- assertEqual("2/1/3/4/5", CPSSkins._current_perspective);
+ assertEqual("2/1/3/4/5", CPSSkins._currentPerspective);
// Moving up then down
CPSSkins.switchPerspective("../6");
- assertEqual("2/1/3/4/6", CPSSkins._current_perspective);
+ assertEqual("2/1/3/4/6", CPSSkins._currentPerspective);
CPSSkins.switchPerspective("../7/8");
- assertEqual("2/1/3/4/7/8", CPSSkins._current_perspective);
+ assertEqual("2/1/3/4/7/8", CPSSkins._currentPerspective);
CPSSkins.switchPerspective("../../9");
- assertEqual("2/1/3/4/9", CPSSkins._current_perspective);
+ assertEqual("2/1/3/4/9", CPSSkins._currentPerspective);
// Going back the previous perspective in history
CPSSkins.switchPerspective("-");
- assertEqual("2/1/3/4/7/8", CPSSkins._current_perspective);
+ assertEqual("2/1/3/4/7/8", CPSSkins._currentPerspective);
CPSSkins.switchPerspective("-");
- assertEqual("2/1/3/4/9", CPSSkins._current_perspective);
+ assertEqual("2/1/3/4/9", CPSSkins._currentPerspective);
}}
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
