From d8de4eb685e35646c7d541e9a75bdc296127b7e2 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 17 Sep 2021 09:16:40 -0700
Subject: test: reorg #15698
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Problem:
Subdirectories like "visual", "insert", "normal" encourage people to
separate *related* tests for no good reason.  Typically the _mode_ is
not the relevant topic of a test (and when it is, _then_ create
an appropriate describe() or it()).

Solution:
- Delete the various `test/functional/<mode>/` subdirectories, move
  their tests to more meaningful topics.
- Rename `…/normal/` to `…/editor/`.
  - Move or merge `…/visual/*` and `…/insert/*` tests into here where
    appropriate.
- Rename `…/eval/` to `…/vimscript/`.
  - Move `…/viml/*` into here also.

* test(reorg): insert/* => editor/mode_insert_spec.lua
* test(reorg): cmdline/* => editor/mode_cmdline_spec.lua
* test(reorg): eval core tests => eval_spec.lua
---
 test/functional/insert/ctrl_o_spec.lua | 54 ----------------------------------
 test/functional/insert/ctrl_r_spec.lua | 19 ------------
 test/functional/insert/insert_spec.lua | 47 -----------------------------
 3 files changed, 120 deletions(-)
 delete mode 100644 test/functional/insert/ctrl_o_spec.lua
 delete mode 100644 test/functional/insert/ctrl_r_spec.lua
 delete mode 100644 test/functional/insert/insert_spec.lua

(limited to 'test/functional/insert')

diff --git a/test/functional/insert/ctrl_o_spec.lua b/test/functional/insert/ctrl_o_spec.lua
deleted file mode 100644
index 011954fa9d..0000000000
--- a/test/functional/insert/ctrl_o_spec.lua
+++ /dev/null
@@ -1,54 +0,0 @@
-local helpers = require('test.functional.helpers')(after_each)
-local clear = helpers.clear
-local eq = helpers.eq
-local eval = helpers.eval
-local expect = helpers.expect
-local feed = helpers.feed
-local insert = helpers.insert
-local meths = helpers.meths
-
-describe('insert-mode Ctrl-O', function()
-  before_each(clear)
-
-  it('enters command mode for one command', function()
-    feed('ihello world<C-o>')
-    feed(':let ctrlo = "test"<CR>')
-    feed('iii')
-    expect('hello worldiii')
-    eq(1, eval('ctrlo ==# "test"'))
-  end)
-
-  it('re-enters insert mode at the end of the line when running startinsert', function()
-    -- #6962
-    feed('ihello world<C-o>')
-    feed(':startinsert<CR>')
-    feed('iii')
-    expect('hello worldiii')
-  end)
-
-  it('re-enters insert mode at the beginning of the line when running startinsert', function()
-    insert('hello world')
-    feed('0<C-o>')
-    feed(':startinsert<CR>')
-    feed('aaa')
-    expect('aaahello world')
-  end)
-
-  it('re-enters insert mode in the middle of the line when running startinsert', function()
-    insert('hello world')
-    feed('bi<C-o>')
-    feed(':startinsert<CR>')
-    feed('ooo')
-    expect('hello oooworld')
-  end)
-
-  it("doesn't cancel Ctrl-O mode when processing event", function()
-    feed('iHello World<c-o>')
-    eq({mode='niI', blocking=false}, meths.get_mode()) -- fast event
-    eq(2, eval('1+1'))  -- causes K_EVENT key
-    eq({mode='niI', blocking=false}, meths.get_mode()) -- still in ctrl-o mode
-    feed('dd')
-    eq({mode='i', blocking=false}, meths.get_mode()) -- left ctrl-o mode
-    expect('') -- executed the command
-  end)
-end)
diff --git a/test/functional/insert/ctrl_r_spec.lua b/test/functional/insert/ctrl_r_spec.lua
deleted file mode 100644
index adc3c4b406..0000000000
--- a/test/functional/insert/ctrl_r_spec.lua
+++ /dev/null
@@ -1,19 +0,0 @@
-local helpers = require('test.functional.helpers')(after_each)
-local clear, feed = helpers.clear, helpers.feed
-local expect, command = helpers.expect, helpers.command
-
-describe('insert-mode Ctrl-R', function()
-  before_each(clear)
-
-  it('works', function()
-    command("let @@ = 'test'")
-    feed('i<C-r>"')
-    expect('test')
-  end)
-
-  it('works with multi-byte text', function()
-    command("let @@ = 'påskägg'")
-    feed('i<C-r>"')
-    expect('påskägg')
-  end)
-end)
diff --git a/test/functional/insert/insert_spec.lua b/test/functional/insert/insert_spec.lua
deleted file mode 100644
index 330cfbd830..0000000000
--- a/test/functional/insert/insert_spec.lua
+++ /dev/null
@@ -1,47 +0,0 @@
-local helpers = require('test.functional.helpers')(after_each)
-local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
-local command = helpers.command
-local eq = helpers.eq
-local expect = helpers.expect
-local funcs = helpers.funcs
-
-describe('insert-mode', function()
-  before_each(function()
-    clear()
-  end)
-
-  it('CTRL-@', function()
-    -- Inserts last-inserted text, leaves insert-mode.
-    insert('hello')
-    feed('i<C-@>x')
-    expect('hellhello')
-
-    -- C-Space is the same as C-@.
-    -- CTRL-SPC inserts last-inserted text, leaves insert-mode.
-    feed('i<C-Space>x')
-    expect('hellhellhello')
-
-    -- CTRL-A inserts last inserted text
-    feed('i<C-A>x')
-    expect('hellhellhellhelloxo')
-  end)
-
-  it('ALT/META #8213', function()
-    -- Mapped ALT-chord behaves as mapped.
-    command('inoremap <M-l> meta-l')
-    command('inoremap <A-j> alt-j')
-    feed('i<M-l> xxx <A-j><M-h>a<A-h>')
-    expect('meta-l xxx alt-j')
-    eq({ 0, 1, 14, 0, }, funcs.getpos('.'))
-    -- Unmapped ALT-chord behaves as ESC+c.
-    command('iunmap <M-l>')
-    feed('0i<M-l>')
-    eq({ 0, 1, 2, 0, }, funcs.getpos('.'))
-    -- Unmapped ALT-chord has same `undo` characteristics as ESC+<key>
-    command('0,$d')
-    feed('ahello<M-.>')
-    expect('hellohello')
-    feed('u')
-    expect('hello')
-  end)
-end)
-- 
cgit