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 3b61442577..e1f4f6de9f 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
Qc-m`;*kZT&0*{G202Ma_u>b%7

literal 11268
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

diff --git a/src/testdir/test_eval_stuff.vim b/src/testdir/test_eval_stuff.vim
index 71b185c57a..27ae5539b2 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 bac1ac328d..075f4db269 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.47.3