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

tests/wide.cpp: use modern range loop

Browse Source
This commit is contained in:
nick black 2020-05-07 00:52:16 -04:00
parent 1526cfc7b8
commit a571f4daaa
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/wide.cpp
View File

@ -34,7 +34,7 @@ TEST_CASE("Wide") {
const char* w = "\u5168"; const char* w = "\u5168";
int sbytes = 0; int sbytes = 0;
int dimx; int dimx;
ncplane_dim_yx(n_, NULL, &dimx); ncplane_dim_yx(n_, nullptr, &dimx);
CHECK(0 < ncplane_putegc_yx(n_, 0, dimx - 3, w, &sbytes)); CHECK(0 < ncplane_putegc_yx(n_, 0, dimx - 3, w, &sbytes));
int x, y; int x, y;
ncplane_cursor_yx(n_, &y, &x); ncplane_cursor_yx(n_, &y, &x);
@ -55,28 +55,28 @@ TEST_CASE("Wide") {
const char EGC3[] = "\u212b"; // ambiguous angstrom Å const char EGC3[] = "\u212b"; // ambiguous angstrom Å
const char EGC4[] = "\ufdfd"; // neutral yet huge bismillah ﷽ const char EGC4[] = "\ufdfd"; // neutral yet huge bismillah ﷽
std::array<cell, 5> tcells; std::array<cell, 5> tcells;
for(auto i = 0u ; i < tcells.size() ; ++i){ for(auto & tcell : tcells){
cell_init(&tcells[i]); cell_init(&tcell);
} }
REQUIRE(1 < cell_load(n_, &tcells[0], EGC0)); REQUIRE(1 < cell_load(n_, &tcells[0], EGC0));
REQUIRE(1 < cell_load(n_, &tcells[1], EGC1)); REQUIRE(1 < cell_load(n_, &tcells[1], EGC1));
REQUIRE(1 < cell_load(n_, &tcells[2], EGC2)); REQUIRE(1 < cell_load(n_, &tcells[2], EGC2));
REQUIRE(1 < cell_load(n_, &tcells[3], EGC3)); REQUIRE(1 < cell_load(n_, &tcells[3], EGC3));
REQUIRE(1 < cell_load(n_, &tcells[4], EGC4)); REQUIRE(1 < cell_load(n_, &tcells[4], EGC4));
for(auto i = 0u ; i < tcells.size() ; ++i){ for(auto & tcell : tcells){
REQUIRE(0 < ncplane_putc(n_, &tcells[i])); REQUIRE(0 < ncplane_putc(n_, &tcell));
} }
CHECK(0 == notcurses_render(nc_)); CHECK(0 == notcurses_render(nc_));
int x = 0; int x = 0;
for(auto i = 0u ; i < tcells.size() ; ++i){ for(auto & tcell : tcells){
CHECK(0 == ncplane_cursor_move_yx(n_, 0, x)); CHECK(0 == ncplane_cursor_move_yx(n_, 0, x));
cell testcell = CELL_TRIVIAL_INITIALIZER; cell testcell = CELL_TRIVIAL_INITIALIZER;
REQUIRE(0 < ncplane_at_cursor_cell(n_, &testcell)); REQUIRE(0 < ncplane_at_cursor_cell(n_, &testcell));
CHECK(!strcmp(cell_extended_gcluster(n_, &tcells[i]), CHECK(!strcmp(cell_extended_gcluster(n_, &tcell),
cell_extended_gcluster(n_, &testcell))); cell_extended_gcluster(n_, &testcell)));
CHECK(0 == testcell.attrword); CHECK(0 == testcell.attrword);
wchar_t w; wchar_t w;
REQUIRE(0 < mbtowc(&w, cell_extended_gcluster(n_, &tcells[i]), MB_CUR_MAX)); REQUIRE(0 < mbtowc(&w, cell_extended_gcluster(n_, &tcell), MB_CUR_MAX));
if(wcwidth(w) == 2){ if(wcwidth(w) == 2){
CHECK(CELL_WIDEASIAN_MASK == testcell.channels); CHECK(CELL_WIDEASIAN_MASK == testcell.channels);
++x; ++x;
@ -206,7 +206,7 @@ TEST_CASE("Wide") {
int dimx, dimy; int dimx, dimy;
ncplane_dim_yx(n_, &dimy, &dimx); ncplane_dim_yx(n_, &dimy, &dimx);
CHECK(0 == ncplane_rounded_box_sized(ncp, 0, 0, 3, 4, 0)); CHECK(0 == ncplane_rounded_box_sized(ncp, 0, 0, 3, 4, 0));
CHECK(2 == ncplane_putegc_yx(ncp, 1, 1, "\xf0\x9f\xa6\x82", NULL)); // scorpion CHECK(2 == ncplane_putegc_yx(ncp, 1, 1, "\xf0\x9f\xa6\x82", nullptr)); // scorpion
CHECK(0 == notcurses_render(nc_)); CHECK(0 == notcurses_render(nc_));
cell c = CELL_TRIVIAL_INITIALIZER; cell c = CELL_TRIVIAL_INITIALIZER;
REQUIRE(0 < ncplane_at_yx_cell(ncp, 1, 0, &c)); REQUIRE(0 < ncplane_at_yx_cell(ncp, 1, 0, &c));