greatly expanded tests

fmv1992 · fmv1992 · commit 0b3bbad95cbe · 2018-01-07T00:26:24.000-02:00
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,7 @@
 branches:
   only:
     - develop
+    - dev_unstable
 before_install:
     - export ORIGINAL_FOLDER=$PWD
     - sudo apt install libncurses5-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libatk1.0-dev libbonoboui2-dev libcairo2-dev libx11-dev libxpm-dev libxt-dev python-dev python3-dev lua5.1 lua5.1-dev libperl-dev git
diff --git a/ftplugin/python/pymode.vim b/ftplugin/python/pymode.vim
@@ -228,6 +228,7 @@ if g:pymode_debug
         " Get a system independent temporary filename. The 'marker' variable is
         " used to get rid of a null character getting inserted at position.
         " substitute() was not able to remove it.
+        " TODO: see https://superuser.com/questions/935574/get-rid-of-null-character-in-vim-variable
         let g:pymode_debug_tempfile=matchstr(
             \ execute(
             \ g:pymode_python
diff --git a/readme.md b/readme.md
@@ -98,8 +98,6 @@ help packages` in vim for details.
     cd ~/.vim
     mkdir -p bundle && cd bundle
     git clone https://github.com/python-mode/python-mode.git
-    cd python-mode
-    git submodule update --init --recursive
 
 Enable [pathogen](https://github.com/tpope/vim-pathogen) in your `~/.vimrc`:
 
@@ -116,7 +114,6 @@ Enable [pathogen](https://github.com/tpope/vim-pathogen) in your `~/.vimrc`:
 
     % git clone https://github.com/python-mode/python-mode.git
     % cd python-mode
-    % git submodule update --init --recursive
     % cp -R * ~/.vim
 
 Then rebuild **helptags** in vim:
diff --git a/tests/test.sh b/tests/test.sh
@@ -4,6 +4,8 @@
 set -e
 which vim 1>/dev/null 2>/dev/null
 
+cd $(dirname $0)
+
 # Source common variables.
 source ./test_helpers_bash/test_variables.sh
 
diff --git a/tests/test_bash/test_folding.sh b/tests/test_bash/test_folding.sh
@@ -2,20 +2,26 @@
 
 # Source file.
 set +e
-RETURN_CODE=$(vim -i NONE -u $VIM_TEST_VIMRC -c "source ./test_procedures_vimscript/folding1.vim" $VIM_DISPOSABLE_PYFILE > /dev/null 2>&1)
+source ./test_helpers_bash/test_prepare_between_tests.sh
+vim -i NONE -u $VIM_TEST_VIMRC -c "source ./test_procedures_vimscript/folding1.vim" $VIM_DISPOSABLE_PYFILE > /dev/null
 R1=$?
-bash ./test_helpers_bash/test_prepare_between_tests.sh
-RETURN_CODE=$(vim -i NONE -u $VIM_TEST_VIMRC -c "source ./test_procedures_vimscript/folding2.vim" $VIM_DISPOSABLE_PYFILE > /dev/null 2>&1)
+source ./test_helpers_bash/test_prepare_between_tests.sh
+vim -i NONE -u $VIM_TEST_VIMRC -c "source ./test_procedures_vimscript/folding2.vim" $VIM_DISPOSABLE_PYFILE > /dev/null
 R2=$?
+source ./test_helpers_bash/test_prepare_between_tests.sh
+vim -i NONE -u $VIM_TEST_VIMRC -c "source ./test_procedures_vimscript/folding3.vim" $VIM_DISPOSABLE_PYFILE > /dev/null
+R3=$?
 set -e
+
 if [[ "$R1" -ne 0 ]]
 then
     exit 1
 elif [[ "$R2" -ne 0 ]]
 then
     exit 2
+elif [[ "$R3" -ne 0 ]]
+then
+    exit 3
 fi
 
-exit 0
-
 # vim: set fileformat=unix filetype=sh wrap tw=0 :
diff --git a/tests/test_helpers_bash/test_createvimrc.sh b/tests/test_helpers_bash/test_createvimrc.sh
@@ -1,12 +1,25 @@
 #! /bin/bash
 
 # Create minimal vimrc.
+echo -e "syntax on\nfiletype plugin indent on\nset nocompatible" >> $VIM_TEST_VIMRC
 echo "call has('python3')" >> $VIM_TEST_VIMRC
-echo "set noswapfile" >> $VIM_TEST_VIMRC
-echo "set shell=bash" >> $VIM_TEST_VIMRC
+echo "set paste" >> $VIM_TEST_VIMRC
+echo "set shortmess=at" >> $VIM_TEST_VIMRC
+echo "set cmdheight=10" >> $VIM_TEST_VIMRC
 echo "set ft=python" >> $VIM_TEST_VIMRC
-echo -e "syntax on\nfiletype plugin indent on\nset nocompatible" >> $VIM_TEST_VIMRC
+echo "set shell=bash" >> $VIM_TEST_VIMRC
+echo "set noswapfile" >> $VIM_TEST_VIMRC
+echo "set backupdir=" >> $VIM_TEST_VIMRC
+echo "set undodir=" >> $VIM_TEST_VIMRC
+echo "set viewdir=" >> $VIM_TEST_VIMRC
+echo "set directory=" >> $VIM_TEST_VIMRC
+echo -e "set runtimepath=" >> $VIM_TEST_VIMRC
 echo -e "set runtimepath+=$(dirname $PWD)\n" >> $VIM_TEST_VIMRC
+# echo -e "redir! >> $VIM_OUTPUT_FILE\n" >> $VIM_TEST_VIMRC
 echo -e "set verbosefile=$VIM_OUTPUT_FILE\n" >> $VIM_TEST_VIMRC
+echo -e "let g:pymode_debug = 1" >> $VIM_TEST_VIMRC
+
+echo "set nomore" >> $VIM_TEST_VIMRC
+
 
 # vim: set fileformat=unix filetype=sh wrap tw=0 :
diff --git a/tests/test_helpers_bash/test_prepare_between_tests.sh b/tests/test_helpers_bash/test_prepare_between_tests.sh
@@ -2,7 +2,8 @@
 
 # Prepare tests.
 set +e
-rm $VIM_DISPOSABLE_PYFILE 2&>/dev/null
+rm $VIM_DISPOSABLE_PYFILE
+export VIM_DISPOSABLE_PYFILE=`mktemp /tmp/pymode.tmpfile.XXXXXXXXXX.py`
 set -e
 touch $VIM_DISPOSABLE_PYFILE
 
diff --git a/tests/test_helpers_bash/test_prepare_once.sh b/tests/test_helpers_bash/test_prepare_once.sh
@@ -3,6 +3,7 @@
 # Prepare tests.
 set +e
 rm $VIM_OUTPUT_FILE $VIM_TEST_VIMRC $VIM_TEST_PYMODECOMMANDS $VIM_DISPOSABLE_PYFILE 2&>/dev/null
+rm /tmp/*pymode* 2&>/dev/null
 set -e
 
 # vim: set fileformat=unix filetype=sh wrap tw=0 :
diff --git a/tests/test_helpers_vimscript/inserting_text.vim b/tests/test_helpers_vimscript/inserting_text.vim
@@ -0,0 +1,98 @@
+function! InsertRandomText(low_range, high_range) " {{{
+    " Insert random ascii visible table text at cursor position.
+    " Return the number of characters inserted.
+
+python3 << EOF
+import random, string, vim
+# Text has to large from a larger sample in order to avoid errors.
+text = random.sample(
+    (10 * string.ascii_lowercase + string.digits + ' '),
+    random.randint(int(vim.eval('a:low_range')), int(vim.eval('a:high_range'))))
+vim.current.buffer.vars['random_text'] = ''.join(text)
+EOF
+let l:textwidth = &tw
+set tw=0
+execute "normal! i" . b:random_text
+let &tw = l:textwidth
+
+return len(b:random_text)
+
+endfunction " }}}
+
+function! DeleteChars(nchars) " {{{
+    " Delete n chars at cursor position.
+    " It is the inverse of InsertRandomText().
+
+    let l:textwidth = &tw
+    set tw=0
+    execute "normal! " . (repeat('h', a:nchars - 1))
+    execute "normal! " . repeat('x', a:nchars)
+    let &tw = l:textwidth
+
+endfunction " }}}
+
+function! JumpToRandomPosition() " {{{
+" Jump cursor to a random position in current buffer.
+
+python3 << EOF
+import random, vim
+cw = vim.current.window
+cb = vim.current.buffer
+rand_line = random.randint(1, len(cb) - 1)
+rand_line_len = len(cb[rand_line])
+rand_col = random.randint(0, rand_line_len) if rand_line_len > 0 else 0
+cw.cursor = (rand_line, rand_col)
+EOF
+endfunction " }}}
+
+function! DeleteRandomLines(low_range, high_range) " {{{
+" Delete random lines between low_range and high_range.
+" Return the number of lines deleted.
+
+python3 << EOF
+import random, vim
+del_lines = random.randint(
+    int(vim.eval('a:low_range')), int(vim.eval('a:high_range')))
+vim.current.buffer.vars['del_lines'] = del_lines
+EOF
+
+execute "normal! " . b:del_lines . "dd"
+
+return b:del_lines
+
+endfunction "}}}
+
+function! InsertTextAtRandomPositions(ntimes) " {{{
+" Insert text at random positions. May either insert in insert mode or in
+" normal mode.
+
+    let l:total_lines = line('$')
+    for i in range(a:ntimes)
+
+python3 << EOF
+import random, vim
+del_method = random.randint(0, 1)
+vim.current.buffer.vars['del_method'] = del_method
+EOF
+
+        call JumpToRandomPosition()
+        " b:del_method is set to either change the buffer via insert mode or
+        " via normal mode.
+        if b:del_method
+            " This uses insert mode.
+            let l:inserted_chars = InsertRandomText(3, 100)
+            call DeleteChars(l:inserted_chars)
+        else
+            " This uses normal mode.
+            let l:current_line  = getpos('.')[1]
+            let l:deleted_lines = DeleteRandomLines(1, 5)
+            if l:current_line + l:deleted_lines <= l:total_lines
+                execute "normal! P"
+            else
+                execute "normal! p"
+            endif
+        endif
+
+    endfor
+
+endfunction " }}}
diff --git a/tests/test_helpers_vimscript/moving_around.vim b/tests/test_helpers_vimscript/moving_around.vim
diff --git a/tests/test_procedures_vimscript/folding3.vim b/tests/test_procedures_vimscript/folding3.vim
@@ -0,0 +1,66 @@
+" Test that doing (reversible) changes in insert mode or normal mode to a
+" buffer do not alter their folding.
+
+" Load sample python file.
+read ./test_python_sample_code/algorithms.py
+
+" Delete the first line (which is not present in the original file) and save
+" loaded file.
+execute "normal! gg"
+execute "normal! dd"
+noautocmd write!
+
+" Load auxiliary code.
+source ./test_helpers_vimscript/inserting_text.vim
+source ./test_helpers_vimscript/md5sum.vim
+
+" Get original md5sum for script.
+noautocmd write!
+call Md5()
+let s:md5orig = b:calculated_md5
+unlet b:calculated_md5
+
+" Define a convenient function to map line numbers to their folding values.
+function Pymodefoldingfuncref(key, val)
+    let l:retval = pymode#folding#expr(a:val)
+    return l:retval
+endfunction!
+
+
+" Force recomputation of all foldings.
+" TODO: inspect why causes trouble.
+" set fdm=expr
+" set fdm=marker
+" set fdm=expr
+let b:old_fold_vals = map(range(1, line('$')), function('Pymodefoldingfuncref'))
+
+" Change folding in numerous ways.
+call InsertTextAtRandomPositions(10)
+
+" Force recomputation of all foldings.
+" set fdm=expr
+" set fdm=marker
+" set fdm=expr
+let b:new_fold_vals = map(range(1, line('$')), function('Pymodefoldingfuncref'))
+
+" Get original md5sum for script.
+noautocmd write!
+call Md5()
+let s:md5mod = b:calculated_md5
+unlet b:calculated_md5
+
+" echom s:md5orig == s:md5mod
+" echom b:new_fold_vals ==  b:old_fold_vals
+
+" set fdm=expr
+" set fdm=marker
+" set fdm=expr
+
+" Assert changes.
+call assert_equal(s:md5orig, s:md5mod)
+call assert_equal(b:new_fold_vals, b:old_fold_vals)
+if len(v:errors) > 0
+    cquit!
+else
+    quit!
+endif
diff --git a/tests/test_python_sample_code/algorithms.py b/tests/test_python_sample_code/algorithms.py
