Archives/notcurses
2
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses.git synced 2024-11-02 09:40:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wide tests: downgrade many REQUIREs to CHECKs

Browse Source
This commit is contained in:
nick black 2020-08-29 19:50:03 -04:00 committed by Nick Black
parent 954030ac83
commit 161130986e
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/wide.cpp
View File

@ -77,24 +77,24 @@ TEST_CASE("Wide") {
for(auto & tcell : tcells){
cell_init(&tcell);
}
REQUIRE(1 < cell_load(n_, &tcells[0], EGC0));
REQUIRE(1 < cell_load(n_, &tcells[1], EGC1));
REQUIRE(1 < cell_load(n_, &tcells[2], EGC2));
REQUIRE(1 < cell_load(n_, &tcells[3], EGC3));
REQUIRE(1 < cell_load(n_, &tcells[4], EGC4));
CHECK(1 < cell_load(n_, &tcells[0], EGC0));
CHECK(1 < cell_load(n_, &tcells[1], EGC1));
CHECK(1 < cell_load(n_, &tcells[2], EGC2));
CHECK(1 < cell_load(n_, &tcells[3], EGC3));
CHECK(1 < cell_load(n_, &tcells[4], EGC4));
for(auto & tcell : tcells){
REQUIRE(0 < ncplane_putc(n_, &tcell));
CHECK(0 < ncplane_putc(n_, &tcell));
}
CHECK(0 == notcurses_render(nc_));
int x = 0;
for(auto & tcell : tcells){
CHECK(0 == ncplane_cursor_move_yx(n_, 0, x));
cell testcell = CELL_TRIVIAL_INITIALIZER;
REQUIRE(0 < ncplane_at_cursor_cell(n_, &testcell));
CHECK(0 < ncplane_at_cursor_cell(n_, &testcell));
CHECK(!strcmp(cell_extended_gcluster(n_, &tcell), cell_extended_gcluster(n_, &testcell)));
CHECK(0 == testcell.stylemask);
wchar_t w;
REQUIRE(0 < mbtowc(&w, cell_extended_gcluster(n_, &tcell), MB_CUR_MAX));
CHECK(0 < mbtowc(&w, cell_extended_gcluster(n_, &tcell), MB_CUR_MAX));
if(wcwidth(w) == 2){
CHECK(CELL_WIDEASIAN_MASK == testcell.channels);
++x;
@ -230,14 +230,14 @@ TEST_CASE("Wide") {
CHECK(mbswidth(SCORPION) == ncplane_putegc_yx(ncp, 1, 1, SCORPION, nullptr));
CHECK(0 == notcurses_render(nc_));
cell c = CELL_TRIVIAL_INITIALIZER;
REQUIRE(0 < ncplane_at_yx_cell(ncp, 1, 0, &c));
CHECK(0 < ncplane_at_yx_cell(ncp, 1, 0, &c));
CHECK(!strcmp(cell_extended_gcluster(ncp, &c), "│"));
cell_release(ncp, &c);
char* egc = notcurses_at_yx(nc_, 1, 0, &c.stylemask, &c.channels);
REQUIRE(egc);
CHECK(!strcmp(egc, "│"));
free(egc);
REQUIRE(0 < ncplane_at_yx_cell(ncp, 1, 3, &c));
CHECK(0 < ncplane_at_yx_cell(ncp, 1, 3, &c));
CHECK(!strcmp(cell_extended_gcluster(ncp, &c), "│"));
cell_release(ncp, &c);
egc = notcurses_at_yx(nc_, 1, 3, &c.stylemask, &c.channels);
@ -260,7 +260,7 @@ TEST_CASE("Wide") {
CHECK(cell_double_wide_p(&c));
ncplane_at_yx_cell(n_, 0, 4, &c);
CHECK(!cell_double_wide_p(&c));
REQUIRE(0 == notcurses_render(nc_));
CHECK(0 == notcurses_render(nc_));
notcurses_at_yx(nc_, 0, 0, &c.stylemask, &c.channels);
CHECK(0 != (c.channels & 0x8000000080000000ull));
notcurses_at_yx(nc_, 0, 1, &c.stylemask, &c.channels);
@ -295,7 +295,7 @@ TEST_CASE("Wide") {
CHECK(!notcurses_render(nc_));
// should be wide char 1
REQUIRE(3 == ncplane_at_yx_cell(n_, 0, 0, &c));
CHECK(3 == ncplane_at_yx_cell(n_, 0, 0, &c));
CHECK(!strcmp("\xe5\x85\xa8", cell_extended_gcluster(n_, &c)));
CHECK(cell_double_wide_p(&c));
egc = notcurses_at_yx(nc_, 0, 0, &c.stylemask, &c.channels);
@ -399,7 +399,7 @@ TEST_CASE("Wide") {
CHECK(3 == ncplane_at_yx_cell(n_, 1, 1, &cl));
CHECK(0 == strcmp("六", cell_extended_gcluster(n_, &cl)));
CHECK(0 == ncplane_at_yx_cell(n_, 1, 2, &cr));
REQUIRE(cell_simple_p(&cr));
CHECK(cell_simple_p(&cr));
CHECK(0 == cr.gcluster);
cell_release(n_, &cl);
cell_release(n_, &cr);