Show More
@@ -1,188 +1,188 b'' | |||||
1 | var xor = function (a, b) {return !a ^ !b;}; |
|
1 | var xor = function (a, b) {return !a ^ !b;}; | |
2 | var isArray = function (a) { |
|
2 | var isArray = function (a) { | |
3 | try { |
|
3 | try { | |
4 | return Object.toString.call(a) === "[object Array]" || Object.toString.call(a) === "[object RuntimeArray]"; |
|
4 | return Object.toString.call(a) === "[object Array]" || Object.toString.call(a) === "[object RuntimeArray]"; | |
5 | } catch (e) { |
|
5 | } catch (e) { | |
6 | return Array.isArray(a); |
|
6 | return Array.isArray(a); | |
7 | } |
|
7 | } | |
8 | }; |
|
8 | }; | |
9 | var recursive_compare = function(a, b) { |
|
9 | var recursive_compare = function(a, b) { | |
10 | // Recursively compare two objects. |
|
10 | // Recursively compare two objects. | |
11 | var same = true; |
|
11 | var same = true; | |
12 | same = same && !xor(a instanceof Object || typeof a == 'object', b instanceof Object || typeof b == 'object'); |
|
12 | same = same && !xor(a instanceof Object || typeof a == 'object', b instanceof Object || typeof b == 'object'); | |
13 | same = same && !xor(isArray(a), isArray(b)); |
|
13 | same = same && !xor(isArray(a), isArray(b)); | |
14 |
|
14 | |||
15 | if (same) { |
|
15 | if (same) { | |
16 | if (a instanceof Object) { |
|
16 | if (a instanceof Object) { | |
17 | var key; |
|
17 | var key; | |
18 | for (key in a) { |
|
18 | for (key in a) { | |
19 | if (a.hasOwnProperty(key) && !recursive_compare(a[key], b[key])) { |
|
19 | if (a.hasOwnProperty(key) && !recursive_compare(a[key], b[key])) { | |
20 | same = false; |
|
20 | same = false; | |
21 | break; |
|
21 | break; | |
22 | } |
|
22 | } | |
23 | } |
|
23 | } | |
24 | for (key in b) { |
|
24 | for (key in b) { | |
25 | if (b.hasOwnProperty(key) && !recursive_compare(a[key], b[key])) { |
|
25 | if (b.hasOwnProperty(key) && !recursive_compare(a[key], b[key])) { | |
26 | same = false; |
|
26 | same = false; | |
27 | break; |
|
27 | break; | |
28 | } |
|
28 | } | |
29 | } |
|
29 | } | |
30 | } else { |
|
30 | } else { | |
31 | return a === b; |
|
31 | return a === b; | |
32 | } |
|
32 | } | |
33 | } |
|
33 | } | |
34 |
|
34 | |||
35 | return same; |
|
35 | return same; | |
36 | }; |
|
36 | }; | |
37 |
|
37 | |||
38 | // Test the widget framework. |
|
38 | // Test the widget framework. | |
39 | casper.notebook_test(function () { |
|
39 | casper.notebook_test(function () { | |
40 | var index; |
|
40 | var index; | |
41 |
|
41 | |||
42 | this.then(function () { |
|
42 | this.then(function () { | |
43 |
|
43 | |||
44 | // Check if the WidgetManager class is defined. |
|
44 | // Check if the WidgetManager class is defined. | |
45 | this.test.assert(this.evaluate(function() { |
|
45 | this.test.assert(this.evaluate(function() { | |
46 | return IPython.WidgetManager !== undefined; |
|
46 | return IPython.WidgetManager !== undefined; | |
47 | }), 'WidgetManager class is defined'); |
|
47 | }), 'WidgetManager class is defined'); | |
48 | }); |
|
48 | }); | |
49 |
|
49 | |||
50 | index = this.append_cell( |
|
50 | index = this.append_cell( | |
51 | 'from IPython.html import widgets\n' + |
|
51 | 'from IPython.html import widgets\n' + | |
52 | 'from IPython.display import display, clear_output\n' + |
|
52 | 'from IPython.display import display, clear_output\n' + | |
53 | 'print("Success")'); |
|
53 | 'print("Success")'); | |
54 | this.execute_cell_then(index); |
|
54 | this.execute_cell_then(index); | |
55 |
|
55 | |||
56 | this.then(function () { |
|
56 | this.then(function () { | |
57 | // Check if the widget manager has been instantiated. |
|
57 | // Check if the widget manager has been instantiated. | |
58 | this.test.assert(this.evaluate(function() { |
|
58 | this.test.assert(this.evaluate(function() { | |
59 | return IPython.notebook.kernel.widget_manager !== undefined; |
|
59 | return IPython.notebook.kernel.widget_manager !== undefined; | |
60 | }), 'Notebook widget manager instantiated'); |
|
60 | }), 'Notebook widget manager instantiated'); | |
61 |
|
61 | |||
62 | // Functions that can be used to test the packing and unpacking APIs |
|
62 | // Functions that can be used to test the packing and unpacking APIs | |
63 | var that = this; |
|
63 | var that = this; | |
64 | var test_pack = function (input) { |
|
64 | var test_pack = function (input) { | |
65 | var output = that.evaluate(function(input) { |
|
65 | var output = that.evaluate(function(input) { | |
66 | var model = new IPython.WidgetModel(IPython.notebook.kernel.widget_manager, undefined); |
|
66 | var model = new IPython.WidgetModel(IPython.notebook.kernel.widget_manager, undefined); | |
67 | var results = model._pack_models(input); |
|
67 | var results = model._pack_models(input); | |
68 | return results; |
|
68 | return results; | |
69 | }, {input: input}); |
|
69 | }, {input: input}); | |
70 | that.test.assert(recursive_compare(input, output), |
|
70 | that.test.assert(recursive_compare(input, output), | |
71 | JSON.stringify(input) + ' passed through Model._pack_model unchanged'); |
|
71 | JSON.stringify(input) + ' passed through Model._pack_model unchanged'); | |
72 | }; |
|
72 | }; | |
73 | var test_unpack = function (input) { |
|
73 | var test_unpack = function (input) { | |
74 | var output = that.evaluate(function(input) { |
|
74 | var output = that.evaluate(function(input) { | |
75 | var model = new IPython.WidgetModel(IPython.notebook.kernel.widget_manager, undefined); |
|
75 | var model = new IPython.WidgetModel(IPython.notebook.kernel.widget_manager, undefined); | |
76 | var results = model._unpack_models(input); |
|
76 | var results = model._unpack_models(input); | |
77 | return results; |
|
77 | return results; | |
78 | }, {input: input}); |
|
78 | }, {input: input}); | |
79 | that.test.assert(recursive_compare(input, output), |
|
79 | that.test.assert(recursive_compare(input, output), | |
80 | JSON.stringify(input) + ' passed through Model._unpack_model unchanged'); |
|
80 | JSON.stringify(input) + ' passed through Model._unpack_model unchanged'); | |
81 | }; |
|
81 | }; | |
82 | var test_packing = function(input) { |
|
82 | var test_packing = function(input) { | |
83 | test_pack(input); |
|
83 | test_pack(input); | |
84 | test_unpack(input); |
|
84 | test_unpack(input); | |
85 | }; |
|
85 | }; | |
86 |
|
86 | |||
87 | test_packing({0: 'hi', 1: 'bye'}); |
|
87 | test_packing({0: 'hi', 1: 'bye'}); | |
88 | test_packing(['hi', 'bye']); |
|
88 | test_packing(['hi', 'bye']); | |
89 | test_packing(['hi', 5]); |
|
89 | test_packing(['hi', 5]); | |
90 | test_packing(['hi', '5']); |
|
90 | test_packing(['hi', '5']); | |
91 | test_packing([1.0, 0]); |
|
91 | test_packing([1.0, 0]); | |
92 | test_packing([1.0, false]); |
|
92 | test_packing([1.0, false]); | |
93 | test_packing([1, false]); |
|
93 | test_packing([1, false]); | |
94 | test_packing([1, false, {a: 'hi'}]); |
|
94 | test_packing([1, false, {a: 'hi'}]); | |
95 | test_packing([1, false, ['hi']]); |
|
95 | test_packing([1, false, ['hi']]); | |
96 |
|
96 | |||
97 | // Test multi-set, single touch code. First create a custom widget. |
|
97 | // Test multi-set, single touch code. First create a custom widget. | |
98 | this.evaluate(function() { |
|
98 | this.evaluate(function() { | |
99 | var MultiSetView = IPython.DOMWidgetView.extend({ |
|
99 | var MultiSetView = IPython.DOMWidgetView.extend({ | |
100 | render: function(){ |
|
100 | render: function(){ | |
101 | this.model.set('a', 1); |
|
101 | this.model.set('a', 1); | |
102 | this.model.set('b', 2); |
|
102 | this.model.set('b', 2); | |
103 | this.model.set('c', 3); |
|
103 | this.model.set('c', 3); | |
104 | this.touch(); |
|
104 | this.touch(); | |
105 | }, |
|
105 | }, | |
106 | }); |
|
106 | }); | |
107 | IPython.WidgetManager.register_widget_view('MultiSetView', MultiSetView); |
|
107 | IPython.WidgetManager.register_widget_view('MultiSetView', MultiSetView); | |
108 | }, {}); |
|
108 | }, {}); | |
109 | }); |
|
109 | }); | |
110 |
|
110 | |||
111 | // Try creating the multiset widget, verify that sets the values correctly. |
|
111 | // Try creating the multiset widget, verify that sets the values correctly. | |
112 | var multiset = {}; |
|
112 | var multiset = {}; | |
113 | multiset.index = this.append_cell( |
|
113 | multiset.index = this.append_cell( | |
114 | 'from IPython.utils.traitlets import Unicode, CInt\n' + |
|
114 | 'from IPython.utils.traitlets import Unicode, CInt\n' + | |
115 | 'class MultiSetWidget(widgets.Widget):\n' + |
|
115 | 'class MultiSetWidget(widgets.Widget):\n' + | |
116 | ' _view_name = Unicode("MultiSetView", sync=True)\n' + |
|
116 | ' _view_name = Unicode("MultiSetView", sync=True)\n' + | |
117 | ' a = CInt(0, sync=True)\n' + |
|
117 | ' a = CInt(0, sync=True)\n' + | |
118 | ' b = CInt(0, sync=True)\n' + |
|
118 | ' b = CInt(0, sync=True)\n' + | |
119 | ' c = CInt(0, sync=True)\n' + |
|
119 | ' c = CInt(0, sync=True)\n' + | |
120 | ' d = CInt(-1, sync=True)\n' + // See if it sends a full state. |
|
120 | ' d = CInt(-1, sync=True)\n' + // See if it sends a full state. | |
121 |
' def |
|
121 | ' def set_state(self, sync_data):\n' + | |
122 |
' widgets.Widget. |
|
122 | ' widgets.Widget.set_state(self, sync_data)\n'+ | |
123 | ' self.d = len(sync_data)\n' + |
|
123 | ' self.d = len(sync_data)\n' + | |
124 | 'multiset = MultiSetWidget()\n' + |
|
124 | 'multiset = MultiSetWidget()\n' + | |
125 | 'display(multiset)\n' + |
|
125 | 'display(multiset)\n' + | |
126 | 'print(multiset.model_id)'); |
|
126 | 'print(multiset.model_id)'); | |
127 | this.execute_cell_then(multiset.index, function(index) { |
|
127 | this.execute_cell_then(multiset.index, function(index) { | |
128 | multiset.model_id = this.get_output_cell(index).text.trim(); |
|
128 | multiset.model_id = this.get_output_cell(index).text.trim(); | |
129 | }); |
|
129 | }); | |
130 |
|
130 | |||
131 | this.wait_for_widget(multiset); |
|
131 | this.wait_for_widget(multiset); | |
132 |
|
132 | |||
133 | index = this.append_cell( |
|
133 | index = this.append_cell( | |
134 | 'print("%d%d%d" % (multiset.a, multiset.b, multiset.c))'); |
|
134 | 'print("%d%d%d" % (multiset.a, multiset.b, multiset.c))'); | |
135 | this.execute_cell_then(index, function(index) { |
|
135 | this.execute_cell_then(index, function(index) { | |
136 | this.test.assertEquals(this.get_output_cell(index).text.trim(), '123', |
|
136 | this.test.assertEquals(this.get_output_cell(index).text.trim(), '123', | |
137 | 'Multiple model.set calls and one view.touch update state in back-end.'); |
|
137 | 'Multiple model.set calls and one view.touch update state in back-end.'); | |
138 | }); |
|
138 | }); | |
139 |
|
139 | |||
140 | index = this.append_cell( |
|
140 | index = this.append_cell( | |
141 | 'print("%d" % (multiset.d))'); |
|
141 | 'print("%d" % (multiset.d))'); | |
142 | this.execute_cell_then(index, function(index) { |
|
142 | this.execute_cell_then(index, function(index) { | |
143 | this.test.assertEquals(this.get_output_cell(index).text.trim(), '3', |
|
143 | this.test.assertEquals(this.get_output_cell(index).text.trim(), '3', | |
144 | 'Multiple model.set calls sent a partial state.'); |
|
144 | 'Multiple model.set calls sent a partial state.'); | |
145 | }); |
|
145 | }); | |
146 |
|
146 | |||
147 | var textbox = {}; |
|
147 | var textbox = {}; | |
148 | throttle_index = this.append_cell( |
|
148 | throttle_index = this.append_cell( | |
149 | 'import time\n' + |
|
149 | 'import time\n' + | |
150 | 'textbox = widgets.Text()\n' + |
|
150 | 'textbox = widgets.Text()\n' + | |
151 | 'display(textbox)\n' + |
|
151 | 'display(textbox)\n' + | |
152 | 'textbox._dom_classes = ["my-throttle-textbox"]\n' + |
|
152 | 'textbox._dom_classes = ["my-throttle-textbox"]\n' + | |
153 | 'def handle_change(name, old, new):\n' + |
|
153 | 'def handle_change(name, old, new):\n' + | |
154 | ' display(len(new))\n' + |
|
154 | ' display(len(new))\n' + | |
155 | ' time.sleep(0.5)\n' + |
|
155 | ' time.sleep(0.5)\n' + | |
156 | 'textbox.on_trait_change(handle_change, "value")\n' + |
|
156 | 'textbox.on_trait_change(handle_change, "value")\n' + | |
157 | 'print(textbox.model_id)'); |
|
157 | 'print(textbox.model_id)'); | |
158 | this.execute_cell_then(throttle_index, function(index){ |
|
158 | this.execute_cell_then(throttle_index, function(index){ | |
159 | textbox.model_id = this.get_output_cell(index).text.trim(); |
|
159 | textbox.model_id = this.get_output_cell(index).text.trim(); | |
160 |
|
160 | |||
161 | this.test.assert(this.cell_element_exists(index, |
|
161 | this.test.assert(this.cell_element_exists(index, | |
162 | '.widget-area .widget-subarea'), |
|
162 | '.widget-area .widget-subarea'), | |
163 | 'Widget subarea exists.'); |
|
163 | 'Widget subarea exists.'); | |
164 |
|
164 | |||
165 | this.test.assert(this.cell_element_exists(index, |
|
165 | this.test.assert(this.cell_element_exists(index, | |
166 | '.my-throttle-textbox'), 'Textbox exists.'); |
|
166 | '.my-throttle-textbox'), 'Textbox exists.'); | |
167 |
|
167 | |||
168 | // Send 20 characters |
|
168 | // Send 20 characters | |
169 | this.sendKeys('.my-throttle-textbox input', '....................'); |
|
169 | this.sendKeys('.my-throttle-textbox input', '....................'); | |
170 | }); |
|
170 | }); | |
171 |
|
171 | |||
172 | this.wait_for_widget(textbox); |
|
172 | this.wait_for_widget(textbox); | |
173 |
|
173 | |||
174 | this.then(function () { |
|
174 | this.then(function () { | |
175 | var outputs = this.evaluate(function(i) { |
|
175 | var outputs = this.evaluate(function(i) { | |
176 | return IPython.notebook.get_cell(i).output_area.outputs; |
|
176 | return IPython.notebook.get_cell(i).output_area.outputs; | |
177 | }, {i : throttle_index}); |
|
177 | }, {i : throttle_index}); | |
178 |
|
178 | |||
179 | // Only 4 outputs should have printed, but because of timing, sometimes |
|
179 | // Only 4 outputs should have printed, but because of timing, sometimes | |
180 | // 5 outputs will print. All we need to do is verify num outputs <= 5 |
|
180 | // 5 outputs will print. All we need to do is verify num outputs <= 5 | |
181 | // because that is much less than 20. |
|
181 | // because that is much less than 20. | |
182 | this.test.assert(outputs.length <= 5, 'Messages throttled.'); |
|
182 | this.test.assert(outputs.length <= 5, 'Messages throttled.'); | |
183 |
|
183 | |||
184 | // We also need to verify that the last state sent was correct. |
|
184 | // We also need to verify that the last state sent was correct. | |
185 | var last_state = outputs[outputs.length-1]['text/plain']; |
|
185 | var last_state = outputs[outputs.length-1]['text/plain']; | |
186 | this.test.assertEquals(last_state, "20", "Last state sent when throttling."); |
|
186 | this.test.assertEquals(last_state, "20", "Last state sent when throttling."); | |
187 | }); |
|
187 | }); | |
188 | }); |
|
188 | }); |
General Comments 0
You need to be logged in to leave comments.
Login now