To: vim_dev@googlegroups.com
Subject: Patch 8.2.2161
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.2161
Problem:    Arguments -T and -x not tested yet.
Solution:   Add a test. (Dominique Pellé, closes #7490
Files:      src/testdir/test_startup.vim


*** ../vim-8.2.2160/src/testdir/test_startup.vim	2020-10-04 16:16:50.919838655 +0200
--- src/testdir/test_startup.vim	2020-12-19 13:19:48.127478598 +0100
***************
*** 741,746 ****
--- 741,793 ----
    call delete('Xfile1')
  endfunc
  
+ " Test the '-T' argument which sets the 'term' option.
+ func Test_T_arg()
+   CheckNotGui
+   let after =<< trim [CODE]
+     call writefile([&term], "Xtest_T_arg")
+     qall
+   [CODE]
+ 
+   for t in ['builtin_dumb', 'builtin_ansi']
+     if RunVim([], after, '-T ' .. t)
+       let lines = readfile('Xtest_T_arg')
+       call assert_equal([t], lines)
+     endif
+   endfor
+ 
+   call delete('Xtest_T_arg')
+ endfunc
+ 
+ " Test the '-x' argument to read/write encrypted files.
+ func Test_x_arg()
+   CheckRunVimInTerminal
+   CheckFeature cryptv
+ 
+   " Create an encrypted file Xtest_x_arg.
+   let buf = RunVimInTerminal('-n -x Xtest_x_arg', #{rows: 10, wait_for_ruler: 0})
+   call WaitForAssert({-> assert_match('^Enter encryption key: ', term_getline(buf, 10))})
+   call term_sendkeys(buf, "foo\n")
+   call WaitForAssert({-> assert_match('^Enter same key again: ', term_getline(buf, 10))})
+   call term_sendkeys(buf, "foo\n")
+   call WaitForAssert({-> assert_match(' All$', term_getline(buf, 10))})
+   call term_sendkeys(buf, "itest\<Esc>:w\<Enter>")
+   call WaitForAssert({-> assert_match('"Xtest_x_arg" \[New\]\[blowfish2\] 1L, 5B written',
+         \            term_getline(buf, 10))})
+   call StopVimInTerminal(buf)
+ 
+   " Read the encrypted file and check that it contains the expected content "test"
+   let buf = RunVimInTerminal('-n -x Xtest_x_arg', #{rows: 10, wait_for_ruler: 0})
+   call WaitForAssert({-> assert_match('^Enter encryption key: ', term_getline(buf, 10))})
+   call term_sendkeys(buf, "foo\n")
+   call WaitForAssert({-> assert_match('^Enter same key again: ', term_getline(buf, 10))})
+   call term_sendkeys(buf, "foo\n")
+   call WaitForAssert({-> assert_match('^test', term_getline(buf, 1))})
+   call StopVimInTerminal(buf)
+ 
+   call delete('Xtest_x_arg')
+ endfunc
+ 
  " Test for entering the insert mode on startup
  func Test_start_insertmode()
    let before =<< trim [CODE]
*** ../vim-8.2.2160/src/version.c	2020-12-18 19:49:52.353571824 +0100
--- src/version.c	2020-12-19 13:19:42.579497933 +0100
***************
*** 752,753 ****
--- 752,755 ----
  {   /* Add new patch number below this line */
+ /**/
+     2161,
  /**/

-- 
BEDEVERE: Wait.  Wait ... tell me, what also floats on water?
ALL:      Bread?  No, no, no.  Apples .... gravy ... very small rocks ...
ARTHUR:   A duck.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///