From 90455cfa87f84f16179c19241b034abbfa8b3c9a Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 18 Apr 2020 21:56:38 +0200
Subject: [PATCH] patch 8.2.0597: test_eval is old style

Problem:    Test_eval is old style.
Solution:   Change some tests to a new style test.
---
 src/testdir/test_eval.in        |  38 ----------
 src/testdir/test_eval.ok        | Bin 11268 -> 7988 bytes
 src/testdir/test_eval_stuff.vim | 120 ++++++++++++++++++++++++++++++++
 src/version.c                   |   2 +
 4 files changed, 122 insertions(+), 38 deletions(-)

diff --git a/src/testdir/test_eval.in b/src/testdir/test_eval.in
index 3b6144257..e1f4f6de9 100644
--- a/src/testdir/test_eval.in
+++ b/src/testdir/test_eval.in
@@ -36,44 +36,6 @@ endfun
     endtry
 endfun
 :fun Test()
-$put ='{{{1 let tests'
-let @" = 'abc'
-AR "
-let @" = "abc\n"
-AR "
-let @" = "abc\<C-m>"
-AR "
-let @= = '"abc"'
-AR =
-
-$put ='{{{1 Basic setreg tests'
-call SetReg('a', 'abcA', 'c')
-call SetReg('b', 'abcB', 'v')
-call SetReg('c', 'abcC', 'l')
-call SetReg('d', 'abcD', 'V')
-call SetReg('e', 'abcE', 'b')
-call SetReg('f', 'abcF', "\<C-v>")
-call SetReg('g', 'abcG', 'b10')
-call SetReg('h', 'abcH', "\<C-v>10")
-call SetReg('I', 'abcI')
-
-$put ='{{{1 Appending single lines with setreg()'
-call SetReg('A', 'abcAc', 'c')
-call SetReg('A', 'abcAl', 'l')
-call SetReg('A', 'abcAc2','c')
-call SetReg('b', 'abcBc', 'ca')
-call SetReg('b', 'abcBb', 'ba')
-call SetReg('b', 'abcBc2','ca')
-call SetReg('b', 'abcBb2','b50a')
-
-call SetReg('C', 'abcCl', 'l')
-call SetReg('C', 'abcCc', 'c')
-call SetReg('D', 'abcDb', 'b')
-
-call SetReg('E', 'abcEb', 'b')
-call SetReg('E', 'abcEl', 'l')
-call SetReg('F', 'abcFc', 'c')
-
 $put ='{{{1 Appending NL with setreg()'
 call setreg('a', 'abcA2', 'c')
 call setreg('b', 'abcB2', 'v')
diff --git a/src/testdir/test_eval.ok b/src/testdir/test_eval.ok
index ae15c9be80664a86a9eef8c9ee912c8658d37086..cb7c85e254424dccda4ff03df0a4d11b3655bbfa 100644
GIT binary patch
delta 9
QcmZpP*kZT&0*{G202Ma_u>b%7

literal 11268
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
S-{Sdq5y5}m<W?T#(f<L6iY$8o

diff --git a/src/testdir/test_eval_stuff.vim b/src/testdir/test_eval_stuff.vim
index 71b185c57..27ae5539b 100644
--- a/src/testdir/test_eval_stuff.vim
+++ b/src/testdir/test_eval_stuff.vim
@@ -235,4 +235,124 @@ func Test_numbersize()
   call assert_equal(64, v:numbersize)
 endfunc
 
+func Assert_reg(name, type, value, valuestr, expr, exprstr)
+  call assert_equal(a:type, getregtype(a:name))
+  call assert_equal(a:value, getreg(a:name))
+  call assert_equal(a:valuestr, string(getreg(a:name, 0, 1)))
+  call assert_equal(a:expr, getreg(a:name, 1))
+  call assert_equal(a:exprstr, string(getreg(a:name, 1, 1)))
+endfunc
+
+func Test_let_register()
+  let @" = 'abc'
+  call Assert_reg('"', 'v', "abc", "['abc']", "abc", "['abc']")
+  let @" = "abc\n"
+  call Assert_reg('"', 'V', "abc\n", "['abc']", "abc\n", "['abc']")
+  let @" = "abc\<C-m>"
+  call Assert_reg('"', 'V', "abc\r\n", "['abc\r']", "abc\r\n", "['abc\r']")
+  let @= = '"abc"'
+  call Assert_reg('=', 'v', "abc", "['abc']", '"abc"', "['\"abc\"']")
+endfunc
+
+func Assert_regput(name, result)
+  new
+  execute "silent normal! o==\n==\e\"" . a:name . "P"
+  call assert_equal(a:result, getline(2, line('$')))
+endfunc
+
+
+func Test_setreg_basic()
+  call setreg('a', 'abcA', 'c')
+  call Assert_reg('a', 'v', "abcA", "['abcA']", "abcA", "['abcA']")
+  call Assert_regput('a', ['==', '=abcA='])
+
+  call setreg('A', 'abcAc', 'c')
+  call Assert_reg('A', 'v', "abcAabcAc", "['abcAabcAc']", "abcAabcAc", "['abcAabcAc']")
+  call Assert_regput('a', ['==', '=abcAabcAc='])
+
+  call setreg('A', 'abcAl', 'l')
+  call Assert_reg('A', 'V', "abcAabcAcabcAl\n", "['abcAabcAcabcAl']", "abcAabcAcabcAl\n", "['abcAabcAcabcAl']")
+  call Assert_regput('a', ['==', 'abcAabcAcabcAl', '=='])
+
+  call setreg('A', 'abcAc2','c')
+  call Assert_reg('A', 'v', "abcAabcAcabcAl\nabcAc2", "['abcAabcAcabcAl', 'abcAc2']", "abcAabcAcabcAl\nabcAc2", "['abcAabcAcabcAl', 'abcAc2']")
+  call Assert_regput('a', ['==', '=abcAabcAcabcAl', 'abcAc2='])
+
+  call setreg('b', 'abcB', 'v')
+  call Assert_reg('b', 'v', "abcB", "['abcB']", "abcB", "['abcB']")
+  call Assert_regput('b', ['==', '=abcB='])
+
+  call setreg('b', 'abcBc', 'ca')
+  call Assert_reg('b', 'v', "abcBabcBc", "['abcBabcBc']", "abcBabcBc", "['abcBabcBc']")
+  call Assert_regput('b', ['==', '=abcBabcBc='])
+
+  call setreg('b', 'abcBb', 'ba')
+  call Assert_reg('b', "\<C-V>5", "abcBabcBcabcBb", "['abcBabcBcabcBb']", "abcBabcBcabcBb", "['abcBabcBcabcBb']")
+  call Assert_regput('b', ['==', '=abcBabcBcabcBb='])
+
+  call setreg('b', 'abcBc2','ca')
+  call Assert_reg('b', "v", "abcBabcBcabcBb\nabcBc2", "['abcBabcBcabcBb', 'abcBc2']", "abcBabcBcabcBb\nabcBc2", "['abcBabcBcabcBb', 'abcBc2']")
+  call Assert_regput('b', ['==', '=abcBabcBcabcBb', 'abcBc2='])
+
+  call setreg('b', 'abcBb2','b50a')
+  call Assert_reg('b', "\<C-V>50", "abcBabcBcabcBb\nabcBc2abcBb2", "['abcBabcBcabcBb', 'abcBc2abcBb2']", "abcBabcBcabcBb\nabcBc2abcBb2", "['abcBabcBcabcBb', 'abcBc2abcBb2']")
+  call Assert_regput('b', ['==', '=abcBabcBcabcBb                                    =', ' abcBc2abcBb2'])
+
+  call setreg('c', 'abcC', 'l')
+  call Assert_reg('c', 'V', "abcC\n", "['abcC']", "abcC\n", "['abcC']")
+  call Assert_regput('c', ['==', 'abcC', '=='])
+
+  call setreg('C', 'abcCl', 'l')
+  call Assert_reg('C', 'V', "abcC\nabcCl\n", "['abcC', 'abcCl']", "abcC\nabcCl\n", "['abcC', 'abcCl']")
+  call Assert_regput('c', ['==', 'abcC', 'abcCl', '=='])
+
+  call setreg('C', 'abcCc', 'c')
+  call Assert_reg('C', 'v', "abcC\nabcCl\nabcCc", "['abcC', 'abcCl', 'abcCc']", "abcC\nabcCl\nabcCc", "['abcC', 'abcCl', 'abcCc']")
+  call Assert_regput('c', ['==', '=abcC', 'abcCl', 'abcCc='])
+
+  call setreg('d', 'abcD', 'V')
+  call Assert_reg('d', 'V', "abcD\n", "['abcD']", "abcD\n", "['abcD']")
+  call Assert_regput('d', ['==', 'abcD', '=='])
+
+  call setreg('D', 'abcDb', 'b')
+  call Assert_reg('d', "\<C-V>5", "abcD\nabcDb", "['abcD', 'abcDb']", "abcD\nabcDb", "['abcD', 'abcDb']")
+  call Assert_regput('d', ['==', '=abcD =', ' abcDb'])
+
+  call setreg('e', 'abcE', 'b')
+  call Assert_reg('e', "\<C-V>4", "abcE", "['abcE']", "abcE", "['abcE']")
+  call Assert_regput('e', ['==', '=abcE='])
+
+  call setreg('E', 'abcEb', 'b')
+  call Assert_reg('E', "\<C-V>5", "abcE\nabcEb", "['abcE', 'abcEb']", "abcE\nabcEb", "['abcE', 'abcEb']")
+  call Assert_regput('e', ['==', '=abcE =', ' abcEb'])
+
+  call setreg('E', 'abcEl', 'l')
+  call Assert_reg('E', "V", "abcE\nabcEb\nabcEl\n", "['abcE', 'abcEb', 'abcEl']", "abcE\nabcEb\nabcEl\n", "['abcE', 'abcEb', 'abcEl']")
+  call Assert_regput('e', ['==', 'abcE', 'abcEb', 'abcEl', '=='])
+
+  call setreg('f', 'abcF', "\<C-v>")
+  call Assert_reg('f', "\<C-V>4", "abcF", "['abcF']", "abcF", "['abcF']")
+  call Assert_regput('f', ['==', '=abcF='])
+
+  call setreg('F', 'abcFc', 'c')
+  call Assert_reg('F', "v", "abcF\nabcFc", "['abcF', 'abcFc']", "abcF\nabcFc", "['abcF', 'abcFc']")
+  call Assert_regput('f', ['==', '=abcF', 'abcFc='])
+
+  call setreg('g', 'abcG', 'b10')
+  call Assert_reg('g', "\<C-V>10", "abcG", "['abcG']", "abcG", "['abcG']")
+  call Assert_regput('g', ['==', '=abcG      ='])
+
+  call setreg('h', 'abcH', "\<C-v>10")
+  call Assert_reg('h', "\<C-V>10", "abcH", "['abcH']", "abcH", "['abcH']")
+  call Assert_regput('h', ['==', '=abcH      ='])
+
+  call setreg('I', 'abcI')
+  call Assert_reg('I', "v", "abcI", "['abcI']", "abcI", "['abcI']")
+  call Assert_regput('I', ['==', '=abcI='])
+endfunc
+
+func Test_setreg_append_NL()
+endfunc
+
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index bac1ac328..075f4db26 100644
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    597,
 /**/
     596,
 /**/
-- 
2.40.0