Author: jmorliaguet
Date: Sun Feb 26 16:14:53 2006
New Revision: 2480
Modified:
cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_test.html
Log:
- fixed test syntax
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:14:53 2006
@@ -232,8 +232,9 @@
return $(element).style.display != 'none';
}
- function handler() {
- }
+ var handler = function() {}
+
+ var inspect = Test.Unit.inspect;
new Test.Unit.Runner({
@@ -242,82 +243,79 @@
/* CPSSkins */
testGetModelById: function() { with(this) {
- assertEqual(CPSSkins.getModelById("m1").def.id, "m1");
- assertEqual(CPSSkins.getModelById("m2").def.id, "m2");
- assertEqual(CPSSkins.getModelById("m3").def.id, "m3");
- assertEqual(CPSSkins.getModelById("m4"), null);
+ assertEqual("m1", CPSSkins.getModelById("m1").def.id);
+ assertEqual("m2", CPSSkins.getModelById("m2").def.id);
+ assertEqual("m3", CPSSkins.getModelById("m3").def.id);
+ assertEqual(null, CPSSkins.getModelById("m4"), null);
}},
testGetControllerById: function() { with(this) {
- assertEqual(CPSSkins.getControllerById("c1").def.id, "c1");
- assertEqual(CPSSkins.getControllerById("c2"), null);
+ assertEqual("c1", CPSSkins.getControllerById("c1").def.id);
+ assertEqual(null, CPSSkins.getControllerById("c2"));
}},
testAddActions: function() { with(this) {
- assertEqual($H(CPSSkins._handlers).inspect(),
- $H({}).inspect())
+ assertEqual(inspect({}), inspect(CPSSkins._handlers))
CPSSkins.addActions({'handler': handler});
- assertEqual($H(CPSSkins._handlers).inspect(),
- $H({'handler': handler}).inspect())
+ assertEqual(inspect({'handler': handler}), inspect(CPSSkins._handlers))
}},
/* Identifiable */
testIsIdentifiable: function() { with(this) {
- assertEqual(CPSSkins.Identifiable.isIdentifiable(e1), true);
- assertEqual(CPSSkins.Identifiable.isIdentifiable(e1.parentNode), false);
+ assertEqual(true, CPSSkins.Identifiable.isIdentifiable(e1));
+ assertEqual(false, CPSSkins.Identifiable.isIdentifiable(e1.parentNode));
}},
testGetOrder: function() { with(this) {
- assertEqual(CPSSkins.Identifiable.getOrder(e1), 0);
- assertEqual(CPSSkins.Identifiable.getOrder(e2), 0);
- assertEqual(CPSSkins.Identifiable.getOrder(e3), 1);
- assertEqual(CPSSkins.Identifiable.getOrder(e4), 2);
- assertEqual(CPSSkins.Identifiable.getOrder(e5), 0);
- assertEqual(CPSSkins.Identifiable.getOrder(e6), 1);
+ assertEqual(0, CPSSkins.Identifiable.getOrder(e1));
+ assertEqual(0, CPSSkins.Identifiable.getOrder(e2));
+ assertEqual(1, CPSSkins.Identifiable.getOrder(e3));
+ assertEqual(2, CPSSkins.Identifiable.getOrder(e4));
+ assertEqual(0, CPSSkins.Identifiable.getOrder(e5));
+ assertEqual(1, CPSSkins.Identifiable.getOrder(e6));
}},
testGetNext: function() { with(this) {
- assertEqual(CPSSkins.Identifiable.getNext(e1), e6);
- assertEqual(CPSSkins.Identifiable.getNext(e2), e3);
- assertEqual(CPSSkins.Identifiable.getNext(e3), e4);
- assertEqual(CPSSkins.Identifiable.getNext(e4), null);
- assertEqual(CPSSkins.Identifiable.getNext(e5), null);
- assertEqual(CPSSkins.Identifiable.getNext(e6), null);
+ assertEqual(e6, CPSSkins.Identifiable.getNext(e1));
+ assertEqual(e3, CPSSkins.Identifiable.getNext(e2));
+ assertEqual(e4, CPSSkins.Identifiable.getNext(e3));
+ assertEqual(null, CPSSkins.Identifiable.getNext(e4));
+ assertEqual(null, CPSSkins.Identifiable.getNext(e5));
+ assertEqual(null, CPSSkins.Identifiable.getNext(e6));
}},
testGetPrevious: function() { with(this) {
- assertEqual(CPSSkins.Identifiable.getPrevious(e6), e1);
- assertEqual(CPSSkins.Identifiable.getPrevious(e3), e2);
- assertEqual(CPSSkins.Identifiable.getPrevious(e4), e3);
- assertEqual(CPSSkins.Identifiable.getPrevious(e5), null);
- assertEqual(CPSSkins.Identifiable.getPrevious(e2), null);
- assertEqual(CPSSkins.Identifiable.getPrevious(e1), null);
+ assertEqual(e1, CPSSkins.Identifiable.getPrevious(e6));
+ assertEqual(e2, CPSSkins.Identifiable.getPrevious(e3));
+ assertEqual(e3, CPSSkins.Identifiable.getPrevious(e4));
+ assertEqual(null, CPSSkins.Identifiable.getPrevious(e5));
+ assertEqual(null, CPSSkins.Identifiable.getPrevious(e2));
+ assertEqual(null, CPSSkins.Identifiable.getPrevious(e1));
}},
testGetParent: function() { with(this) {
- assertEqual(CPSSkins.Identifiable.getParent(e1), e0);
- assertEqual(CPSSkins.Identifiable.getParent(e2), e0);
- assertEqual(CPSSkins.Identifiable.getParent(e3), e0);
- assertEqual(CPSSkins.Identifiable.getParent(e4), e0);
- assertEqual(CPSSkins.Identifiable.getParent(e5), e4);
- assertEqual(CPSSkins.Identifiable.getParent(e6), e0);
+ assertEqual(e0, CPSSkins.Identifiable.getParent(e1));
+ assertEqual(e0, CPSSkins.Identifiable.getParent(e2));
+ assertEqual(e0, CPSSkins.Identifiable.getParent(e3));
+ assertEqual(e0, CPSSkins.Identifiable.getParent(e4));
+ assertEqual(e4, CPSSkins.Identifiable.getParent(e5));
+ assertEqual(e0, CPSSkins.Identifiable.getParent(e6));
}},
testGetIdentifiable: function() { with(this) {
- assertEqual(CPSSkins.Identifiable.getIdentifiable(e1), e1);
- assertEqual(CPSSkins.Identifiable.getIdentifiable(e2), e2);
- assertEqual(CPSSkins.Identifiable.getIdentifiable(e1.parentNode),
- e0);
+ assertEqual(e1, CPSSkins.Identifiable.getIdentifiable(e1));
+ assertEqual(e2, CPSSkins.Identifiable.getIdentifiable(e2));
+ assertEqual(e0, CPSSkins.Identifiable.getIdentifiable(e1.parentNode));
}},
testIsEmpty: function() { with(this) {
- assertEqual(CPSSkins.Identifiable.isEmpty(e0), false);
- assertEqual(CPSSkins.Identifiable.isEmpty(e1), true);
- assertEqual(CPSSkins.Identifiable.isEmpty(e2), true);
- assertEqual(CPSSkins.Identifiable.isEmpty(e3), true);
- assertEqual(CPSSkins.Identifiable.isEmpty(e4), false);
- assertEqual(CPSSkins.Identifiable.isEmpty(e5), true);
- assertEqual(CPSSkins.Identifiable.isEmpty(e6), true);
+ assertEqual(false, CPSSkins.Identifiable.isEmpty(e0));
+ assertEqual(true, CPSSkins.Identifiable.isEmpty(e1));
+ assertEqual(true, CPSSkins.Identifiable.isEmpty(e2));
+ assertEqual(true, CPSSkins.Identifiable.isEmpty(e3));
+ assertEqual(false, CPSSkins.Identifiable.isEmpty(e4));
+ assertEqual(true, CPSSkins.Identifiable.isEmpty(e5));
+ assertEqual(true, CPSSkins.Identifiable.isEmpty(e6));
}},
/* CPSSkins.Canvas */
@@ -326,7 +324,7 @@
var n1 = CPSSkins.Canvas.createNode({
tag: "div"
});
- assertEqual(n1.tagName.toLowerCase(), "div");
+ assertEqual("div", n1.tagName.toLowerCase());
var n2 = CPSSkins.Canvas.createNode({
tag: "a",
@@ -334,99 +332,94 @@
"href": "http://someurl.html/";
}
});
- assertEqual(n2.tagName.toLowerCase(), "a");
- assertEqual(n2.getAttribute("href"), "http://someurl.html/";);
+ assertEqual("a", n2.tagName.toLowerCase());
+ assertEqual("http://someurl.html/";, n2.getAttribute("href"));
var n3 = CPSSkins.Canvas.createNode({
tag: "span",
classes: "cssClass",
style: {position: "absolute", display: "none"}
});
- assertEqual(n3.tagName.toLowerCase(), "span");
- assertEqual(n3.style.position, "absolute");
- assertEqual(n3.style.display, "none");
+ assertEqual("span", n3.tagName.toLowerCase());
+ assertEqual("absolute", n3.style.position);
+ assertEqual("none", n3.style.display);
assert(Element.hasClassName(n3, "cssClass"));
var n4 = CPSSkins.Canvas.createNode({
tag: "p",
text: "Some text"
});
- assertEqual(n4.innerHTML, "Some text");
+ assertEqual("Some text", n4.innerHTML);
}},
testGetModelNode: function() { with(this) {
- assertEqual(CPSSkins.Canvas._getModelNode(e0), null);
- assertEqual(CPSSkins.Canvas._getModelNode(e1), null);
- assertNotEqual(CPSSkins.Canvas._getModelNode(e2), null);
- assertEqual(CPSSkins.Canvas._getModelNode(e3), null);
- assertEqual(CPSSkins.Canvas._getModelNode(e4), null);
- assertEqual(CPSSkins.Canvas._getModelNode(e5), null);
- assertNotEqual(CPSSkins.Canvas._getModelNode(e6), null);
+ assertEqual(null, CPSSkins.Canvas._getModelNode(e0));
+ assertEqual(null, CPSSkins.Canvas._getModelNode(e1));
+ assertNotEqual(null, CPSSkins.Canvas._getModelNode(e2));
+ assertEqual(null, CPSSkins.Canvas._getModelNode(e3));
+ assertEqual(null, CPSSkins.Canvas._getModelNode(e4));
+ assertEqual(null, CPSSkins.Canvas._getModelNode(e5));
+ assertNotEqual(null, CPSSkins.Canvas._getModelNode(e6));
}},
testGetModel: function() { with(this) {
- assertEqual(CPSSkins.Canvas.getModel(e0), null);
- assertEqual(CPSSkins.Canvas.getModel(e1), null);
- assertNotEqual(CPSSkins.Canvas.getModel(e2), null);
- assertEqual(CPSSkins.Canvas.getModel(e3), null);
- assertEqual(CPSSkins.Canvas.getModel(e4), null);
- assertEqual(CPSSkins.Canvas.getModel(e5), null);
- assertNotEqual(CPSSkins.Canvas.getModel(e6), null);
+ assertEqual(null, CPSSkins.Canvas.getModel(e0));
+ assertEqual(null, CPSSkins.Canvas.getModel(e1));
+ assertNotEqual(null, CPSSkins.Canvas.getModel(e2));
+ assertEqual(null, CPSSkins.Canvas.getModel(e3));
+ assertEqual(null, CPSSkins.Canvas.getModel(e4));
+ assertEqual(null, CPSSkins.Canvas.getModel(e5));
+ assertNotEqual(null, CPSSkins.Canvas.getModel(e6));
}},
testGetData: function() { with(this) {
var model_e2 = CPSSkins.Canvas.getModel(e2);
var model_e6 = CPSSkins.Canvas.getModel(e6);
- assertEqual($H(model_e2.getData()).inspect(),
- $H({a:"1", b:"2", c: true}).inspect());
+ assertEqual(inspect({a:"1", b:"2", c: true}),
+ inspect(model_e2.getData()));
- assertEqual($H(model_e6.getData()).inspect(),
- $H({"a":["1","2","3"],"b":{"c":1,"d":2},"c":[[1],[2],[3]]}).inspect());
+ assertEqual(
+ inspect({"a":["1","2","3"],"b":{"c":1,"d":2},"c":[[1],[2],[3]]}),
+ inspect(model_e6.getData()));
}},
testSetData: function() { with(this) {
var model_e2 = CPSSkins.Canvas.getModel(e2);
- assertEqual($H(model_e2.schema).inspect(),
- $H({'a': 'string', 'b': 'string', 'c':
'boolean'}).inspect());
+ assertEqual(inspect({'a': 'string', 'b': 'string', 'c': 'boolean'}),
+ inspect(model_e2.schema));
// setData cannot set undefined fields
model_e2.setData({"a": "2", "new1": true});
- assertEqual($H(model_e2.getData()).inspect(),
- $H({"a": "2"}).inspect());
+ assertEqual(inspect({"a": "2"}), inspect(model_e2.getData()));
// setData cannot change field types
model_e2.setData({"a": 5});
- assertEqual($H(model_e2.getData()).inspect(),
- $H({}).inspect());
+ assertEqual(inspect({}), inspect(model_e2.getData()));
model_e2.setData({"c": false});
- assertEqual($H(model_e2.getData()).inspect(),
- $H({"c": false}).inspect());
+ assertEqual(inspect({"c": false}), inspect(model_e2.getData()));
model_e2.setData({"a": "3", "b": true});
- assertEqual($H(model_e2.getData()).inspect(),
- $H({"a": "3"}).inspect());
+ assertEqual(inspect({"a": "3"}), inspect(model_e2.getData()));
}},
testUpdateData: function() { with(this) {
var model_e2 = CPSSkins.Canvas.getModel(e2);
model_e2.setData({"a": "1", "b": "2", "c": true});
- assertEqual($H(model_e2.getData()).inspect(),
- $H({"a": "1", "b": "2", "c": true}).inspect());
+ assertEqual(inspect({"a": "1", "b": "2", "c": true}),
+ inspect(model_e2.getData()));
model_e2.updateData({"a": "2", "b": 4, "c":true, "d": 1});
- assertEqual($H(model_e2.getData()).inspect(),
- $H({"a": "2", "c":true}).inspect());
+ assertEqual(inspect({"a": "2", "c":true}), inspect(model_e2.getData()));
}},
testUnifiedStoragesGetData: function() { with(this) {
var model_c1 = CPSSkins.getModelById('c1');
- assertEqual($H(model_c1.getData()).inspect(),
- $H({"a": 1,"b": 2}).inspect());
+ assertEqual(inspect({"a": 1,"b": 2}), inspect(model_c1.getData()));
}},
testUnifiedStoragesSetData: function() { with(this) {
@@ -434,40 +427,31 @@
var model_m2 = CPSSkins.getModelById('m2');
var model_c1 = CPSSkins.getModelById('c1');
- assertEqual($H(model_c1.getData()).inspect(),
- $H({"a": 1, "b": 2}).inspect());
+ assertEqual(inspect({"a": 1, "b": 2}), inspect(model_c1.getData()));
- assertEqual($H(model_c1.schema).inspect(),
- $H({'a': 'number', 'b': 'number'}).inspect());
+ assertEqual(inspect({'a': 'number', 'b': 'number'}),
+ inspect(model_c1.schema));
- assertEqual($H(model_m1.schema).inspect(),
- $H({'a': 'number'}).inspect());
+ assertEqual(inspect({'a': 'number'}), inspect(model_m1.schema));
- assertEqual($H(model_m2.schema).inspect(),
- $H({'b': 'number'}).inspect());
+ assertEqual(inspect({'b': 'number'}), inspect(model_m2.schema));
model_c1.setData({"a": 3, "b": 1});
- assertEqual($H(model_c1.getData()).inspect(),
- $H({"a": 3, "b": 1}).inspect());
- assertEqual($H(model_m1.getData()).inspect(),
- $H({"a": 3}).inspect());
- assertEqual($H(model_m2.getData()).inspect(),
- $H({"b": 1}).inspect());
+ assertEqual(inspect({"a": 3, "b": 1}), inspect(model_c1.getData()));
+ assertEqual(inspect({"a": 3}), inspect(model_m1.getData()));
+ assertEqual(inspect({"b": 1}), inspect(model_m2.getData()));
model_c1.setData({"a": 4});
- assertEqual($H(model_c1.getData()).inspect(),
- $H({"a": 4, "b": 1}).inspect());
- assertEqual($H(model_m1.getData()).inspect(),
- $H({"a": 4}).inspect());
- assertEqual($H(model_m2.getData()).inspect(),
- $H({}).inspect());
+ assertEqual(inspect({"a": 4, "b": 1}), inspect(model_c1.getData()));
+ assertEqual(inspect({"a": 4}), inspect(model_m1.getData()));
+ assertEqual(inspect({}), inspect(model_m2.getData()));
}},
/* Events */
testSubscribe: function() { with(this) {
- var info;
+ var info = {};
var handler1 = function(event) {
info = {'subscriber': event.subscriber.id,
'publisher': event.publisher.id};
@@ -480,28 +464,27 @@
CPSSkins.registerEventHandler('event1', obj1, handler1);
CPSSkins.subscribe('event1', {'subscriber': obj1, 'publisher':
context1});
- assertEqual($H(info).inspect(), $H({}).inspect());
+ assertEqual(inspect({}), inspect(info));
- var info = null;
+ var info = {};
CPSSkins.notify('event2', {'publisher': context1});
- assertEqual($H(info).inspect(), $H({}).inspect());
+ assertEqual(inspect({}), inspect(info));
- var info = null;
+ var info = {};
CPSSkins.notify('event1', {'publisher': context1});
- assertEqual($H(info).inspect(),
- $H({'subscriber': 'object1',
- 'publisher': 'context1'}).inspect());
+ assertEqual(inspect({'subscriber': 'object1', 'publisher': 'context1'}),
+ inspect(info));
- var info = null;
+ var info = {};
CPSSkins.notify('event1', {'publisher': context2});
- assertEqual($H(info).inspect(), $H({}).inspect());
+ assertEqual(inspect({}), inspect(info));
CPSSkins.unsubscribe('event1', {'subscriber': obj1,
'publisher': context1});
- var info = null;
+ var info = {};
CPSSkins.notify('event1', {'publisher': context1});
- assertEqual($H(info).inspect(), $H({}).inspect());
+ assertEqual(inspect({}), inspect(info));
}},
@@ -589,46 +572,46 @@
/* Navigating in the perspective path */
// Moving up one level
- assertEqual(CPSSkins.CurrentPerspective, "2/3/1");
+ assertEqual("2/3/1", CPSSkins._current_perspective);
CPSSkins.switchPerspective("..");
- assertEqual(CPSSkins.CurrentPerspective, "2/3");
+ assertEqual("2/3", CPSSkins._current_perspective);
CPSSkins.switchPerspective("..");
- assertEqual(CPSSkins.CurrentPerspective, "2");
+ assertEqual("2", CPSSkins._current_perspective);
CPSSkins.switchPerspective("..");
- assertEqual(CPSSkins.CurrentPerspective, "");
+ assertEqual("", CPSSkins._current_perspective);
// Moving down
CPSSkins.switchPerspective("./2");
- assertEqual(CPSSkins.CurrentPerspective, "2");
+ assertEqual("2", CPSSkins._current_perspective);
CPSSkins.switchPerspective("./1");
- assertEqual(CPSSkins.CurrentPerspective, "2/1");
+ assertEqual("2/1", CPSSkins._current_perspective);
CPSSkins.switchPerspective("./3");
- assertEqual(CPSSkins.CurrentPerspective, "2/1/3");
+ assertEqual("2/1/3", CPSSkins._current_perspective);
CPSSkins.switchPerspective("./4/5");
- assertEqual(CPSSkins.CurrentPerspective, "2/1/3/4/5");
+ assertEqual("2/1/3/4/5", CPSSkins._current_perspective);
// Moving up then down
CPSSkins.switchPerspective("../6");
- assertEqual(CPSSkins.CurrentPerspective, "2/1/3/4/6");
+ assertEqual("2/1/3/4/6", CPSSkins._current_perspective);
CPSSkins.switchPerspective("../7/8");
- assertEqual(CPSSkins.CurrentPerspective, "2/1/3/4/7/8");
+ assertEqual("2/1/3/4/7/8", CPSSkins._current_perspective);
CPSSkins.switchPerspective("../../9");
- assertEqual(CPSSkins.CurrentPerspective, "2/1/3/4/9");
+ assertEqual("2/1/3/4/9", CPSSkins._current_perspective);
// Going back the previous perspective in history
CPSSkins.switchPerspective("-");
- assertEqual(CPSSkins.CurrentPerspective, "2/1/3/4/7/8");
+ assertEqual("2/1/3/4/7/8", CPSSkins._current_perspective);
CPSSkins.switchPerspective("-");
- assertEqual(CPSSkins.CurrentPerspective, "2/1/3/4/9");
+ assertEqual("2/1/3/4/9", CPSSkins._current_perspective);
}}
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
