Author: jmorliaguet Date: Sat Feb 4 12:22:54 2006 New Revision: 2282 Modified: cpsskins/branches/jmo-perspectives/ui/framework/tests/unit/cpsskins_test.html Log:
- test updates 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 Sat Feb 4 12:22:54 2006 @@ -40,7 +40,7 @@ <ins class="model"> {"id": "m1", "data": { - "a":"1","b":"2" + "a":"1","b":"2","c":true }} </ins> @@ -147,7 +147,7 @@ <ins class="model"> {"id": "c1", - "data": {}, + "data": {"a": 0, "b": 0}, "storage": { "type": "compound", "partitions": ["m1", "m2"] @@ -319,7 +319,7 @@ var model_e6 = Canvas.getModel(e6); assertEqual($H(model_e2.getData()).inspect(), - $H({a:"1", b:"2"}).inspect()); + $H({a:"1", b:"2", c: true}).inspect()); assertEqual($H(model_e6.getData()).inspect(), $H({"a":["1","2","3"],"b":{"c":1,"d":2},"c":[[1],[2],[3]]}).inspect()); @@ -328,31 +328,45 @@ testSetData: function() { with(this) { var model_e2 = Canvas.getModel(e2); - model_e2.setData({"new1":true}); + assertEqual($H(model_e2.schema).inspect(), + $H({'a': 'string', 'b': 'string', 'c': 'boolean'}).inspect()); + + // setData cannot set undefined fields + model_e2.setData({"a": "2", "new1": true}); + assertEqual($H(model_e2.getData()).inspect(), + $H({"a": "2"}).inspect()); + + // setData cannot change field types + model_e2.setData({"a": 5}); assertEqual($H(model_e2.getData()).inspect(), - $H({"new1":true}).inspect()); + $H({}).inspect()); - model_e2.setData({"new2":true}); + model_e2.setData({"c": false}); assertEqual($H(model_e2.getData()).inspect(), - $H({"new2":true}).inspect()); + $H({"c": false}).inspect()); + + model_e2.setData({"a": "3", "b": true}); + assertEqual($H(model_e2.getData()).inspect(), + $H({"a": "3"}).inspect()); }}, testUpdateData: function() { with(this) { var model_e2 = Canvas.getModel(e2); - model_e2.setData({"new1":true}); + model_e2.setData({"a": "1", "b": "2", "c": true}); assertEqual($H(model_e2.getData()).inspect(), - $H({"new1":true}).inspect()); + $H({"a": "1", "b": "2", "c": true}).inspect()); - model_e2.updateData({"new2":true}); + model_e2.updateData({"a": "2", "b": 4, "c":true, "d": 1}); assertEqual($H(model_e2.getData()).inspect(), - $H({"new2":true,"new1":true}).inspect()); + $H({"a": "2", "c":true}).inspect()); }}, testCompoundStoragesGetData: function() { with(this) { var model_c1 = CPSSkins.getModelById('c1'); + assertEqual($H(model_c1.getData()).inspect(), - $H({"a":1,"b":2}).inspect()); + $H({"a": 1,"b": 2}).inspect()); }}, testCompoundStoragesSetData: function() { with(this) { @@ -360,21 +374,33 @@ var model_m2 = CPSSkins.getModelById('m2'); var model_c1 = CPSSkins.getModelById('c1'); - model_c1.setData({"a": 3}); assertEqual($H(model_c1.getData()).inspect(), - $H({"a":3,"b":2}).inspect()); + $H({"a": 1, "b": 2}).inspect()); + + assertEqual($H(model_c1.schema).inspect(), + $H({'a': 'number', 'b': 'number'}).inspect()); + + assertEqual($H(model_m1.schema).inspect(), + $H({'a': 'number'}).inspect()); + + assertEqual($H(model_m2.schema).inspect(), + $H({'b': 'number'}).inspect()); + + 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()); + $H({"a": 3}).inspect()); assertEqual($H(model_m2.getData()).inspect(), - $H({"b":2}).inspect()); + $H({"b": 1}).inspect()); - model_c1.setData({"a": 4, "b": 5}); + model_c1.setData({"a": 4}); assertEqual($H(model_c1.getData()).inspect(), - $H({"a":4,"b":5}).inspect()); + $H({"a": 4}).inspect()); assertEqual($H(model_m1.getData()).inspect(), - $H({"a":4}).inspect()); + $H({"a": 4}).inspect()); assertEqual($H(model_m2.getData()).inspect(), - $H({"b":5}).inspect()); + $H({}).inspect()); }}, -- http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins