Author: jmorliaguet Date: Mon Feb 27 21:13:17 2006 New Revision: 2497 Modified: cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_test.html Log:
- test updates (not full working yet) 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 Mon Feb 27 21:13:17 2006 @@ -26,7 +26,14 @@ <div id="testlog"> </div> <ins class="controller"> -{"id": "c1" +{"id": "c1", + "type": "perspective selector" +} +</ins> + +<ins class="controller"> +{"id": "c2", + "type": "perspective selector" } </ins> @@ -121,7 +128,8 @@ "type": "panel" }, "model": "p1", - "perspectives": ["1"] + "perspectives": ["1"], + "controllers": ["c1"] } </ins> @@ -130,7 +138,8 @@ "type": "panel" }, "model": "p2", - "perspectives": ["1", "2"] + "perspectives": ["1", "2"], + "controllers": ["c1"] } </ins> @@ -139,7 +148,8 @@ "type": "panel" }, "model": "p3", - "perspectives": ["3"] + "perspectives": ["3"], + "controllers": ["c1"] } </ins> @@ -148,7 +158,8 @@ "type": "panel" }, "model": "p1_2", - "perspectives": ["1/2"] + "perspectives": ["1"], + "controllers": ["c2"] } </ins> @@ -157,7 +168,8 @@ "type": "panel" }, "model": "p2_3", - "perspectives": ["2/3"] + "perspectives": ["2"], + "controllers": ["c2"] } </ins> @@ -166,7 +178,8 @@ "type": "panel" }, "model": "p2_3_1", - "perspectives": ["2/3/1"] + "perspectives": ["3"], + "controllers": ["c1", "c2"] } </ins> @@ -231,7 +244,8 @@ testGetControllerById: function() { with(this) { assertEqual("c1", CPSSkins.getControllerById("c1").def.id); - assertEqual(null, CPSSkins.getControllerById("c2")); + assertEqual("c2", CPSSkins.getControllerById("c2").def.id); + assertEqual(null, CPSSkins.getControllerById("c3")); }}, testAddActions: function() { with(this) { @@ -480,7 +494,7 @@ assert(!isVisible("p3")); assert(!isVisible("p4")); - CPSSkins.switchPerspective("1"); + CPSSkins.getControllerById("c1").switchTo("1"); assert(isVisible("p1")); assert(isVisible("p2")); assert(!isVisible("p1_2")); @@ -489,7 +503,7 @@ assert(!isVisible("p3")); assert(!isVisible("p4")); - CPSSkins.switchPerspective("2"); + CPSSkins.getControllerById("c1").switchTo("2"); assert(isVisible("p2")); assert(!isVisible("p1")); assert(!isVisible("p1_2")); @@ -498,7 +512,7 @@ assert(!isVisible("p3")); assert(!isVisible("p4")); - CPSSkins.switchPerspective("3"); + CPSSkins.getControllerById("c1").switchTo("3"); assert(isVisible("p3")); assert(!isVisible("p1")); assert(!isVisible("p1_2")); @@ -507,7 +521,7 @@ assert(!isVisible("p2")); assert(!isVisible("p4")); - CPSSkins.switchPerspective("4"); + CPSSkins.getControllerById("c1").switchTo("4"); assert(isVisible("p4")); assert(!isVisible("p1")); assert(!isVisible("p1_2")); @@ -516,16 +530,16 @@ assert(!isVisible("p2")); assert(!isVisible("p3")); - CPSSkins.switchPerspective("1/2"); + CPSSkins.getControllerById("c2").switchTo("1"); assert(isVisible("p1")); - assert(isVisible("p2")); // visible because p2 is visible in perspective 1 + 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/3"); + CPSSkins.getControllerById("c2").switchTo("2"); assert(isVisible("p2")); assert(isVisible("p2_3")); assert(!isVisible("p1")); @@ -534,7 +548,7 @@ assert(!isVisible("p3")); assert(!isVisible("p4")); - CPSSkins.switchPerspective("2/3/1"); + CPSSkins.getControllerById("c2").switchTo("3"); assert(isVisible("p2")); assert(isVisible("p2_3")); assert(isVisible("p2_3_1")); @@ -543,49 +557,6 @@ assert(!isVisible("p3")); assert(!isVisible("p4")); - /* Navigating in the perspective path */ - // Moving up one level - assertEqual("2/3/1", CPSSkins._currentPerspective); - - CPSSkins.switchPerspective(".."); - assertEqual("2/3", CPSSkins._currentPerspective); - - CPSSkins.switchPerspective(".."); - assertEqual("2", CPSSkins._currentPerspective); - - CPSSkins.switchPerspective(".."); - assertEqual("", CPSSkins._currentPerspective); - - // Moving down - CPSSkins.switchPerspective("./2"); - assertEqual("2", CPSSkins._currentPerspective); - - CPSSkins.switchPerspective("./1"); - assertEqual("2/1", CPSSkins._currentPerspective); - - CPSSkins.switchPerspective("./3"); - assertEqual("2/1/3", CPSSkins._currentPerspective); - - CPSSkins.switchPerspective("./4/5"); - assertEqual("2/1/3/4/5", CPSSkins._currentPerspective); - - // Moving up then down - CPSSkins.switchPerspective("../6"); - assertEqual("2/1/3/4/6", CPSSkins._currentPerspective); - - CPSSkins.switchPerspective("../7/8"); - assertEqual("2/1/3/4/7/8", CPSSkins._currentPerspective); - - CPSSkins.switchPerspective("../../9"); - 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._currentPerspective); - - CPSSkins.switchPerspective("-"); - assertEqual("2/1/3/4/9", CPSSkins._currentPerspective); - }} }); -- http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins