aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorerw7 <erw7.github@gmail.com>2020-03-12 12:16:10 +0900
committerJames McCoy <jamessan@jamessan.com>2020-11-20 09:26:17 -0500
commit6c1e1fe772f99ab655402e92f14b782867b35eec (patch)
tree224f57b4116719a606ab6c089821a9b196d7764c
parent8923a3df83aebb1e779240c461a5bcc46c62d74e (diff)
downloadrneovim-6c1e1fe772f99ab655402e92f14b782867b35eec.tar.gz
rneovim-6c1e1fe772f99ab655402e92f14b782867b35eec.tar.bz2
rneovim-6c1e1fe772f99ab655402e92f14b782867b35eec.zip
test,unit: Change test according to change of bg color response processing
Adjust the test for handle_background_color() according to bd0275182b1c1b14c43dc4fc7e9f9da05071e56c.
-rw-r--r--src/nvim/tui/input.c4
-rw-r--r--src/nvim/tui/input.h8
-rw-r--r--test/unit/tui_spec.lua43
3 files changed, 47 insertions, 8 deletions
diff --git a/src/nvim/tui/input.c b/src/nvim/tui/input.c
index 2c9c8b78f3..124f96e039 100644
--- a/src/nvim/tui/input.c
+++ b/src/nvim/tui/input.c
@@ -22,11 +22,13 @@
#define KEY_BUFFER_SIZE 0xfff
+#ifndef UNIT_TESTING
typedef enum {
kIncomplete = -1,
kNotApplicable = 0,
kComplete = 1,
} HandleState;
+#endif
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "tui/input.c.generated.h"
@@ -547,7 +549,7 @@ static HandleState handle_background_color(TermInput *input)
return kComplete;
}
#ifdef UNIT_TESTING
-bool ut_handle_background_color(TermInput *input)
+HandleState ut_handle_background_color(TermInput *input)
{
return handle_background_color(input);
}
diff --git a/src/nvim/tui/input.h b/src/nvim/tui/input.h
index b30546c815..ed76455189 100644
--- a/src/nvim/tui/input.h
+++ b/src/nvim/tui/input.h
@@ -32,7 +32,13 @@ typedef struct term_input {
#endif
#ifdef UNIT_TESTING
-bool ut_handle_background_color(TermInput *input);
+typedef enum {
+ kIncomplete = -1,
+ kNotApplicable = 0,
+ kComplete = 1,
+} HandleState;
+
+HandleState ut_handle_background_color(TermInput *input);
#endif
#endif // NVIM_TUI_INPUT_H
diff --git a/test/unit/tui_spec.lua b/test/unit/tui_spec.lua
index e6b5c889d7..36ce4a1493 100644
--- a/test/unit/tui_spec.lua
+++ b/test/unit/tui_spec.lua
@@ -14,10 +14,13 @@ itp('handle_background_color', function()
local handle_background_color = cinput.ut_handle_background_color
local term_input = ffi.new('TermInput', {})
local events = globals.main_loop.thread_events
+ local kIncomplete = cinput.kIncomplete
+ local kNotApplicable = cinput.kNotApplicable
+ local kComplete = cinput.kComplete
-- Short-circuit when not waiting for response.
term_input.waiting_for_bg_response = 0
- eq(false, handle_background_color(term_input))
+ eq(kNotApplicable, handle_background_color(term_input))
local capacity = 100
local rbuf = ffi.gc(rbuffer.rbuffer_new(capacity), rbuffer.rbuffer_free)
@@ -28,7 +31,7 @@ itp('handle_background_color', function()
rbuffer.rbuffer_write(rbuf, to_cstr(term_response), #term_response)
term_input.waiting_for_bg_response = 1
- eq(true, handle_background_color(term_input))
+ eq(kComplete, handle_background_color(term_input))
eq(0, term_input.waiting_for_bg_response)
eq(1, multiqueue.multiqueue_size(events))
@@ -97,14 +100,42 @@ itp('handle_background_color', function()
assert_bg('rgba', 'f/f/f/f', 'light')
- -- Incomplete sequence: not necessarily correct behavior, but tests it.
+ -- Incomplete sequence: necessarily correct behavior.
local term_response = '\027]11;rgba:f/f/f/f' -- missing '\007
rbuffer.rbuffer_write(rbuf, to_cstr(term_response), #term_response)
term_input.waiting_for_bg_response = 1
- eq(false, handle_background_color(term_input))
+ eq(kIncomplete, handle_background_color(term_input))
+ eq(1, term_input.waiting_for_bg_response)
+ eq(#term_response, rbuf.size)
+
+ term_response = '\007'
+ rbuffer.rbuffer_write(rbuf, to_cstr(term_response), #term_response)
+ eq(kComplete, handle_background_color(term_input))
+ eq(0, term_input.waiting_for_bg_response)
+
+ local event = multiqueue.multiqueue_get(events)
+ local bg_event = ffi.cast("Event*", event.argv[1])
+ eq('light', ffi.string(bg_event.argv[0]))
+ eq(0, multiqueue.multiqueue_size(events))
+ eq(0, rbuf.size)
+
+ term_response = '\027]11;rg'
+ rbuffer.rbuffer_write(rbuf, to_cstr(term_response), #term_response)
+
+ term_input.waiting_for_bg_response = 1
+ eq(kIncomplete, handle_background_color(term_input))
+ eq(1, term_input.waiting_for_bg_response)
+ eq(#term_response, rbuf.size)
+
+ term_response = 'ba:f/f/f/f\007'
+ rbuffer.rbuffer_write(rbuf, to_cstr(term_response), #term_response)
+ eq(kComplete, handle_background_color(term_input))
eq(0, term_input.waiting_for_bg_response)
+ event = multiqueue.multiqueue_get(events)
+ bg_event = ffi.cast("Event*", event.argv[1])
+ eq('light', ffi.string(bg_event.argv[0]))
eq(0, multiqueue.multiqueue_size(events))
eq(0, rbuf.size)
@@ -114,7 +145,7 @@ itp('handle_background_color', function()
rbuffer.rbuffer_write(rbuf, to_cstr(term_response), #term_response)
term_input.waiting_for_bg_response = 3
- eq(false, handle_background_color(term_input))
+ eq(kNotApplicable, handle_background_color(term_input))
eq(2, term_input.waiting_for_bg_response)
eq(0, multiqueue.multiqueue_size(events))
@@ -127,7 +158,7 @@ itp('handle_background_color', function()
rbuffer.rbuffer_write(rbuf, to_cstr(term_response), #term_response)
term_input.waiting_for_bg_response = 1
- eq(true, handle_background_color(term_input))
+ eq(kComplete, handle_background_color(term_input))
eq(0, term_input.waiting_for_bg_response)
eq(1, multiqueue.multiqueue_size(events))