blackbeard420/notcurses
1
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses synced 2025-03-09 17:19:03 -04:00
Code Issues Projects Releases Wiki Activity

egcpool unit tests: use nccell_width() throughout

Browse Source
This commit is contained in:
nick black 2021-05-01 20:12:50 -04:00
parent 8e0173cce3
commit 5b926d311c
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/tests/egcpool.cpp
View File

@ -20,7 +20,7 @@ TEST_CASE("EGCpool") {
CHECK(0 == notcurses_stop(nc_)); CHECK(0 == notcurses_stop(nc_));
return; return;
} }
CHECK(0 == notcurses_stop(nc_)); auto n_ = notcurses_stdplane(nc_);
SUBCASE("UTF8EGC") { SUBCASE("UTF8EGC") {
int c = ncstrwidth("☢"); int c = ncstrwidth("☢");
@ -35,24 +35,21 @@ TEST_CASE("EGCpool") {
const char* w1 = "\u00e0"; // (utf8: c3 a0) const char* w1 = "\u00e0"; // (utf8: c3 a0)
const char* w2 = "\u0061\u0300"; // (utf8: 61 cc 80) const char* w2 = "\u0061\u0300"; // (utf8: 61 cc 80)
const char* w3 = "\u0061"; // (utf8: 61) const char* w3 = "\u0061"; // (utf8: 61)
int c1, c2, c3; nccell c = CELL_TRIVIAL_INITIALIZER;
auto u1 = utf8_egc_len(w1, &c1); CHECK(2 == nccell_load(n_, &c, w1));
auto u2 = utf8_egc_len(w2, &c2); CHECK(1 == nccell_width(n_, &c));
auto u3 = utf8_egc_len(w3, &c3); CHECK(3 == nccell_load(n_, &c, w2));
REQUIRE(2 == u1); CHECK(1 == nccell_width(n_, &c));
REQUIRE(3 == u2); CHECK(1 == nccell_load(n_, &c, w3));
REQUIRE(1 == u3); CHECK(1 == nccell_width(n_, &c));
REQUIRE(1 == c1);
REQUIRE(1 == c2);
REQUIRE(1 == c3);
} }
SUBCASE("AddAndRemove") { SUBCASE("AddAndRemove") {
const char* wstr = "\ufdfd"; // bismallih const char* wstr = "\ufdfd"; // bismallih
int c; nccell c = CELL_TRIVIAL_INITIALIZER;
auto ulen = utf8_egc_len(wstr, &c); auto ulen = nccell_load(n_, &c, wstr);
CHECK(1 == nccell_width(n_, &c)); // not considered wide, believe it or not
REQUIRE(0 <= egcpool_stash(&pool_, wstr, ulen)); REQUIRE(0 <= egcpool_stash(&pool_, wstr, ulen));
REQUIRE(1 == c); // not considered wide, believe it or not
CHECK(pool_.pool); CHECK(pool_.pool);
CHECK(!strcmp(pool_.pool, wstr)); CHECK(!strcmp(pool_.pool, wstr));
CHECK(0 < pool_.poolsize); CHECK(0 < pool_.poolsize);
@ -68,15 +65,16 @@ TEST_CASE("EGCpool") {
SUBCASE("AddTwiceRemoveFirst") { SUBCASE("AddTwiceRemoveFirst") {
const char* wstr = "\u8840"; // cjk unified ideograph, wide const char* wstr = "\u8840"; // cjk unified ideograph, wide
int c1, c2; // column counts nccell c1 = CELL_TRIVIAL_INITIALIZER;
auto u1 = utf8_egc_len(wstr, &c1); // bytes consumed nccell c2 = CELL_TRIVIAL_INITIALIZER;
auto u2 = utf8_egc_len(wstr, &c2); auto u1 = nccell_load(n_, &c1, wstr); // bytes consumed
auto u2 = nccell_load(n_, &c2, wstr);
int o1 = egcpool_stash(&pool_, wstr, u1); int o1 = egcpool_stash(&pool_, wstr, u1);
int o2 = egcpool_stash(&pool_, wstr, u2); int o2 = egcpool_stash(&pool_, wstr, u2);
REQUIRE(0 <= o1); REQUIRE(0 <= o1);
REQUIRE(o1 < o2); REQUIRE(o1 < o2);
REQUIRE(2 == c1); CHECK(2 == nccell_width(n_, &c1));
REQUIRE(c1 == c2); CHECK(nccell_width(n_, &c1) == nccell_width(n_, &c2));
CHECK(pool_.pool); CHECK(pool_.pool);
CHECK(!strcmp(pool_.pool + o1, wstr)); CHECK(!strcmp(pool_.pool + o1, wstr));
CHECK(!strcmp(pool_.pool + o2, wstr)); CHECK(!strcmp(pool_.pool + o2, wstr));
@ -92,14 +90,15 @@ TEST_CASE("EGCpool") {
SUBCASE("AddTwiceRemoveSecond") { SUBCASE("AddTwiceRemoveSecond") {
const char* wstr = "\u8840"; // cjk unified ideograph, wide const char* wstr = "\u8840"; // cjk unified ideograph, wide
int c1, c2; // column counts nccell c1 = CELL_TRIVIAL_INITIALIZER;
auto u1 = utf8_egc_len(wstr, &c1); // bytes consumed nccell c2 = CELL_TRIVIAL_INITIALIZER;
auto u2 = utf8_egc_len(wstr, &c2); auto u1 = nccell_load(n_, &c1, wstr); // bytes consumed
auto u2 = nccell_load(n_, &c2, wstr);
int o1 = egcpool_stash(&pool_, wstr, u1); int o1 = egcpool_stash(&pool_, wstr, u1);
int o2 = egcpool_stash(&pool_, wstr, u2); int o2 = egcpool_stash(&pool_, wstr, u2);
REQUIRE(o1 < o2); REQUIRE(o1 < o2);
REQUIRE(2 == c1); CHECK(2 == nccell_width(n_, &c1));
REQUIRE(c1 == c2); CHECK(nccell_width(n_, &c2) == nccell_width(n_, &c1));
CHECK(pool_.pool); CHECK(pool_.pool);
CHECK(!strcmp(pool_.pool + o1, wstr)); CHECK(!strcmp(pool_.pool + o1, wstr));
CHECK(!strcmp(pool_.pool + o2, wstr)); CHECK(!strcmp(pool_.pool + o2, wstr));
@ -208,6 +207,8 @@ TEST_CASE("EGCpool") {
// common cleanup // common cleanup
egcpool_dump(&pool_); egcpool_dump(&pool_);
CHECK(0 == notcurses_stop(nc_));
} }
TEST_CASE("EGCpoolLong" * doctest::skip(true)) { TEST_CASE("EGCpoolLong" * doctest::skip(true)) {