commit 021b593e7ed6c7111cbf189744ad1e5d6c4a7d79
author Bram Moolenaar <Bram@vim.org> Sun Jan 17 22:05:48 2016 +0100
committer Bram Moolenaar <Bram@vim.org> Sun Jan 17 22:05:48 2016 +0100
tree d9c852649d2d23b90b14f372e635f3cf36945f26
parent c970330676eaae7ba7cd05cfa46df5a413853ef9

patch 7.4.1127
Problem:    Both old and new style tests for Perl.
Solution:   Merge the old tests with the new style tests.

src/testdir/Make_all.mak

diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index 583bf0b..33d76ba 100644
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -113,7 +113,6 @@
 	test_match_conceal.out \
 	test_nested_function.out \
 	test_options.out \
-	test_perl.out \
 	test_qf_title.out \
 	test_ruby.out \
 	test_search_mbyte.out \

src/testdir/test_perl.in

diff --git a/src/testdir/test_perl.in b/src/testdir/test_perl.in
deleted file mode 100644
index c028606..0000000
--- a/src/testdir/test_perl.in
+++ /dev/null
@@ -1,26 +0,0 @@
-Tests for perl interface.     vim: set ft=vim :
-
-STARTTEST
-:so small.vim
-:set nocompatible viminfo+=nviminfo
-:if !has('perl') | e! test.ok | wq! test.out | endif
-:" change buffer contents
-:perl VIM::DoCommand("normal /^1\n")
-:perl $curline = VIM::Eval("line('.')")
-:perl $curbuf->Set($curline, "1 changed line 1")
-:" evaluate a List
-:perl VIM::DoCommand("normal /^2\n")
-:perl $curline = VIM::Eval("line('.')")
-:let l = ["abc", "def"]
-:perl << EOF
-$l = VIM::Eval("l");
-$curbuf->Append($curline, $l);
-EOF
-:normal j
-:.perldo s|\n|/|g
-:?^1?,$w! test.out
-:qa!
-ENDTEST
-
-1 line 1
-2 line 2

src/testdir/test_perl.ok

diff --git a/src/testdir/test_perl.ok b/src/testdir/test_perl.ok
deleted file mode 100644
index 432cdd9..0000000
--- a/src/testdir/test_perl.ok
+++ /dev/null
@@ -1,3 +0,0 @@
-1 changed line 1
-2 line 2
-abc/def/

src/testdir/test_perl.vim

diff --git a/src/testdir/test_perl.vim b/src/testdir/test_perl.vim
index 3741fc7..79e24f4 100644
--- a/src/testdir/test_perl.vim
+++ b/src/testdir/test_perl.vim
@@ -4,7 +4,27 @@
   finish
 end
 
-set nocp viminfo+=nviminfo
+func Test_change_buffer()
+  call setline(line('$'), ['1 line 1'])
+  perl VIM::DoCommand("normal /^1\n")
+  perl $curline = VIM::Eval("line('.')")
+  perl $curbuf->Set($curline, "1 changed line 1")
+  call assert_equal('1 changed line 1', getline('$'))
+endfunc
+
+func Test_evaluate_list()
+  call setline(line('$'), ['2 line 2'])
+  perl VIM::DoCommand("normal /^2\n")
+  perl $curline = VIM::Eval("line('.')")
+  let l = ["abc", "def"]
+  perl << EOF
+  $l = VIM::Eval("l");
+  $curbuf->Append($curline, $l);
+EOF
+  normal j
+  .perldo s|\n|/|g
+  call assert_equal('abc/def/', getline('$'))
+endfunc
 
 fu <SID>catch_peval(expr)
   try