1 files changed, 43 insertions, 20 deletions
diff --git a/src/testdir/test_loadplugin.vim b/src/testdir/test_loadplugin.vim
index 25c671538..431dd4a45 100644
--- a/src/testdir/test_loadplugin.vim
+++ b/src/testdir/test_loadplugin.vim
@@ -1,25 +1,48 @@
 " Tests for :loadplugin
 
+func SetUp()
+  let s:topdir = expand('%:h') . '/Xdir'
+  exe 'set packpath=' . s:topdir
+  let s:plugdir = s:topdir . '/pack/mine/opt/mytest'
+endfunc
+
+func TearDown()
+  call delete(s:topdir, 'rf')
+endfunc
+
 func Test_loadplugin()
-  let topdir = expand('%:h') . '/Xdir'
-  exe 'set packpath=' . topdir
-  let plugdir = topdir . '/pack/mine/opt/mytest'
-  call mkdir(plugdir . '/plugin', 'p')
-  call mkdir(plugdir . '/ftdetect', 'p')
+  call mkdir(s:plugdir . '/plugin', 'p')
+  call mkdir(s:plugdir . '/ftdetect', 'p')
+  set rtp&
+  let rtp = &rtp
   filetype on
-  try
-    exe 'split ' . plugdir . '/plugin/test.vim'
-    call setline(1, 'let g:plugin_works = 42')
-    wq
-
-    exe 'split ' . plugdir . '/ftdetect/test.vim'
-    call setline(1, 'let g:ftdetect_works = 17')
-    wq
-
-    loadplugin mytest
-    call assert_true(42, g:plugin_works)
-    call assert_true(17, g:ftdetect_works)
-  finally
-    call delete(topdir, 'rf')
-  endtry
+
+  exe 'split ' . s:plugdir . '/plugin/test.vim'
+  call setline(1, 'let g:plugin_works = 42')
+  wq
+
+  exe 'split ' . s:plugdir . '/ftdetect/test.vim'
+  call setline(1, 'let g:ftdetect_works = 17')
+  wq
+
+  loadplugin mytest
+
+  call assert_equal(42, g:plugin_works)
+  call assert_equal(17, g:ftdetect_works)
+  call assert_true(len(&rtp) > len(rtp))
+  call assert_true(&rtp =~ 'testdir/Xdir/pack/mine/opt/mytest\($\|,\)')
+endfunc
+
+func Test_packadd()
+  call mkdir(s:plugdir . '/syntax', 'p')
+  set rtp&
+  let rtp = &rtp
+  packadd mytest
+  call assert_true(len(&rtp) > len(rtp))
+  call assert_true(&rtp =~ 'testdir/Xdir/pack/mine/opt/mytest\($\|,\)')
+
+  " check the path is not added twice
+  let new_rtp = &rtp
+  packadd mytest
+  call assert_equal(new_rtp, &rtp)
 endfunc