From 0bc25d9989717dcf510af572bd54cb231cfdd2a0 Mon Sep 17 00:00:00 2001 From: Christopher Jeffrey Date: Sun, 28 Jul 2013 14:29:07 -0500 Subject: [PATCH] make dumps for all tests. --- .npmignore | 3 ++ package.json | 3 +- test/insert.js | 23 --------------- test/logs/.gitignore | 1 + test/program-mouse.js | 6 +++- test/terminfo | 50 ++++++++++++++++++++------------- test/tput | 15 ++++++++-- test/widget-csr.js | 2 +- test/widget-file.js | 2 +- test/widget-form.js | 6 +++- test/widget-insert.js | 2 +- test/widget-listbar.js | 6 +++- test/widget-nested-attr.js | 6 ++-- test/widget-padding.js | 6 +++- test/widget-pos.js | 8 ++++-- test/widget-scrollable-boxes.js | 2 +- test/widget-shrink-padding.js | 6 +++- test/widget-textarea.js | 7 +++-- test/widget.js | 6 +++- 19 files changed, 96 insertions(+), 64 deletions(-) create mode 100644 .npmignore delete mode 100644 test/insert.js create mode 100644 test/logs/.gitignore diff --git a/.npmignore b/.npmignore new file mode 100644 index 0000000..05f05be --- /dev/null +++ b/.npmignore @@ -0,0 +1,3 @@ +.git* +test/ +img/ diff --git a/package.json b/package.json index 6517f87..f18e5e0 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,5 @@ "homepage": "https://github.com/chjj/blessed", "bugs": { "url": "http://github.com/chjj/blessed/issues" }, "keywords": ["curses", "tui", "tput"], - "tags": ["curses", "tui", "tput"], - "scripts": { "test": "node test", "bench": "node test --bench" } + "tags": ["curses", "tui", "tput"] } diff --git a/test/insert.js b/test/insert.js deleted file mode 100644 index dcd09ac..0000000 --- a/test/insert.js +++ /dev/null @@ -1,23 +0,0 @@ -var blessed = require('../') - , screen = blessed.screen(); - -var main = blessed.box({ - width: screen.width, - height: screen.height, - bg: 'yellow', - top: 0, - left: 0, - content: 'Welcome to my program\na\nb\nc\nd\ne\nf\ng\nh' -}); - -screen.append(main); - -screen.render(); - -screen.insertTop(1, screen.height - 3); -//screen.insertBottom(1, screen.height - 3); -//screen.insertBottom(1, screen.height - 3); - -screen.on('keypress', function(ch, key) { - if (key.name === 'q') return process.exit(0); -}); diff --git a/test/logs/.gitignore b/test/logs/.gitignore new file mode 100644 index 0000000..72e8ffc --- /dev/null +++ b/test/logs/.gitignore @@ -0,0 +1 @@ +* diff --git a/test/program-mouse.js b/test/program-mouse.js index 01bc242..5d9cdfa 100644 --- a/test/program-mouse.js +++ b/test/program-mouse.js @@ -1,5 +1,9 @@ var blessed = require('../') - , program = blessed(); + , program; + +program = blessed.program({ + dump: __dirname + '/logs/mouse.log' +}); // program.setMouse({ // allMotion: true, diff --git a/test/terminfo b/test/terminfo index bd3a944..bed52e0 100644 --- a/test/terminfo +++ b/test/terminfo @@ -1,27 +1,25 @@ { header: - { dataSize: 3270, + { dataSize: 3337, headerSize: 12, magicNumber: 282, - namesSize: 48, + namesSize: 28, boolCount: 38, numCount: 15, strCount: 413, strTableSize: 1388, - total: 2342, + total: 2322, extended: - { dataSize: 928, + { dataSize: 1015, headerSize: 10, boolCount: 2, - numCount: 1, - strCount: 57, - strTableSize: 117, - lastStrTableOffset: 680, - total: 245 } }, + numCount: 0, + strCount: 62, + strTableSize: 126, + lastStrTableOffset: 751, + total: 262 } }, name: 'xterm', names: [ 'xterm' ], - desc: 'xterm terminal emulator (X Window System)', - dir: '/usr/share/terminfo', - file: '/usr/share/terminfo/x/xterm', + desc: 'X11 terminal emulator', bools: { auto_left_margin: false, auto_right_margin: true, @@ -62,7 +60,7 @@ lpi_changes_res: false, backspaces_with_bs: true, AX: true, - XT: false }, + XT: true }, numbers: { columns: 80, init_tabs: 8, @@ -78,8 +76,7 @@ max_attributes: -1, maximum_windows: -1, max_colors: 8, - max_pairs: 64, - U8: -1 }, + max_pairs: 64 }, strings: { back_tab: '\u001b[Z', bell: '\u0007', @@ -250,7 +247,12 @@ set_a_background: '\u001b[4%p1%dm', memory_lock: '\u001bl', memory_unlock: '\u001bm', - XM: '', + Cr: '\u001b]112\u0007', + Cs: '\u001b]12;%p1%s\u0007', + E3: '\u001b[3;J', + Ms: '\u001b]52;%p1%s;%p2%s\u0007', + Se: '\u001b[2 q', + Ss: '\u001b[%p1%d q', kDC3: '\u001b[3;3~', kDC4: '\u001b[3;4~', kDC5: '\u001b[3;5~', @@ -407,7 +409,7 @@ Compiling cpi_changes_res: false Compiling lpi_changes_res: false Compiling backspaces_with_bs: true Compiling AX: true -Compiling XT: false +Compiling XT: true Compiling columns: 80 Compiling init_tabs: 8 Compiling lines: 24 @@ -423,7 +425,6 @@ Compiling max_attributes: -1 Compiling maximum_windows: -1 Compiling max_colors: 8 Compiling max_pairs: 64 -Compiling U8: -1 Compiling back_tab: "\u001b[Z" return "\x1b[Z"; Compiling bell: "\u0007" @@ -762,7 +763,18 @@ Compiling memory_lock: "\u001bl" return "\x1bl"; Compiling memory_unlock: "\u001bm" return "\x1bm"; -Compiling XM: "" +Compiling Cr: "\u001b]112\u0007" +return "\x1b]112\x07"; +Compiling Cs: "\u001b]12;%p1%s\u0007" +var out = ["\x1b]12;"];out.push(params[0]),out.push("\x07");return out.join(""); +Compiling E3: "\u001b[3;J" +return "\x1b[3;J"; +Compiling Ms: "\u001b]52;%p1%s;%p2%s\u0007" +var out = ["\x1b]52;"];out.push(params[0]),out.push(";"),out.push(params[1]),out.push("\x07");return out.join(""); +Compiling Se: "\u001b[2 q" +return "\x1b[2 q"; +Compiling Ss: "\u001b[%p1%d q" +var out = ["\x1b["];out.push(params[0]),out.push(" q");return out.join(""); Compiling kDC3: "\u001b[3;3~" return "\x1b[3;3~"; Compiling kDC4: "\u001b[3;4~" diff --git a/test/tput b/test/tput index d44e9c8..096a6b6 100755 --- a/test/tput +++ b/test/tput @@ -1,8 +1,17 @@ #!/bin/bash -node test/tput.js "$@" | tee out -out=$(git diff --color=always --no-index test/terminfo out) -rm out +term="$1" + +dir=$(dirname $(readlink -f "$0")) +cd "$dir/.." + +if test -z "$term"; then + term="$dir/../usr/xterm" + set -- "$term" "$@" +fi + +node test/tput.js "$@" | grep -v 'dir:\|file:' | tee test/logs/terminfo.log +out=$(git diff --color=always --no-index test/terminfo test/logs/terminfo.log) if test -n "$out"; then echo "$out" | less -c -R diff --git a/test/widget-csr.js b/test/widget-csr.js index f8fb0a6..88cbf6f 100644 --- a/test/widget-csr.js +++ b/test/widget-csr.js @@ -2,7 +2,7 @@ var blessed = require('../') , screen; screen = blessed.screen({ - dump: __dirname + '/p.log', + dump: __dirname + '/logs/csr.log', smartCSR: true }); diff --git a/test/widget-file.js b/test/widget-file.js index c3be5fa..01db2b1 100644 --- a/test/widget-file.js +++ b/test/widget-file.js @@ -3,7 +3,7 @@ var blessed = require('../'); var screen = blessed.screen({ tput: true, smartCSR: true, - dump: __dirname + '/file.log' + dump: __dirname + '/logs/file.log' }); var fm = blessed.filemanager({ diff --git a/test/widget-form.js b/test/widget-form.js index c31c3d4..57de17e 100644 --- a/test/widget-form.js +++ b/test/widget-form.js @@ -1,5 +1,9 @@ var blessed = require('../') - , screen = blessed.screen({ dump: __dirname + '/form.log' }); + , screen; + +screen = blessed.screen({ + dump: __dirname + '/logs/form.log' +}); var form = blessed.form({ parent: screen, diff --git a/test/widget-insert.js b/test/widget-insert.js index 9104346..97b2661 100644 --- a/test/widget-insert.js +++ b/test/widget-insert.js @@ -1,7 +1,7 @@ var blessed = require('../'); var screen = blessed.screen({ - tput: true + dump: __dirname + '/logs/insert.log' }); var box = blessed.box({ diff --git a/test/widget-listbar.js b/test/widget-listbar.js index fafa1ed..d86907b 100644 --- a/test/widget-listbar.js +++ b/test/widget-listbar.js @@ -1,5 +1,9 @@ var blessed = require('../') - , screen = blessed.screen(); + , screen; + +screen = blessed.screen({ + dump: __dirname + '/logs/listbar.log' +}); var bar = blessed.listbar({ parent: screen, diff --git a/test/widget-nested-attr.js b/test/widget-nested-attr.js index c52cd9d..0e382a6 100644 --- a/test/widget-nested-attr.js +++ b/test/widget-nested-attr.js @@ -2,8 +2,7 @@ var blessed = require('../') , screen; screen = blessed.screen({ - dump: __dirname + '/nested-attr.log', - smartCSR: true + dump: __dirname + '/logs/nested-attr.log' }); blessed.box({ @@ -18,7 +17,8 @@ blessed.box({ border: { type: 'ascii' }, - content: '{red-fg}hello {blue-fg}how{/blue-fg} are you?{/red-fg}' + content: '{red-fg}hello {blue-fg}how{/blue-fg}' + + ' {yellow-bg}are{/yellow-bg} you?{/red-fg}' }); screen.key('q', function() { diff --git a/test/widget-padding.js b/test/widget-padding.js index 9f2dfc9..1f2b4d3 100644 --- a/test/widget-padding.js +++ b/test/widget-padding.js @@ -1,5 +1,9 @@ var blessed = require('../') - , screen = blessed.screen(); + , screen; + +screen = blessed.screen({ + dump: __dirname + '/logs/padding.log' +}); blessed.box({ parent: screen, diff --git a/test/widget-pos.js b/test/widget-pos.js index f765e28..dea8f90 100644 --- a/test/widget-pos.js +++ b/test/widget-pos.js @@ -1,6 +1,10 @@ var blessed = require('../') - , screen = blessed.screen() - , assert = require('assert'); + , assert = require('assert') + , screen; + +screen = blessed.screen({ + dump: __dirname + '/logs/pos.log' +}); // My terminal size at the time of writing these tests: screen.program.cols = 154; diff --git a/test/widget-scrollable-boxes.js b/test/widget-scrollable-boxes.js index c9dacf2..6995e19 100644 --- a/test/widget-scrollable-boxes.js +++ b/test/widget-scrollable-boxes.js @@ -2,7 +2,7 @@ var blessed = require('../') , screen; screen = blessed.screen({ - dump: __dirname + '/scrollable-boxes.log', + dump: __dirname + '/logs/scrollable-boxes.log', smartCSR: true }); diff --git a/test/widget-shrink-padding.js b/test/widget-shrink-padding.js index 12cd406..731a756 100644 --- a/test/widget-shrink-padding.js +++ b/test/widget-shrink-padding.js @@ -1,5 +1,9 @@ var blessed = require('../') - , screen = blessed.screen(); + , screen; + +screen = blessed.screen({ + dump: __dirname + '/logs/shrink-padding.log' +}); var outer = blessed.box({ parent: screen, diff --git a/test/widget-textarea.js b/test/widget-textarea.js index cf2a5a8..3a806fe 100644 --- a/test/widget-textarea.js +++ b/test/widget-textarea.js @@ -1,6 +1,9 @@ -var blessed = require('../'); +var blessed = require('../') + , screen; -var screen = blessed.screen(); +screen = blessed.screen({ + dump: __dirname + '/logs/textarea.log' +}); var box = blessed.textarea({ parent: screen, diff --git a/test/widget.js b/test/widget.js index b253327..7dfc6aa 100644 --- a/test/widget.js +++ b/test/widget.js @@ -1,5 +1,9 @@ var blessed = require('../') - , screen = blessed.screen(); + , screen; + +screen = blessed.screen({ + dump: __dirname + '/logs/widget.log' +}); screen.append(blessed.text({ top: 0,