Merge PR #3029 'Refactor event processing architecture'

Helped-by: oni-link <knil.ino@gmail.com>
Reviewed-by: oni-link <knil.ino@gmail.com>

4 files changed, 144 insertions, 0 deletions

diff --git a/test/functional/clipboard/clipboard_provider_spec.lua b/test/functional/clipboard/clipboard_provider_spec.lua
index 30903e8b57..0550d22fa6 100644
--- a/test/functional/clipboard/clipboard_provider_spec.lua
+++ b/test/functional/clipboard/clipboard_provider_spec.lua
@@ -369,6 +369,7 @@ describe('clipboard usage', function()
       [2] = {foreground = Screen.colors.Blue},
       [3] = {bold = true, foreground = Screen.colors.SeaGreen}},
       {{bold = true, foreground = Screen.colors.Blue}})
+    feed('<cr>') -- clear out of Press ENTER screen
   end)
 
   it('can paste "* to the commandline', function()
diff --git a/test/unit/fixtures/queue.c b/test/unit/fixtures/queue.c
new file mode 100644
index 0000000000..bbb6274b21
--- /dev/null
+++ b/test/unit/fixtures/queue.c
@@ -0,0 +1,16 @@
+#include <string.h>
+#include <stdlib.h>
+#include "nvim/event/queue.h"
+#include "queue.h"
+
+
+void ut_queue_put(Queue *queue, const char *str)
+{
+  queue_put(queue, NULL, 1, str);
+}
+
+const char *ut_queue_get(Queue *queue)
+{
+  Event event = queue_get(queue);
+  return event.argv[0];
+}
diff --git a/test/unit/fixtures/queue.h b/test/unit/fixtures/queue.h
new file mode 100644
index 0000000000..ae949c9f29
--- /dev/null
+++ b/test/unit/fixtures/queue.h
@@ -0,0 +1,4 @@
+#include "nvim/event/queue.h"
+
+void ut_queue_put(Queue *queue, const char *str);
+const char *ut_queue_get(Queue *queue);
diff --git a/test/unit/queue_spec.lua b/test/unit/queue_spec.lua
new file mode 100644
index 0000000000..9326c1cad6
--- /dev/null
+++ b/test/unit/queue_spec.lua
@@ -0,0 +1,123 @@
+local helpers = require("test.unit.helpers")
+
+local ffi     = helpers.ffi
+local eq      = helpers.eq
+
+local queue = helpers.cimport("./test/unit/fixtures/queue.h")
+
+describe('queue', function()
+  local parent, child1, child2, child3
+
+  local function put(q, str)
+    queue.ut_queue_put(q, str)
+  end
+
+  local function get(q)
+    return ffi.string(queue.ut_queue_get(q))
+  end
+
+  local function free(q)
+    queue.queue_free(q)
+  end
+
+  before_each(function()
+    parent = queue.queue_new_parent(ffi.NULL, ffi.NULL)
+    child1 = queue.queue_new_child(parent)
+    child2 = queue.queue_new_child(parent)
+    child3 = queue.queue_new_child(parent)
+    put(child1, 'c1i1')
+    put(child1, 'c1i2')
+    put(child2, 'c2i1')
+    put(child1, 'c1i3')
+    put(child2, 'c2i2')
+    put(child2, 'c2i3')
+    put(child2, 'c2i4')
+    put(child3, 'c3i1')
+    put(child3, 'c3i2')
+  end)
+
+  it('removing from parent removes from child', function()
+    eq('c1i1', get(parent))
+    eq('c1i2', get(parent))
+    eq('c2i1', get(parent))
+    eq('c1i3', get(parent))
+    eq('c2i2', get(parent))
+    eq('c2i3', get(parent))
+    eq('c2i4', get(parent))
+  end)
+
+  it('removing from child removes from parent', function()
+    eq('c2i1', get(child2))
+    eq('c2i2', get(child2))
+    eq('c1i1', get(child1))
+    eq('c1i2', get(parent))
+    eq('c1i3', get(parent))
+    eq('c2i3', get(parent))
+    eq('c2i4', get(parent))
+  end)
+
+  it('removing from child at the beginning of parent', function()
+    eq('c1i1', get(child1))
+    eq('c1i2', get(child1))
+    eq('c2i1', get(parent))
+  end)
+
+  it('removing from parent after get from parent and put to child', function()
+    eq('c1i1', get(parent))
+    eq('c1i2', get(parent))
+    eq('c2i1', get(parent))
+    eq('c1i3', get(parent))
+    eq('c2i2', get(parent))
+    eq('c2i3', get(parent))
+    eq('c2i4', get(parent))
+    eq('c3i1', get(parent))
+    put(child1, 'c1i11')
+    put(child1, 'c1i22')
+    eq('c3i2', get(parent))
+    eq('c1i11', get(parent))
+    eq('c1i22', get(parent))
+  end)
+
+  it('removing from parent after get and put to child', function()
+    eq('c1i1', get(child1))
+    eq('c1i2', get(child1))
+    eq('c2i1', get(child2))
+    eq('c1i3', get(child1))
+    eq('c2i2', get(child2))
+    eq('c2i3', get(child2))
+    eq('c2i4', get(child2))
+    eq('c3i1', get(child3))
+    eq('c3i2', get(parent))
+    put(child1, 'c1i11')
+    put(child2, 'c2i11')
+    put(child1, 'c1i12')
+    eq('c2i11', get(child2))
+    eq('c1i11', get(parent))
+    eq('c1i12', get(parent))
+  end)
+
+  it('put after removing from child at the end of parent', function()
+    eq('c3i1', get(child3))
+    eq('c3i2', get(child3))
+    put(child1, 'c1i11')
+    put(child2, 'c2i11')
+    eq('c1i1', get(parent))
+    eq('c1i2', get(parent))
+    eq('c2i1', get(parent))
+    eq('c1i3', get(parent))
+    eq('c2i2', get(parent))
+    eq('c2i3', get(parent))
+    eq('c2i4', get(parent))
+    eq('c1i11', get(parent))
+    eq('c2i11', get(parent))
+  end)
+
+  it('removes from parent queue when child is freed', function()
+    free(child2)
+    eq('c1i1', get(parent))
+    eq('c1i2', get(parent))
+    eq('c1i3', get(parent))
+    eq('c3i1', get(child3))
+    eq('c3i2', get(child3))
+  end)
+end)