From e89a49490c3109d42d29d6b9f57eaa373bb80b58 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Mon, 11 Jun 2018 22:19:34 +0200 Subject: Clarify memory guarantees of deno_buf --- deno2/mock_runtime_test.cc | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'deno2/mock_runtime_test.cc') diff --git a/deno2/mock_runtime_test.cc b/deno2/mock_runtime_test.cc index 297b58b22..929793645 100644 --- a/deno2/mock_runtime_test.cc +++ b/deno2/mock_runtime_test.cc @@ -23,10 +23,7 @@ TEST(MockRuntimeTest, ErrorsCorrectly) { deno_dispose(d); } -deno_buf strbuf(const char* str) { - void* d = reinterpret_cast(const_cast(str)); - return deno_buf{d, strlen(str)}; -} +deno_buf strbuf(const char* str) { return deno_buf{str, strlen(str)}; } TEST(MockRuntimeTest, PubSuccess) { Deno* d = deno_new(NULL, NULL); @@ -56,11 +53,9 @@ TEST(MockRuntimeTest, SubReturnEmpty) { count++; EXPECT_STREQ(channel, "SubReturnEmpty"); EXPECT_EQ(static_cast(3), buf.len); - // TODO(ry) buf.data should just be a char*. - char* data = reinterpret_cast(buf.data); - EXPECT_EQ(data[0], 'a'); - EXPECT_EQ(data[1], 'b'); - EXPECT_EQ(data[2], 'c'); + EXPECT_EQ(buf.data[0], 'a'); + EXPECT_EQ(buf.data[1], 'b'); + EXPECT_EQ(buf.data[2], 'c'); return deno_buf{nullptr, 0}; }); EXPECT_TRUE(deno_execute(d, "a.js", "SubReturnEmpty()")); @@ -74,11 +69,9 @@ TEST(MockRuntimeTest, SubReturnBar) { count++; EXPECT_STREQ(channel, "SubReturnBar"); EXPECT_EQ(static_cast(3), buf.len); - // TODO(ry) buf.data should just be a char*. - char* data = reinterpret_cast(buf.data); - EXPECT_EQ(data[0], 'a'); - EXPECT_EQ(data[1], 'b'); - EXPECT_EQ(data[2], 'c'); + EXPECT_EQ(buf.data[0], 'a'); + EXPECT_EQ(buf.data[1], 'b'); + EXPECT_EQ(buf.data[2], 'c'); return strbuf("bar"); }); EXPECT_TRUE(deno_execute(d, "a.js", "SubReturnBar()")); -- cgit v1.2.3