test: one engine pump and one preedit check for the white-box suites
server_test, ibus_test and xim_adapter_test each ran their own copy of the same alt loop that stands in for imthread, and two of them had private checkstr/checkenginepreedit variants. test_util.c now provides Pump (trace, optional hold on a chosen op, stop) in its own proc so a test may block in socket I/O while the engine runs, and test.h declares the engine hooks once; every .c includes dat.h and fn.h itself as the rest of the tree does. server_test's three copies of fixture setup and teardown became serverbegin/serverend.
This commit is contained in:
@@ -85,7 +85,7 @@ static int wireflush(xcb_connection_t*);
|
||||
#undef xcb_translate_coordinates
|
||||
#undef xcb_translate_coordinates_reply
|
||||
#undef xcb_flush
|
||||
#include "cutest/cutest.h"
|
||||
#include "test.h"
|
||||
|
||||
enum
|
||||
{
|
||||
@@ -384,22 +384,11 @@ testkeystate(char *layout)
|
||||
return state;
|
||||
}
|
||||
|
||||
void testengineinit(int);
|
||||
void testenginehandle(Keyreq*);
|
||||
void* testengineowner(void);
|
||||
void testenginepreedit(Str*);
|
||||
|
||||
typedef struct Ximfix Ximfix;
|
||||
struct Ximfix
|
||||
{
|
||||
Channel *oldreply;
|
||||
Channel *trace;
|
||||
Channel *stop;
|
||||
Channel *done;
|
||||
Channel *waiting;
|
||||
Channel *ack;
|
||||
int holdrelease;
|
||||
int pumpactive;
|
||||
Pump pump;
|
||||
};
|
||||
|
||||
typedef struct Freejob Freejob;
|
||||
@@ -409,37 +398,6 @@ struct Freejob
|
||||
Channel *done;
|
||||
};
|
||||
|
||||
static void
|
||||
enginepump(void *arg)
|
||||
{
|
||||
Ximfix *f;
|
||||
Keyreq req;
|
||||
uchar token;
|
||||
Alt alts[] = {
|
||||
{keyc, &req, CHANRCV, nil},
|
||||
{nil, &token, CHANRCV, nil},
|
||||
{nil, nil, CHANEND, nil},
|
||||
};
|
||||
|
||||
f = arg;
|
||||
alts[1].c = f->stop;
|
||||
for(;;)
|
||||
switch(alt(alts)){
|
||||
case 0:
|
||||
chansend(f->trace, &req);
|
||||
if(f->holdrelease && req.op == Keyrelease){
|
||||
token = 0;
|
||||
chansend(f->waiting, &token);
|
||||
chanrecv(f->ack, &token);
|
||||
}
|
||||
testenginehandle(&req);
|
||||
break;
|
||||
case 1:
|
||||
chansend(f->done, &token);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
static int
|
||||
ximbegin(struct ct *t, Ximfix *f, int lang)
|
||||
{
|
||||
@@ -451,38 +409,22 @@ ximbegin(struct ct *t, Ximfix *f, int lang)
|
||||
testengineinit(lang);
|
||||
f->oldreply = replyc;
|
||||
replyc = chancreate(sizeof(Keyres), 0);
|
||||
f->trace = chancreate(sizeof(Keyreq), 16);
|
||||
f->stop = chancreate(sizeof(uchar), 0);
|
||||
f->done = chancreate(sizeof(uchar), 0);
|
||||
f->waiting = chancreate(sizeof(uchar), 0);
|
||||
f->ack = chancreate(sizeof(uchar), 0);
|
||||
f->pumpactive = threadcreate(enginepump, f, 8192) >= 0;
|
||||
return CT_CHECK(t, replyc != nil && f->trace != nil &&
|
||||
f->stop != nil && f->done != nil && f->waiting != nil &&
|
||||
f->ack != nil && f->pumpactive);
|
||||
pumpstart(&f->pump, 16);
|
||||
USED(t);
|
||||
return 1;
|
||||
}
|
||||
|
||||
static void
|
||||
ximend(Ximfix *f)
|
||||
{
|
||||
Drawcmd dc;
|
||||
uchar token;
|
||||
|
||||
if(f->pumpactive){
|
||||
token = 0;
|
||||
chansend(f->stop, &token);
|
||||
chanrecv(f->done, &token);
|
||||
}
|
||||
pumpstop(&f->pump);
|
||||
testengineinit(LangEN);
|
||||
while(channbrecv(drawc, &dc) > 0)
|
||||
;
|
||||
chanfree(replyc);
|
||||
replyc = f->oldreply;
|
||||
chanfree(f->trace);
|
||||
chanfree(f->stop);
|
||||
chanfree(f->done);
|
||||
chanfree(f->waiting);
|
||||
chanfree(f->ack);
|
||||
}
|
||||
|
||||
static Keyreq
|
||||
@@ -491,7 +433,7 @@ nexttracecap(struct ct *t, Ximfix *f, int op, Ic *owner, int cap)
|
||||
Keyreq req;
|
||||
|
||||
memset(&req, 0, sizeof req);
|
||||
if(!CT_CHECK(t, channbrecv(f->trace, &req) > 0))
|
||||
if(!CT_CHECK(t, channbrecv(f->pump.trace, &req) > 0))
|
||||
return req;
|
||||
CT_EQ_INT(t, op, req.op);
|
||||
CT_EQ_PTR(t, owner, req.owner);
|
||||
@@ -511,25 +453,7 @@ notrace(struct ct *t, Ximfix *f)
|
||||
{
|
||||
Keyreq req;
|
||||
|
||||
CT_CHECK(t, channbrecv(f->trace, &req) <= 0);
|
||||
}
|
||||
|
||||
static void
|
||||
checkstr(struct ct *t, char *want, Str *got)
|
||||
{
|
||||
char buf[Maxutf];
|
||||
|
||||
stoutf(got, buf, sizeof buf);
|
||||
CT_EQ_STR(t, want, buf);
|
||||
}
|
||||
|
||||
static void
|
||||
checkenginepreedit(struct ct *t, char *want)
|
||||
{
|
||||
Str preedit;
|
||||
|
||||
testenginepreedit(&preedit);
|
||||
checkstr(t, want, &preedit);
|
||||
CT_CHECK(t, channbrecv(f->pump.trace, &req) <= 0);
|
||||
}
|
||||
|
||||
void
|
||||
@@ -556,13 +480,13 @@ xim_adapter_key_contract(struct ct *t)
|
||||
keypress(&state, 'a', 0, &res);
|
||||
nexttrace(t, &f, Keypress, &state);
|
||||
CT_CHECK(t, res.eaten);
|
||||
checkstr(t, "か", &res.preedit);
|
||||
checkstr(t, "preedit", "か", &res.preedit);
|
||||
|
||||
keypress(&state, Kspec|0x57, 0, &res);
|
||||
nexttrace(t, &f, Keypress, &state);
|
||||
CT_CHECK(t, !res.eaten);
|
||||
checkstr(t, "か", &res.commit);
|
||||
checkstr(t, "", &res.preedit);
|
||||
checkstr(t, "preedit", "か", &res.commit);
|
||||
checkstr(t, "preedit", "", &res.preedit);
|
||||
cleanup:
|
||||
ximend(&f);
|
||||
}
|
||||
@@ -586,7 +510,7 @@ xim_adapter_release_lifecycle(struct ct *t)
|
||||
nexttrace(t, &f, Keypress, &a);
|
||||
keypress(&b, 'n', 0, &res);
|
||||
nexttrace(t, &f, Keypress, &b);
|
||||
checkstr(t, "ん", &res.preedit);
|
||||
checkstr(t, "preedit", "ん", &res.preedit);
|
||||
CT_EQ_PTR(t, &b, testengineowner());
|
||||
|
||||
/* ResetIC and focus loss use the same idempotent release path. */
|
||||
@@ -648,6 +572,7 @@ xim_adapter_free_waits_for_release(struct ct *t)
|
||||
Freejob job;
|
||||
Ic *state;
|
||||
Channel *freed;
|
||||
Keyreq req;
|
||||
Keyres res;
|
||||
uchar token;
|
||||
int workeractive;
|
||||
@@ -665,18 +590,21 @@ xim_adapter_free_waits_for_release(struct ct *t)
|
||||
ics = state;
|
||||
keypress(state, 'n', 0, &res);
|
||||
nexttrace(t, &f, Keypress, state);
|
||||
f.holdrelease = 1;
|
||||
/* Hold the release: the free must not complete before the engine
|
||||
* acknowledges it, since the engine still points at this Ic. */
|
||||
pumphold(&f.pump, Keyrelease);
|
||||
job.state = state;
|
||||
job.done = freed;
|
||||
workeractive = threadcreate(freeworker, &job, 8192) >= 0;
|
||||
if(!CT_CHECK(t, workeractive))
|
||||
goto cleanup;
|
||||
chanrecv(f.waiting, &token);
|
||||
nexttrace(t, &f, Keyrelease, state);
|
||||
chanrecv(f.pump.trace, &req);
|
||||
CT_EQ_INT(t, Keyrelease, req.op);
|
||||
CT_EQ_PTR(t, state, req.owner);
|
||||
CT_CHECK(t, channbrecv(freed, &token) <= 0);
|
||||
CT_EQ_PTR(t, state, ics);
|
||||
CT_EQ_PTR(t, state, testengineowner());
|
||||
chansend(f.ack, &token);
|
||||
chansend(f.pump.go, &token);
|
||||
chanrecv(freed, &token);
|
||||
workeractive = 0;
|
||||
state = nil;
|
||||
@@ -684,7 +612,7 @@ xim_adapter_free_waits_for_release(struct ct *t)
|
||||
CT_EQ_PTR(t, nil, testengineowner());
|
||||
cleanup:
|
||||
if(workeractive){
|
||||
chansend(f.ack, &token);
|
||||
chansend(f.pump.go, &token);
|
||||
chanrecv(freed, &token);
|
||||
state = nil;
|
||||
}
|
||||
@@ -985,7 +913,7 @@ xim_adapter_callback_cleanup(struct ct *t)
|
||||
CT_EQ_INT(t, Wdone, wirecalls[3].op);
|
||||
keypress(&state, 'n', 0, &res);
|
||||
nexttrace(t, &f, Keypress, &state);
|
||||
checkstr(t, "ん", &res.preedit);
|
||||
checkstr(t, "preedit", "ん", &res.preedit);
|
||||
release(&state);
|
||||
nexttrace(t, &f, Keyrelease, &state);
|
||||
preowner = nil;
|
||||
@@ -1111,7 +1039,7 @@ xim_adapter_callback_owner_loss(struct ct *t)
|
||||
chansend(keyc, &req);
|
||||
chanrecv(replyc, &res);
|
||||
memset(&trace, 0, sizeof trace);
|
||||
CT_CHECK(t, channbrecv(f.trace, &trace) > 0);
|
||||
CT_CHECK(t, channbrecv(f.pump.trace, &trace) > 0);
|
||||
CT_EQ_INT(t, Keypress, trace.op);
|
||||
CT_EQ_PTR(t, &foreign, trace.owner);
|
||||
CT_EQ_PTR(t, &foreign, testengineowner());
|
||||
@@ -1148,7 +1076,7 @@ xim_adapter_callback_owner_loss(struct ct *t)
|
||||
chansend(keyc, &req);
|
||||
chanrecv(replyc, &res);
|
||||
memset(&trace, 0, sizeof trace);
|
||||
CT_CHECK(t, channbrecv(f.trace, &trace) > 0);
|
||||
CT_CHECK(t, channbrecv(f.pump.trace, &trace) > 0);
|
||||
CT_EQ_INT(t, Keyrelease, trace.op);
|
||||
CT_EQ_PTR(t, &foreign, trace.owner);
|
||||
cleanup:
|
||||
|
||||
Reference in New Issue
Block a user