From 879009ff9aff150233d43a4b2872e70c42e8f212 Mon Sep 17 00:00:00 2001
From: nick black <dankamongmen@gmail.com>
Date: Sun, 24 Nov 2019 15:32:38 -0500
Subject: [PATCH] adapt test to new ncplane_putc() api

---
 tests/cell.cpp    | 8 ++++----
 tests/ncplane.cpp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/cell.cpp b/tests/cell.cpp
index b8b3aa6ed..100787e37 100644
--- a/tests/cell.cpp
+++ b/tests/cell.cpp
@@ -17,7 +17,6 @@ class CellTest : public :: testing::Test {
 
   void TearDown() override {
     if(nc_){
-      EXPECT_EQ(0, ncplane_fg_rgb8(n_, 255, 255, 255));
       EXPECT_EQ(0, notcurses_render(nc_));
       EXPECT_EQ(0, notcurses_stop(nc_));
     }
@@ -31,11 +30,12 @@ TEST_F(CellTest, SetStyles) {
   cell c;
   memset(&c, 0, sizeof(c));
   cell_set_style(&c, WA_ITALIC);
-  cell_load(n_, &c, "s");
-  EXPECT_EQ(1, ncplane_putc(n_, &c, "s"));
+  ASSERT_EQ(1, cell_load(n_, &c, "s"));
+  EXPECT_EQ(0, ncplane_fg_rgb8(n_, 255, 255, 255));
+  EXPECT_EQ(1, ncplane_putc(n_, &c));
   int x, y;
   ncplane_cursor_yx(n_, &y, &x);
   EXPECT_EQ(1, x);
   EXPECT_EQ(0, y);
-  notcurses_render(nc_);
+  EXPECT_EQ(0, notcurses_render(nc_));
 }
diff --git a/tests/ncplane.cpp b/tests/ncplane.cpp
index 9cd990dd8..36b0e18a7 100644
--- a/tests/ncplane.cpp
+++ b/tests/ncplane.cpp
@@ -103,9 +103,9 @@ TEST_F(NcplaneTest, RejectBadRGB) {
 // Verify we can emit a wide character, and it advances the cursor
 TEST_F(NcplaneTest, EmitWchar) {
   const char cchar[] = "✔";
-  cell c;
+  cell c{};
   cell_load(n_, &c, cchar);
-  EXPECT_EQ(strlen(cchar), ncplane_putc(n_, &c, cchar));
+  EXPECT_EQ(strlen(cchar), ncplane_putc(n_, &c));
   int x, y;
   ncplane_cursor_yx(n_, &y, &x);
   EXPECT_EQ(0, y);