From 481294e3c71512ba666dfef018f729df820fdf36 Mon Sep 17 00:00:00 2001 From: Dean Michael Berris Date: Tue, 13 Dec 2016 00:17:31 +0000 Subject: [PATCH] [XRay][compiler-rt] Use explicit comparisons in unit tests. Summary: This should improve the error messages generated providing a bit more information when the failures are printed out. One example of a contrived error looks like: ``` Expected: (Buffers.getBuffer(Buf)) != (std::error_code()), actual: system:0 vs system:0 ``` Because we're using error codes, the default printing gets us more useful information in case of failure. This is a follow-up on D26232. Reviewers: rSerge Subscribers: llvm-commits Differential Revision: https://reviews.llvm.org/D27495 llvm-svn: 289501 --- compiler-rt/lib/xray/tests/unit/buffer_queue_test.cc | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/compiler-rt/lib/xray/tests/unit/buffer_queue_test.cc b/compiler-rt/lib/xray/tests/unit/buffer_queue_test.cc index fd7d5af..d46f194 100644 --- a/compiler-rt/lib/xray/tests/unit/buffer_queue_test.cc +++ b/compiler-rt/lib/xray/tests/unit/buffer_queue_test.cc @@ -14,6 +14,7 @@ #include "gtest/gtest.h" #include +#include #include namespace __xray { @@ -25,19 +26,19 @@ TEST(BufferQueueTest, API) { BufferQueue Buffers(kSize, 1); } TEST(BufferQueueTest, GetAndRelease) { BufferQueue Buffers(kSize, 1); BufferQueue::Buffer Buf; - ASSERT_FALSE(Buffers.getBuffer(Buf)); + ASSERT_EQ(Buffers.getBuffer(Buf), std::error_code()); ASSERT_NE(nullptr, Buf.Buffer); - ASSERT_FALSE(Buffers.releaseBuffer(Buf)); + ASSERT_EQ(Buffers.releaseBuffer(Buf), std::error_code()); ASSERT_EQ(nullptr, Buf.Buffer); } TEST(BufferQueueTest, GetUntilFailed) { BufferQueue Buffers(kSize, 1); BufferQueue::Buffer Buf0; - EXPECT_FALSE(Buffers.getBuffer(Buf0)); + EXPECT_EQ(Buffers.getBuffer(Buf0), std::error_code()); BufferQueue::Buffer Buf1; EXPECT_EQ(std::errc::not_enough_memory, Buffers.getBuffer(Buf1)); - EXPECT_FALSE(Buffers.releaseBuffer(Buf0)); + EXPECT_EQ(Buffers.releaseBuffer(Buf0), std::error_code()); } TEST(BufferQueueTest, ReleaseUnknown) { @@ -51,13 +52,13 @@ TEST(BufferQueueTest, ReleaseUnknown) { TEST(BufferQueueTest, ErrorsWhenFinalising) { BufferQueue Buffers(kSize, 2); BufferQueue::Buffer Buf; - ASSERT_FALSE(Buffers.getBuffer(Buf)); + ASSERT_EQ(Buffers.getBuffer(Buf), std::error_code()); ASSERT_NE(nullptr, Buf.Buffer); - ASSERT_FALSE(Buffers.finalize()); + ASSERT_EQ(Buffers.finalize(), std::error_code()); BufferQueue::Buffer OtherBuf; ASSERT_EQ(std::errc::state_not_recoverable, Buffers.getBuffer(OtherBuf)); ASSERT_EQ(std::errc::state_not_recoverable, Buffers.finalize()); - ASSERT_FALSE(Buffers.releaseBuffer(Buf)); + ASSERT_EQ(Buffers.releaseBuffer(Buf), std::error_code()); } TEST(BufferQueueTest, MultiThreaded) { -- 2.7.4