diff options
Diffstat (limited to 'src/io/write_test.cpp')
| -rw-r--r-- | src/io/write_test.cpp | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/io/write_test.cpp b/src/io/write_test.cpp index 8c08833..405d28a 100644 --- a/src/io/write_test.cpp +++ b/src/io/write_test.cpp @@ -26,9 +26,13 @@ #include "../strings/astring.hpp" #include "../strings/mstring.hpp" #include "../strings/xstring.hpp" +#include "../strings/literal.hpp" //#include "../poison.hpp" + +namespace tmwa +{ static io::FD pipew(io::FD& rfd) { @@ -65,7 +69,7 @@ public: if (rv == -1) { if (errno != EAGAIN) - return {"Error, read failed :("}; + return "Error, read failed :("_s; rv = 0; } if (rv == 0) @@ -81,11 +85,11 @@ TEST(io, write1) PipeWriter pw(false); io::WriteFile& wf = pw.wf; wf.really_put("Hello, ", 7); - EXPECT_EQ("", pw.slurp()); - wf.put_line("World!\n"); - EXPECT_EQ("", pw.slurp()); + EXPECT_EQ(""_s, pw.slurp()); + wf.put_line("World!\n"_s); + EXPECT_EQ(""_s, pw.slurp()); EXPECT_TRUE(wf.close()); - EXPECT_EQ("Hello, World!\n", pw.slurp()); + EXPECT_EQ("Hello, World!\n"_s, pw.slurp()); } TEST(io, write2) @@ -93,12 +97,12 @@ TEST(io, write2) PipeWriter pw(true); io::WriteFile& wf = pw.wf; wf.really_put("Hello, ", 7); - EXPECT_EQ("", pw.slurp()); - wf.put_line("World!"); + EXPECT_EQ(""_s, pw.slurp()); + wf.put_line("World!"_s); wf.really_put("XXX", 3); - EXPECT_EQ("Hello, World!\n", pw.slurp()); + EXPECT_EQ("Hello, World!\n"_s, pw.slurp()); EXPECT_TRUE(wf.close()); - EXPECT_EQ("XXX", pw.slurp()); + EXPECT_EQ("XXX"_s, pw.slurp()); } TEST(io, write3) @@ -112,7 +116,7 @@ TEST(io, write3) memset(buf, 'a', sizeof(buf)); wf.really_put(buf, 1); - EXPECT_EQ("", pw.slurp()); + EXPECT_EQ(""_s, pw.slurp()); memset(buf, 'b', sizeof(buf)); wf.really_put(buf, sizeof(buf)); @@ -133,3 +137,4 @@ TEST(io, write3) EXPECT_TRUE(wf.close()); EXPECT_EQ(pw.slurp(), XString(buf, buf + remaining, nullptr)); } +} // namespace tmwa |