upstream/ipython Commit - r14797:85a0de32

first review pass on widget tests

MinRK -

r14797:85a0de32

parent child

IPython/html/tests/casperjs/test_cases/widgets.js

0 +12 -19

                     // Check if the WidgetManager class is defined.
                     this.test.assert(this.evaluate(function() {
-                        return IPython.WidgetManager != undefined;
+                        return IPython.WidgetManager !== undefined;
                     }), 'WidgetManager class is defined');
                 });
                 this.wait(500); // Wait for require.js async callbacks to load dependencies.
                 this.then(function () {
-                    // Check if the widget manager has been instanciated.
+                    // Check if the widget manager has been instantiated.
                     this.test.assert(this.evaluate(function() {
-                        return IPython.notebook.kernel.widget_manager != undefined;
+                        return IPython.notebook.kernel.widget_manager !== undefined;
-                    }), 'Notebook widget manager instanciated');
+                    }), 'Notebook widget manager instantiated');
                 });
                 throttle_index = this.append_cell(
                     'def handle_change(name, old, new):\n' +
                     '    print(len(new))\n' +
                     '    time.sleep(0.5)\n' +
-                    'textbox.on_trait_change(handle_change)\n' +
+                    'textbox.on_trait_change(handle_change, "value")\n' +
                     'print("Success")');
                 this.execute_cell_then(throttle_index, function(index){
-                    this.test.assert(this.get_output_cell(index).text == 'Success\n',
+                    this.test.assertEquals(this.get_output_cell(index).text, 'Success\n',
                         'Test throttling cell executed with correct output');
                     this.test.assert(this.cell_element_exists(index,
                 this.wait(2000); // Wait for clicks to execute in kernel
                 this.then(function(){
-                    var resume = true;
+                    var outputs = this.evaluate(function(i) {
-                    var i = 0;
+                        return IPython.notebook.get_cell(i).output_area.outputs;
-                    while (resume) {
+                    }, {i : throttle_index});
-                        i++;
-                        var output = this.get_output_cell(throttle_index, i);
-                        if (output === undefined || output === null) {
-                            resume = false;
-                            i--;
                     // Only 4 outputs should have printed, but because of timing, sometimes
                     // 5 outputs will print.  All we need to do is verify num outputs <= 5
                     // because that is much less than 20.
-                    this.test.assert(i <= 5, 'Messages throttled.');
+                    this.test.assert(outputs.length <= 5, 'Messages throttled.');
                     // We also need to verify that the last state sent was correct.
-                    var last_state = this.get_output_cell(throttle_index, i).text;
+                    var last_state = outputs[outputs.length-1].text;
-                    this.test.assert(last_state == "20\n", "Last state sent when throttling.");
+                    this.test.assertEquals(last_state, "20\n", "Last state sent when throttling.");
                 });
             });

IPython/html/tests/casperjs/test_cases/widgets_bool.js

0 +2 -2

                     'print("Success")');
                 this.execute_cell_then(bool_index, function(index){
-                    this.test.assert(this.get_output_cell(index).text == 'Success\n',
+                    this.test.assertEquals(this.get_output_cell(index).text, 'Success\n',
                         'Create bool widget cell executed with correct output.');
                     this.test.assert(this.cell_element_exists(index,
                     'print("Success")');
                 this.execute_cell_then(index, function(index){
-                    this.test.assert(this.get_output_cell(index).text == 'Success\n',
+                    this.test.assertEquals(this.get_output_cell(index).text, 'Success\n',
                         'Change bool widget value cell executed with correct output.');
                     this.test.assert(! this.cell_element_function(bool_index,

IPython/html/tests/casperjs/test_cases/widgets_button.js

0 +2 -2

                     'button.on_click(handle_click)');
                 this.execute_cell_then(button_index, function(index){
-                    this.test.assert(this.get_output_cell(index).text == 'Success\n',
+                    this.test.assertEquals(this.get_output_cell(index).text, 'Success\n',
                         'Create button cell executed with correct output.');
                     this.test.assert(this.cell_element_exists(index,
                 this.wait(500); // Wait for click to execute in kernel and write output
                 this.then(function () {
-                    this.test.assert(this.get_output_cell(button_index, 1).text == 'Clicked\n',
+                    this.test.assertEquals(this.get_output_cell(button_index, 1).text, 'Clicked\n',
                         'Button click event fires.');
                 });
             });

IPython/html/tests/casperjs/test_cases/widgets_container.js

0 +4 -4

                     'print("Success")\n');
                 this.execute_cell_then(container_index, function(index){
-                    this.test.assert(this.get_output_cell(index).text == 'Success\n',
+                    this.test.assertEquals(this.get_output_cell(index).text, 'Success\n',
                         'Create container cell executed with correct output.');
                     this.test.assert(this.cell_element_exists(index,
                     'print("Success")\n');
                 this.execute_cell_then(index, function(index){
-                    this.test.assert(this.get_output_cell(index).text == 'Success\n',
+                    this.test.assertEquals(this.get_output_cell(index).text, 'Success\n',
                         'Set container class CSS cell executed with correct output.');
                     this.test.assert(this.cell_element_function(container_index,
                     'print("Success")\n');
                 this.execute_cell_then(index, function(index){
-                    this.test.assert(this.get_output_cell(index).text == 'Success\n',
+                    this.test.assertEquals(this.get_output_cell(index).text, 'Success\n',
                         'Remove container class cell executed with correct output.');
                     this.test.assert(! this.cell_element_exists(container_index,
                     'print("Success")\n');
                 this.execute_cell_then(index, function(index){
-                    this.test.assert(this.get_output_cell(index).text == 'Success\n',
+                    this.test.assertEquals(this.get_output_cell(index).text, 'Success\n',
                         'Display container child executed with correct output.');
                     this.test.assert(! this.cell_element_exists(index,

IPython/html/tests/casperjs/test_cases/widgets_float.js

0 +6 -6

                     'print("Success")\n');
                 this.execute_cell_then(float_index, function(index){
-                    this.test.assert(this.get_output_cell(index).text == 'Success\n',
+                    this.test.assertEquals(this.get_output_cell(index).text, 'Success\n',
                         'Create float cell executed with correct output.');
                     this.test.assert(this.cell_element_exists(index,
                 index = this.append_cell('print(float_widget.value)\n');
                 this.execute_cell_then(index, function(index){
-                    this.test.assert(this.get_output_cell(index).text == '1.05\n',
+                    this.test.assertEquals(this.get_output_cell(index).text, '1.05\n',
                         'Float textbox value set.');
                     this.cell_element_function(float_index, float_text_query_2, 'val', ['']);
                     this.sendKeys(float_text_query_2, '123456789.0');
                 index = this.append_cell('print(float_widget.value)\n');
                 this.execute_cell_then(index, function(index){
-                    this.test.assert(this.get_output_cell(index).text == '123456789.0\n',
+                    this.test.assertEquals(this.get_output_cell(index).text, '123456789.0\n',
                         'Long float textbox value set (probably triggers throttling).');
                     this.cell_element_function(float_index, float_text_query_2, 'val', ['']);
                     this.sendKeys(float_text_query_2, '12hello');
                 index = this.append_cell('print(float_widget.value)\n');
                 this.execute_cell_then(index, function(index){
-                    this.test.assert(this.get_output_cell(index).text == '12.0\n',
+                    this.test.assertEquals(this.get_output_cell(index).text, '12.0\n',
                         'Invald float textbox value caught and filtered.');
                 });
                     'print("Success")\n');
                 this.execute_cell_then(floatrange_index, function(index){
-                    this.test.assert(this.get_output_cell(index).text == 'Success\n',
+                    this.test.assertEquals(this.get_output_cell(index).text, 'Success\n',
                         'Create float range cell executed with correct output.');
                     this.test.assert(this.cell_element_exists(index,
                     'print("Success")\n');
                 this.execute_cell_then(index, function(index){
-                    this.test.assert(this.get_output_cell(index).text == 'Success\n',
+                    this.test.assertEquals(this.get_output_cell(index).text, 'Success\n',
                         'Float range properties cell executed with correct output.');
                     this.test.assert(this.cell_element_exists(floatrange_index, slider_query),

IPython/html/tests/casperjs/test_cases/widgets_image.js

0 +3 -3

                     'print("Success")\n');
                 this.execute_cell_then(image_index, function(index){
-                    this.test.assert(this.get_output_cell(index).text == 'Success\n',
+                    this.test.assertEquals(this.get_output_cell(index).text, 'Success\n',
                         'Create image executed with correct output.');
                     this.test.assert(this.cell_element_exists(index,
                     this.captureSelector(capture_filename, '.my-test-image');
                     var stream = fs.open(capture_filename, 'rb');
                     var captured = btoa(stream.read());
-                    stream.close()
+                    stream.close();
                     fs.remove(capture_filename);
                     // Uncomment line below to output captured image data to a text file.
                     // fs.write('./captured.txt', captured, 'w');
-                    this.test.assert(test_results==captured, "Red image data displayed correctly.");
+                    this.test.assertEquals(test_results, captured, "Red image data displayed correctly.");
                 });
             });

IPython/html/tests/casperjs/test_cases/widgets_int.js

0 +9 -9

                     'print("Success")\n');
                 this.execute_cell_then(int_index, function(index){
-                    this.test.assert(this.get_output_cell(index).text == 'Success\n',
+                    this.test.assertEquals(this.get_output_cell(index).text, 'Success\n',
                         'Create int cell executed with correct output.');
                     this.test.assert(this.cell_element_exists(index,
                 index = this.append_cell('print(int_widget.value)\n');
                 this.execute_cell_then(index, function(index){
-                    this.test.assert(this.get_output_cell(index).text == '1\n',
+                    this.test.assertEquals(this.get_output_cell(index).text, '1\n',
                         'Int textbox value set.');
                     this.cell_element_function(int_index, int_text_query_2, 'val', ['']);
                     this.sendKeys(int_text_query_2, '123456789');
                 index = this.append_cell('print(int_widget.value)\n');
                 this.execute_cell_then(index, function(index){
-                    this.test.assert(this.get_output_cell(index).text == '123456789\n',
+                    this.test.assertEquals(this.get_output_cell(index).text, '123456789\n',
                         'Long int textbox value set (probably triggers throttling).');
                     this.cell_element_function(int_index, int_text_query_2, 'val', ['']);
                     this.sendKeys(int_text_query_2, '12hello');
                 index = this.append_cell('print(int_widget.value)\n');
                 this.execute_cell_then(index, function(index){
-                    this.test.assert(this.get_output_cell(index).text == '12\n',
+                    this.test.assertEquals(this.get_output_cell(index).text, '12\n',
                         'Invald int textbox value caught and filtered.');
                 });
                     'print("Success")\n');
                 this.execute_cell_then(intrange_index, function(index){
-                    this.test.assert(this.get_output_cell(index).text == 'Success\n',
+                    this.test.assertEquals(this.get_output_cell(index).text, 'Success\n',
                         'Create int range cell executed with correct output.');
                     this.test.assert(this.cell_element_exists(index,
                     'print("Success")\n');
                 this.execute_cell_then(index, function(index){
-                    this.test.assert(this.get_output_cell(index).text == 'Success\n',
+                    this.test.assertEquals(this.get_output_cell(index).text, 'Success\n',
                         'Int range properties cell executed with correct output.');
                     this.test.assert(this.cell_element_exists(intrange_index, slider_query),
                 index = this.append_cell('print(intrange[0].value)\n');
                 this.execute_cell_then(index, function(index){
-                    this.test.assert(this.get_output_cell(index).text == '1\n',
+                    this.test.assertEquals(this.get_output_cell(index).text, '1\n',
                         'Int textbox set int range value');
                     // Clear the int textbox value and then set it to 120 by emulating
                 index = this.append_cell('print(intrange[0].value)\n');
                 this.execute_cell_then(index, function(index){
-                    this.test.assert(this.get_output_cell(index).text == '50\n',
+                    this.test.assertEquals(this.get_output_cell(index).text, '50\n',
                         'Int textbox value bound');
                     // Clear the int textbox value and then set it to 'hello world' by
                 index = this.append_cell('print(intrange[0].value)\n');
                 this.execute_cell_then(index, function(index){
-                    this.test.assert(this.get_output_cell(index).text == '50\n',
+                    this.test.assertEquals(this.get_output_cell(index).text, '50\n',
                         'Invalid int textbox characters ignored');
                 });
             });

IPython/html/tests/casperjs/test_cases/widgets_multicontainer.js

0 +8 -8

                     'print("Success")\n');
                 this.execute_cell_then(multicontainer1_index, function(index){
-                    this.test.assert(this.get_output_cell(index).text == 'Success\n',
+                    this.test.assertEquals(this.get_output_cell(index).text, 'Success\n',
                         'Create multicontainer cell executed with correct output. (1)');
                     this.test.assert(this.cell_element_exists(index,
                         'First widget tab list exists.');
                     // JQuery selector is 1 based
-                    this.click(multicontainer1_query + ' li:nth-child(2) a')
+                    this.click(multicontainer1_query + ' li:nth-child(2) a');
                 });
                 this.wait(500); // Wait for change to execute in kernel
                     'print(multicontainer.selected_index)\n' +
                     'multicontainer.selected_index = 2'); // 0 based
                 this.execute_cell_then(index, function(index){
-                    this.test.assert(this.get_output_cell(index).text == '1\n', // 0 based
+                    this.test.assertEquals(this.get_output_cell(index).text, '1\n', // 0 based
                         'selected_index property updated with tab change.');
                     // JQuery selector is 1 based
                     this.test.assert(!this.cell_element_function(multicontainer1_index, multicontainer1_query + ' li:nth-child(1)', 'hasClass', ['active']),
-                            "Tab 1 is not selected.")
+                            "Tab 1 is not selected.");
                     this.test.assert(!this.cell_element_function(multicontainer1_index, multicontainer1_query + ' li:nth-child(2)', 'hasClass', ['active']),
-                            "Tab 2 is not selected.")
+                            "Tab 2 is not selected.");
                     this.test.assert(this.cell_element_function(multicontainer1_index, multicontainer1_query + ' li:nth-child(3)', 'hasClass', ['active']),
-                            "Tab 3 is selected.")
+                            "Tab 3 is selected.");
                 });
                 index = this.append_cell('multicontainer.set_title(1, "hello")\nprint("Success")'); // 0 based
                     'print("Success")\n');
                 this.execute_cell_then(multicontainer2_index, function(index){
-                    this.test.assert(this.get_output_cell(index).text == 'Success\n',
+                    this.test.assertEquals(this.get_output_cell(index).text, 'Success\n',
                         'Create multicontainer cell executed with correct output. (2)');
                     this.test.assert(this.cell_element_exists(index,
                 index = this.append_cell('print(multicontainer.selected_index)'); // 0 based
                 this.execute_cell_then(index, function(index){
-                    this.test.assert(this.get_output_cell(index).text == '1\n', // 0 based
+                    this.test.assertEquals(this.get_output_cell(index).text, '1\n', // 0 based
                         'selected_index property updated with tab change.');
                 });
             });

IPython/html/tests/casperjs/test_cases/widgets_selection.js

0 +8 -8

                     'print("Success")');
                 this.execute_cell_then(index);
-                var combo_selector = '.widget-area .widget-subarea .widget-hbox-single .btn-group .widget-combo-btn'
+                var combo_selector = '.widget-area .widget-subarea .widget-hbox-single .btn-group .widget-combo-btn';
-                var multibtn_selector = '.widget-area .widget-subarea .widget-hbox-single .btn-group[data-toggle="buttons-radio"]'
+                var multibtn_selector = '.widget-area .widget-subarea .widget-hbox-single .btn-group[data-toggle="buttons-radio"]';
-                var radio_selector = '.widget-area .widget-subarea .widget-hbox .vbox'
+                var radio_selector = '.widget-area .widget-subarea .widget-hbox .vbox';
-                var list_selector = '.widget-area .widget-subarea .widget-hbox .widget-listbox'
+                var list_selector = '.widget-area .widget-subarea .widget-hbox .widget-listbox';
                 var selection_index;
                 var selection_values = 'abcd';
                             combo_state == state;
                     }
                     return true;
+                };
                 var verify_selection = function(context, index){
                     for (var i = 0; i < selection_values.length; i++) {
                         }
                     }
                     return true;
+                };
             //values=["' + selection_values + '"[i] for i in range(4)]
                 selection_index = this.append_cell(
                     '    widget.on_trait_change(handle_change, "value")\n' +
                     'print("Success")\n');
                 this.execute_cell_then(selection_index, function(index){
-                    this.test.assert(this.get_output_cell(index).text == 'Success\n',
+                    this.test.assertEquals(this.get_output_cell(index).text, 'Success\n',
                         'Create selection cell executed with correct output.');
                     this.test.assert(this.cell_element_exists(index,
                     '    widget.value = "a"\n' +
                     'print("Success")\n');
                 this.execute_cell_then(index, function(index){
-                    this.test.assert(this.get_output_cell(index).text == 'Success\n',
+                    this.test.assertEquals(this.get_output_cell(index).text, 'Success\n',
                         'Python select item executed with correct output.');
                     // Verify that the first item is selected.

IPython/html/tests/casperjs/test_cases/widgets_string.js

0 +1 -1

                     'print("Success")');
                 this.execute_cell_then(string_index, function(index){
-                    this.test.assert(this.get_output_cell(index).text == 'Success\n',
+                    this.test.assertEquals(this.get_output_cell(index).text, 'Success\n',
                         'Create string widget cell executed with correct output.');
                     this.test.assert(this.cell_element_exists(index,

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages