summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAina Niemetz <aina.niemetz@gmail.com>2021-03-04 10:49:28 -0800
committerGitHub <noreply@github.com>2021-03-04 18:49:28 +0000
commit0942d5af032a2e58bd455df6e8b585f245a43dc9 (patch)
tree8877036699a48f154a5839d7cb3cb5aacd13d4b8
parentc3d58e3bdd194372421ce7d7c8a6f8d1f4deecfa (diff)
Fix nightlies. (#6052)
-rw-r--r--test/unit/util/binary_heap_black.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/test/unit/util/binary_heap_black.cpp b/test/unit/util/binary_heap_black.cpp
index d0838951c..e75a6e4ec 100644
--- a/test/unit/util/binary_heap_black.cpp
+++ b/test/unit/util/binary_heap_black.cpp
@@ -64,14 +64,14 @@ TEST_F(TestUtilBlackBinaryHeap, heap_series)
ASSERT_DEATH(heap.top(), "!empty\\(\\)");
ASSERT_DEATH(heap.pop(), "!empty\\(\\)");
#endif
- ASSERT_EQ(heap.begin(), heap.end());
+ ASSERT_TRUE(heap.begin() == heap.end());
BinaryHeap<int32_t>::handle h5 = heap.push(5);
ASSERT_TRUE(h5 == h5);
ASSERT_EQ(heap.top(), 5);
ASSERT_EQ(heap.size(), 1u);
ASSERT_FALSE(heap.empty());
- ASSERT_FALSE(heap.begin() == heap.end());
+ ASSERT_TRUE(heap.begin() != heap.end());
ASSERT_EQ(*h5, 5);
ASSERT_EQ(*heap.begin(), 5);
ASSERT_NO_THROW(heap.erase(h5));
@@ -93,7 +93,7 @@ TEST_F(TestUtilBlackBinaryHeap, heap_series)
ASSERT_NE(h3, h10);
ASSERT_NE(h3, h2);
ASSERT_NE(h10, h2);
- ASSERT_NE(heap.begin(), heap.end());
+ ASSERT_TRUE(heap.begin() != heap.end());
ASSERT_EQ(*heap.begin(), 10);
ASSERT_EQ(*h2, 2);
ASSERT_EQ(*h3, 3);
@@ -102,37 +102,37 @@ TEST_F(TestUtilBlackBinaryHeap, heap_series)
ASSERT_EQ(heap.top(), 10);
// test the iterator (note the order of elements isn't guaranteed!)
BinaryHeap<int32_t>::const_iterator i = heap.begin();
- ASSERT_NE(i, heap.end());
+ ASSERT_TRUE(i != heap.end());
ASSERT_NO_THROW(*i++);
- ASSERT_NE(i, heap.end());
+ ASSERT_TRUE(i != heap.end());
ASSERT_NO_THROW(*i++);
- ASSERT_NE(i, heap.end());
+ ASSERT_TRUE(i != heap.end());
ASSERT_NO_THROW(*i++);
- ASSERT_NE(i, heap.end());
+ ASSERT_TRUE(i != heap.end());
ASSERT_NO_THROW(*i++);
- ASSERT_EQ(i, heap.end());
+ ASSERT_TRUE(i == heap.end());
ASSERT_FALSE(heap.empty());
ASSERT_EQ(heap.size(), 4u);
ASSERT_NO_THROW(heap.pop());
- ASSERT_NE(heap.begin(), heap.end());
+ ASSERT_TRUE(i != heap.end());
ASSERT_EQ(*heap.begin(), 5);
ASSERT_EQ(heap.top(), 5);
ASSERT_FALSE(heap.empty());
ASSERT_EQ(heap.size(), 3u);
ASSERT_NO_THROW(heap.pop());
- ASSERT_NE(heap.begin(), heap.end());
+ ASSERT_TRUE(heap.begin() != heap.end());
ASSERT_EQ(*heap.begin(), 3);
ASSERT_EQ(heap.top(), 3);
ASSERT_FALSE(heap.empty());
ASSERT_EQ(heap.size(), 2u);
ASSERT_NO_THROW(heap.pop());
- ASSERT_NE(heap.begin(), heap.end());
+ ASSERT_TRUE(heap.begin() != heap.end());
ASSERT_EQ(*heap.begin(), 2);
ASSERT_EQ(heap.top(), 2);
ASSERT_FALSE(heap.empty());
ASSERT_EQ(heap.size(), 1u);
ASSERT_NO_THROW(heap.pop());
- ASSERT_EQ(heap.begin(), heap.end());
+ ASSERT_TRUE(heap.begin() == heap.end());
ASSERT_TRUE(heap.empty());
ASSERT_EQ(heap.size(), 0u);
#ifdef CVC4_ASSERTIONS
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback