From: Igor Fedotov <ifedotov@suse.com>
Date: Fri, 1 Jun 2018 13:35:04 +0000 (+0300)
Subject: test/objectstore/unitetest_fastbmap_allocator: replace ASSERT_TRUE with
X-Git-Tag: v13.2.6~102^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c645f2f85c0583861d0262bb632567112e7e57d7;p=ceph.git

test/objectstore/unitetest_fastbmap_allocator: replace ASSERT_TRUE with
ASSERT_EQ

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 69ccb4367dcdcc51fbcfdaaea308c761291621e1)
---

diff --git a/src/test/objectstore/fastbmap_allocator_test.cc b/src/test/objectstore/fastbmap_allocator_test.cc
index c63abb3cb2e3..e3d543257539 100755
--- a/src/test/objectstore/fastbmap_allocator_test.cc
+++ b/src/test/objectstore/fastbmap_allocator_test.cc
@@ -55,73 +55,73 @@ TEST(TestAllocatorLevel01, test_l1)
   uint64_t num_l1_entries = 3 * 256;
   uint64_t capacity = num_l1_entries * 512 * 4096;
   al1.init(capacity, 0x1000);
-  ASSERT_TRUE(capacity == al1.debug_get_free());
+  ASSERT_EQ(capacity, al1.debug_get_free());
 
   auto i1 = al1.allocate_l1_cont(0x1000, 0x1000, 0, num_l1_entries);
-  ASSERT_TRUE(i1.offset == 0);
-  ASSERT_TRUE(i1.length == 0x1000);
-  ASSERT_TRUE(capacity - 0x1000 == al1.debug_get_free());
+  ASSERT_EQ(i1.offset, 0);
+  ASSERT_EQ(i1.length, 0x1000);
+  ASSERT_EQ(capacity - 0x1000, al1.debug_get_free());
 
   auto i2 = al1.allocate_l1_cont(0x1000, 0x1000, 0, num_l1_entries);
-  ASSERT_TRUE(i2.offset == 0x1000);
-  ASSERT_TRUE(i2.length == 0x1000);
+  ASSERT_EQ(i2.offset, 0x1000);
+  ASSERT_EQ(i2.length, 0x1000);
   al1.free_l1(i2);
   al1.free_l1(i1);
   i1 = al1.allocate_l1_cont(0x1000, 0x1000, 0, num_l1_entries);
-  ASSERT_TRUE(i1.offset == 0);
-  ASSERT_TRUE(i1.length == 0x1000);
+  ASSERT_EQ(i1.offset, 0);
+  ASSERT_EQ(i1.length, 0x1000);
   i2 = al1.allocate_l1_cont(0x1000, 0x1000, 0, num_l1_entries);
-  ASSERT_TRUE(i2.offset == 0x1000);
-  ASSERT_TRUE(i2.length == 0x1000);
+  ASSERT_EQ(i2.offset, 0x1000);
+  ASSERT_EQ(i2.length, 0x1000);
   al1.free_l1(i1);
   al1.free_l1(i2);
 
   i1 = al1.allocate_l1_cont(0x2000, 0x1000, 0, num_l1_entries);
-  ASSERT_TRUE(i1.offset == 0);
-  ASSERT_TRUE(i1.length == 0x2000);
+  ASSERT_EQ(i1.offset, 0);
+  ASSERT_EQ(i1.length, 0x2000);
 
   i2 = al1.allocate_l1_cont(0x3000, 0x1000, 0, num_l1_entries);
-  ASSERT_TRUE(i2.offset == 0x2000);
-  ASSERT_TRUE(i2.length == 0x3000);
+  ASSERT_EQ(i2.offset, 0x2000);
+  ASSERT_EQ(i2.length, 0x3000);
 
   al1.free_l1(i1);
   al1.free_l1(i2);
 
   i1 = al1.allocate_l1_cont(0x2000, 0x1000, 0, num_l1_entries);
-  ASSERT_TRUE(i1.offset == 0);
-  ASSERT_TRUE(i1.length == 0x2000);
+  ASSERT_EQ(i1.offset, 0);
+  ASSERT_EQ(i1.length, 0x2000);
 
   i2 = al1.allocate_l1_cont(2 * 1024 * 1024, 0x1000, 0, num_l1_entries);
-  ASSERT_TRUE(i2.offset == 2 * 1024 * 1024);
-  ASSERT_TRUE(i2.length == 2 * 1024 * 1024);
+  ASSERT_EQ(i2.offset, 2 * 1024 * 1024);
+  ASSERT_EQ(i2.length, 2 * 1024 * 1024);
 
   al1.free_l1(i1);
   i1 = al1.allocate_l1_cont(1024 * 1024, 0x1000, 0, num_l1_entries);
-  ASSERT_TRUE(i1.offset == 0);
-  ASSERT_TRUE(i1.length == 1024 * 1024);
+  ASSERT_EQ(i1.offset, 0);
+  ASSERT_EQ(i1.length, 1024 * 1024);
 
   auto i3 = al1.allocate_l1_cont(1024 * 1024 + 0x1000, 0x1000, 0, num_l1_entries);
-  ASSERT_TRUE(i3.offset == 2 * 2 * 1024 * 1024);
-  ASSERT_TRUE(i3.length == 1024 * 1024 + 0x1000);
+  ASSERT_EQ(i3.offset, 2 * 2 * 1024 * 1024);
+  ASSERT_EQ(i3.length, 1024 * 1024 + 0x1000);
 
   // here we have the following layout:
   // Alloc: 0~1M, 2M~2M, 4M~1M+4K
   // Free: 1M~1M, 4M+4K ~ 2M-4K, 6M ~...
   //
   auto i4 = al1.allocate_l1_cont(1024 * 1024, 0x1000, 0, num_l1_entries);
-  ASSERT_TRUE(i4.offset == 1 * 1024 * 1024);
-  ASSERT_TRUE(i4.length == 1024 * 1024);
+  ASSERT_EQ(i4.offset, 1 * 1024 * 1024);
+  ASSERT_EQ(i4.length, 1024 * 1024);
   al1.free_l1(i4);
 
   i4 = al1.allocate_l1_cont(1024 * 1024 - 0x1000, 0x1000, 0, num_l1_entries);
-  ASSERT_TRUE(i4.offset == 5 * 1024 * 1024 + 0x1000);
-  ASSERT_TRUE(i4.length == 1024 * 1024 - 0x1000);
+  ASSERT_EQ(i4.offset, 5 * 1024 * 1024 + 0x1000);
+  ASSERT_EQ(i4.length, 1024 * 1024 - 0x1000);
   al1.free_l1(i4);
 
   i4 = al1.allocate_l1_cont(1024 * 1024 + 0x1000, 0x1000, 0, num_l1_entries);
-  ASSERT_TRUE(i4.offset == 6 * 1024 * 1024);
-  //ASSERT_TRUE(i4.offset == 5 * 1024 * 1024 + 0x1000);
-  ASSERT_TRUE(i4.length == 1024 * 1024 + 0x1000);
+  ASSERT_EQ(i4.offset, 6 * 1024 * 1024);
+  //ASSERT_EQ(i4.offset, 5 * 1024 * 1024 + 0x1000);
+  ASSERT_EQ(i4.length, 1024 * 1024 + 0x1000);
 
   al1.free_l1(i1);
   al1.free_l1(i2);
@@ -129,37 +129,37 @@ TEST(TestAllocatorLevel01, test_l1)
   al1.free_l1(i4);
 
   i1 = al1.allocate_l1_cont(1024 * 1024, 0x1000, 0, num_l1_entries);
-  ASSERT_TRUE(i1.offset == 0);
-  ASSERT_TRUE(i1.length == 1024 * 1024);
+  ASSERT_EQ(i1.offset, 0);
+  ASSERT_EQ(i1.length, 1024 * 1024);
 
   i2 = al1.allocate_l1_cont(1024 * 1024, 0x1000, 0, num_l1_entries);
-  ASSERT_TRUE(i2.offset == 1 * 1024 * 1024);
-  ASSERT_TRUE(i2.length == 1024 * 1024 );
+  ASSERT_EQ(i2.offset, 1 * 1024 * 1024);
+  ASSERT_EQ(i2.length, 1024 * 1024 );
 
   i3 = al1.allocate_l1_cont(512 * 1024, 0x1000, 0, num_l1_entries);
-  ASSERT_TRUE(i3.offset == 2 * 1024 * 1024);
-  ASSERT_TRUE(i3.length == 512 * 1024);
+  ASSERT_EQ(i3.offset, 2 * 1024 * 1024);
+  ASSERT_EQ(i3.length, 512 * 1024);
 
   i4 = al1.allocate_l1_cont(1536 * 1024, 0x1000, 0, num_l1_entries);
-  ASSERT_TRUE(i4.offset == (2 * 1024 + 512) * 1024 );
-  ASSERT_TRUE(i4.length == 1536 * 1024);
+  ASSERT_EQ(i4.offset, (2 * 1024 + 512) * 1024 );
+  ASSERT_EQ(i4.length, 1536 * 1024);
   // making a hole 1.5 Mb length
   al1.free_l1(i2);
   al1.free_l1(i3);
   // and trying to fill it
   i2 = al1.allocate_l1_cont(1536 * 1024, 0x1000, 0, num_l1_entries);
-  ASSERT_TRUE(i2.offset == 1024 * 1024);
-  ASSERT_TRUE(i2.length == 1536 * 1024);
+  ASSERT_EQ(i2.offset, 1024 * 1024);
+  ASSERT_EQ(i2.length, 1536 * 1024);
 
   al1.free_l1(i2);
   // and trying to fill it partially
   i2 = al1.allocate_l1_cont(1528 * 1024, 0x1000, 0, num_l1_entries);
-  ASSERT_TRUE(i2.offset == 1024 * 1024);
-  ASSERT_TRUE(i2.length == 1528 * 1024);
+  ASSERT_EQ(i2.offset, 1024 * 1024);
+  ASSERT_EQ(i2.length, 1528 * 1024);
 
   i3 = al1.allocate_l1_cont(8 * 1024, 0x1000, 0, num_l1_entries);
-  ASSERT_TRUE(i3.offset == 2552 * 1024);
-  ASSERT_TRUE(i3.length == 8 * 1024);
+  ASSERT_EQ(i3.offset, 2552 * 1024);
+  ASSERT_EQ(i3.length, 8 * 1024);
 
   al1.free_l1(i2);
   // here we have the following layout:
@@ -167,73 +167,73 @@ TEST(TestAllocatorLevel01, test_l1)
   // Free: 1M~1528K, 4M ~...
   //
   i2 = al1.allocate_l1_cont(1536 * 1024, 0x1000, 0, num_l1_entries);
-  ASSERT_TRUE(i2.offset == 4 * 1024 * 1024);
-  ASSERT_TRUE(i2.length == 1536 * 1024);
+  ASSERT_EQ(i2.offset, 4 * 1024 * 1024);
+  ASSERT_EQ(i2.length, 1536 * 1024);
 
   al1.free_l1(i1);
   al1.free_l1(i2);
   al1.free_l1(i3);
   al1.free_l1(i4);
-  ASSERT_TRUE(capacity == al1.debug_get_free());
+  ASSERT_EQ(capacity, al1.debug_get_free());
 
   for (uint64_t i = 0; i < capacity; i += _2m) {
     i1 = al1.allocate_l1_cont(_2m, _2m, 0, num_l1_entries);
-    ASSERT_TRUE(i1.offset == i);
-    ASSERT_TRUE(i1.length == _2m);
+    ASSERT_EQ(i1.offset, i);
+    ASSERT_EQ(i1.length, _2m);
   }
-  ASSERT_TRUE(0 == al1.debug_get_free());
+  ASSERT_EQ(0, al1.debug_get_free());
   i2 = al1.allocate_l1_cont(_2m, _2m, 0, num_l1_entries);
-  ASSERT_TRUE(i2.length == 0);
-  ASSERT_TRUE(0 == al1.debug_get_free());
+  ASSERT_EQ(i2.length, 0);
+  ASSERT_EQ(0, al1.debug_get_free());
 
   al1.free_l1(i1);
   i2 = al1.allocate_l1_cont(_2m, _2m, 0, num_l1_entries);
-  ASSERT_TRUE(i2 == i1);
+  ASSERT_EQ(i2, i1);
   al1.free_l1(i2);
   i2 = al1.allocate_l1_cont(_1m, _1m, 0, num_l1_entries);
-  ASSERT_TRUE(i2.offset == i1.offset);
-  ASSERT_TRUE(i2.length == _1m);
+  ASSERT_EQ(i2.offset, i1.offset);
+  ASSERT_EQ(i2.length, _1m);
 
   i3 = al1.allocate_l1_cont(_2m, _2m, 0, num_l1_entries);
-  ASSERT_TRUE(i3.length == 0);
+  ASSERT_EQ(i3.length, 0);
 
   i3 = al1.allocate_l1_cont(_2m, _1m, 0, num_l1_entries);
-  ASSERT_TRUE(i3.length == _1m);
+  ASSERT_EQ(i3.length, _1m);
 
   i4 = al1.allocate_l1_cont(_2m, _1m, 0, num_l1_entries);
-  ASSERT_TRUE(i4.length == 0);
+  ASSERT_EQ(i4.length, 0);
 
   al1.free_l1(i2);
   i2 = al1.allocate_l1_cont(_2m, _2m, 0, num_l1_entries);
-  ASSERT_TRUE(i2.length == 0);
+  ASSERT_EQ(i2.length, 0);
 
   i2 = al1.allocate_l1_cont(_2m, 0x1000, 0, num_l1_entries);
-  ASSERT_TRUE(i2.length == _1m);
+  ASSERT_EQ(i2.length, _1m);
 
   al1.free_l1(i2);
   al1.free_l1(i3);
-  ASSERT_TRUE(_2m == al1.debug_get_free());
+  ASSERT_EQ(_2m, al1.debug_get_free());
 
   i1 = al1.allocate_l1_cont(_2m - 3 * 0x1000, 0x1000, 0, num_l1_entries);
   i2 = al1.allocate_l1_cont(0x1000, 0x1000, 0, num_l1_entries);
   i3 = al1.allocate_l1_cont(0x1000, 0x1000, 0, num_l1_entries);
   i4 = al1.allocate_l1_cont(0x1000, 0x1000, 0, num_l1_entries);
-  ASSERT_TRUE(0 == al1.debug_get_free());
+  ASSERT_EQ(0, al1.debug_get_free());
 
   al1.free_l1(i2);
   al1.free_l1(i4);
 
   i2 = al1.allocate_l1_cont(0x4000, 0x2000, 0, num_l1_entries);
-  ASSERT_TRUE(i2.length == 0);
+  ASSERT_EQ(i2.length, 0);
   i2 = al1.allocate_l1_cont(0x4000, 0x1000, 0, num_l1_entries);
-  ASSERT_TRUE(i2.length == 0x1000);
+  ASSERT_EQ(i2.length, 0x1000);
 
   al1.free_l1(i3);
   i3 = al1.allocate_l1_cont(0x6000, 0x3000, 0, num_l1_entries);
-  ASSERT_TRUE(i3.length == 0);
+  ASSERT_EQ(i3.length, 0);
   i3 = al1.allocate_l1_cont(0x6000, 0x1000, 0, num_l1_entries);
-  ASSERT_TRUE(i3.length == 0x2000);
-  ASSERT_TRUE(0 == al1.debug_get_free());
+  ASSERT_EQ(i3.length, 0x2000);
+  ASSERT_EQ(0, al1.debug_get_free());
 
   std::cout << "Done L1" << std::endl;
 }
@@ -249,48 +249,48 @@ TEST(TestAllocatorLevel01, test_l2)
   uint64_t allocated1 = 0;
   interval_vector_t a1;
   al2.allocate_l2(0x2000, 0x2000, &allocated1, &a1);
-  ASSERT_TRUE(allocated1 == 0x2000);
-  ASSERT_TRUE(a1[0].offset == 0);
-  ASSERT_TRUE(a1[0].length == 0x2000);
+  ASSERT_EQ(allocated1, 0x2000);
+  ASSERT_EQ(a1[0].offset, 0);
+  ASSERT_EQ(a1[0].length, 0x2000);
 
   // limit query range in debug_get_free for the sake of performance
-  ASSERT_TRUE(0x2000 == al2.debug_get_allocated(0, 1));
-  ASSERT_TRUE(0 == al2.debug_get_allocated(1, 2));
+  ASSERT_EQ(0x2000, al2.debug_get_allocated(0, 1));
+  ASSERT_EQ(0, al2.debug_get_allocated(1, 2));
 
   uint64_t allocated2 = 0;
   interval_vector_t a2;
   al2.allocate_l2(0x2000, 0x2000, &allocated2, &a2);
-  ASSERT_TRUE(allocated2 == 0x2000);
-  ASSERT_TRUE(a2[0].offset == 0x2000);
-  ASSERT_TRUE(a2[0].length == 0x2000);
+  ASSERT_EQ(allocated2, 0x2000);
+  ASSERT_EQ(a2[0].offset, 0x2000);
+  ASSERT_EQ(a2[0].length, 0x2000);
   // limit query range in debug_get_free for the sake of performance
-  ASSERT_TRUE(0x4000 == al2.debug_get_allocated(0, 1));
-  ASSERT_TRUE(0 == al2.debug_get_allocated(1, 2));
+  ASSERT_EQ(0x4000, al2.debug_get_allocated(0, 1));
+  ASSERT_EQ(0, al2.debug_get_allocated(1, 2));
 
   al2.free_l2(a1);
 
   allocated2 = 0;
   a2.clear();
   al2.allocate_l2(0x1000, 0x1000, &allocated2, &a2);
-  ASSERT_TRUE(allocated2 == 0x1000);
-  ASSERT_TRUE(a2[0].offset == 0x0000);
-  ASSERT_TRUE(a2[0].length == 0x1000);
+  ASSERT_EQ(allocated2, 0x1000);
+  ASSERT_EQ(a2[0].offset, 0x0000);
+  ASSERT_EQ(a2[0].length, 0x1000);
   // limit query range in debug_get_free for the sake of performance
-  ASSERT_TRUE(0x3000 == al2.debug_get_allocated(0, 1));
-  ASSERT_TRUE(0 == al2.debug_get_allocated(1, 2));
+  ASSERT_EQ(0x3000, al2.debug_get_allocated(0, 1));
+  ASSERT_EQ(0, al2.debug_get_allocated(1, 2));
 
   uint64_t allocated3 = 0;
   interval_vector_t a3;
   al2.allocate_l2(0x2000, 0x1000, &allocated3, &a3);
-  ASSERT_TRUE(allocated3 == 0x2000);
-  ASSERT_TRUE(a3.size() == 2);
-  ASSERT_TRUE(a3[0].offset == 0x1000);
-  ASSERT_TRUE(a3[0].length == 0x1000);
-  ASSERT_TRUE(a3[1].offset == 0x4000);
-  ASSERT_TRUE(a3[1].length == 0x1000);
+  ASSERT_EQ(allocated3, 0x2000);
+  ASSERT_EQ(a3.size(), 2);
+  ASSERT_EQ(a3[0].offset, 0x1000);
+  ASSERT_EQ(a3[0].length, 0x1000);
+  ASSERT_EQ(a3[1].offset, 0x4000);
+  ASSERT_EQ(a3[1].length, 0x1000);
   // limit query range in debug_get_free for the sake of performance
-  ASSERT_TRUE(0x5000 == al2.debug_get_allocated(0, 1));
-  ASSERT_TRUE(0 == al2.debug_get_allocated(1, 2));
+  ASSERT_EQ(0x5000, al2.debug_get_allocated(0, 1));
+  ASSERT_EQ(0, al2.debug_get_allocated(1, 2));
   {
     interval_vector_t r;
     r.emplace_back(0x0, 0x5000);
@@ -300,18 +300,18 @@ TEST(TestAllocatorLevel01, test_l2)
   a3.clear();
   allocated3 = 0;
   al2.allocate_l2(_1m, _1m, &allocated3, &a3);
-  ASSERT_TRUE(a3.size() == 1);
-  ASSERT_TRUE(a3[0].offset == 0);
-  ASSERT_TRUE(a3[0].length == _1m);
+  ASSERT_EQ(a3.size(), 1);
+  ASSERT_EQ(a3[0].offset, 0);
+  ASSERT_EQ(a3[0].length, _1m);
 
   al2.free_l2(a3);
 
   a3.clear();
   allocated3 = 0;
   al2.allocate_l2(4 * _1m, _1m, &allocated3, &a3);
-  ASSERT_TRUE(a3.size() == 1);
-  ASSERT_TRUE(a3[0].offset == 0);
-  ASSERT_TRUE(a3[0].length == 4 * _1m);
+  ASSERT_EQ(a3.size(), 1);
+  ASSERT_EQ(a3[0].offset, 0);
+  ASSERT_EQ(a3[0].length, 4 * _1m);
 
   al2.free_l2(a3);
 
@@ -320,9 +320,9 @@ TEST(TestAllocatorLevel01, test_l2)
     uint64_t allocated4 = 0;
     interval_vector_t a4;
     al2.allocate_l2(0x1000, 0x1000, &allocated4, &a4);
-    ASSERT_TRUE(a4.size() == 1);
-    ASSERT_TRUE(a4[0].offset == i);
-    ASSERT_TRUE(a4[0].length == 0x1000);
+    ASSERT_EQ(a4.size(), 1);
+    ASSERT_EQ(a4[0].offset, i);
+    ASSERT_EQ(a4[0].length, 0x1000);
     if (0 == (i % (1 * 1024 * _1m))) {
       std::cout << "alloc1 " << i / 1024 / 1024 << " mb of "
         << capacity / 1024 / 1024 << std::endl;
@@ -333,9 +333,9 @@ TEST(TestAllocatorLevel01, test_l2)
     uint64_t allocated4 = 0;
     interval_vector_t a4;
     al2.allocate_l2(_2m, _2m, &allocated4, &a4);
-    ASSERT_TRUE(a4.size() == 1);
-    ASSERT_TRUE(a4[0].offset == i);
-    ASSERT_TRUE(a4[0].length == _2m);
+    ASSERT_EQ(a4.size(), 1);
+    ASSERT_EQ(a4[0].offset, i);
+    ASSERT_EQ(a4[0].length, _2m);
     if (0 == (i % (1 * 1024 * _1m))) {
       std::cout << "alloc1 " << i / 1024 / 1024 << " mb of "
                 << capacity / 1024 / 1024 << std::endl;
@@ -343,7 +343,7 @@ TEST(TestAllocatorLevel01, test_l2)
   }
 #endif
 
-  ASSERT_TRUE(0 == al2.debug_get_free());
+  ASSERT_EQ(0, al2.debug_get_free());
   for (uint64_t i = 0; i < capacity; i += _1m) {
     interval_vector_t r;
     r.emplace_back(interval_t(i, _1m));
@@ -353,28 +353,28 @@ TEST(TestAllocatorLevel01, test_l2)
         << capacity / 1024 / 1024 << std::endl;
     }
   }
-  ASSERT_TRUE(capacity == al2.debug_get_free());
+  ASSERT_EQ(capacity, al2.debug_get_free());
 
   for (uint64_t i = 0; i < capacity; i += _1m) {
     uint64_t allocated4 = 0;
     interval_vector_t a4;
     al2.allocate_l2(_1m, _1m, &allocated4, &a4);
-    ASSERT_TRUE(a4.size() == 1);
-    ASSERT_TRUE(allocated4 == _1m);
-    ASSERT_TRUE(a4[0].offset == i);
-    ASSERT_TRUE(a4[0].length == _1m);
+    ASSERT_EQ(a4.size(), 1);
+    ASSERT_EQ(allocated4, _1m);
+    ASSERT_EQ(a4[0].offset, i);
+    ASSERT_EQ(a4[0].length, _1m);
     if (0 == (i % (1 * 1024 * _1m))) {
       std::cout << "alloc2 " << i / 1024 / 1024 << " mb of "
         << capacity / 1024 / 1024 << std::endl;
     }
   }
-  ASSERT_TRUE(0 == al2.debug_get_free());
+  ASSERT_EQ(0, al2.debug_get_free());
   uint64_t allocated4 = 0;
   interval_vector_t a4;
   al2.allocate_l2(_1m, _1m, &allocated4, &a4);
-  ASSERT_TRUE(a4.size() == 0);
+  ASSERT_EQ(a4.size(), 0);
   al2.allocate_l2(0x1000, 0x1000, &allocated4, &a4);
-  ASSERT_TRUE(a4.size() == 0);
+  ASSERT_EQ(a4.size(), 0);
 
   for (uint64_t i = 0; i < capacity; i += 0x2000) {
     interval_vector_t r;
@@ -385,26 +385,26 @@ TEST(TestAllocatorLevel01, test_l2)
         << capacity / 1024 / 1024 << std::endl;
     }
   }
-  ASSERT_TRUE(capacity / 2 == al2.debug_get_free());
+  ASSERT_EQ(capacity / 2, al2.debug_get_free());
 
   // unable to allocate due to fragmentation
   al2.allocate_l2(_1m, _1m, &allocated4, &a4);
-  ASSERT_TRUE(a4.size() == 0);
+  ASSERT_EQ(a4.size(), 0);
 
   for (uint64_t i = 0; i < capacity; i += 2 * _1m) {
     a4.clear();
     allocated4 = 0;
     al2.allocate_l2(_1m, 0x1000, &allocated4, &a4);
-    ASSERT_TRUE(a4.size() == _1m / 0x1000);
-    ASSERT_TRUE(allocated4 == _1m);
-    ASSERT_TRUE(a4[0].offset == i);
-    ASSERT_TRUE(a4[0].length == 0x1000);
+    ASSERT_EQ(a4.size(), _1m / 0x1000);
+    ASSERT_EQ(allocated4, _1m);
+    ASSERT_EQ(a4[0].offset, i);
+    ASSERT_EQ(a4[0].length, 0x1000);
     if (0 == (i % (1 * 1024 * _1m))) {
       std::cout << "alloc3 " << i / 1024 / 1024 << " mb of "
         << capacity / 1024 / 1024 << std::endl;
     }
   }
-  ASSERT_TRUE(0 == al2.debug_get_free());
+  ASSERT_EQ(0, al2.debug_get_free());
 
   std::cout << "Done L2" << std::endl;
 }
@@ -487,22 +487,22 @@ TEST(TestAllocatorLevel01, test_l2_unaligned)
       uint64_t allocated4 = 0;
       interval_vector_t a4;
       al2.allocate_l2(_1m / 2, _1m / 2, &allocated4, &a4);
-      ASSERT_TRUE(a4.size() == 1);
-      ASSERT_TRUE(allocated4 == _1m / 2);
-      ASSERT_TRUE(a4[0].offset == i);
-      ASSERT_TRUE(a4[0].length == _1m / 2);
+      ASSERT_EQ(a4.size(), 1);
+      ASSERT_EQ(allocated4, _1m / 2);
+      ASSERT_EQ(a4[0].offset, i);
+      ASSERT_EQ(a4[0].length, _1m / 2);
       if (0 == (i % (1 * 1024 * _1m))) {
         std::cout << "allocU " << i / 1024 / 1024 << " mb of "
           << capacity / 1024 / 1024 << std::endl;
       }
     }
-    ASSERT_TRUE(0 == al2.debug_get_free());
+    ASSERT_EQ(0, al2.debug_get_free());
     {
       // no space to allocate
       uint64_t allocated4 = 0;
       interval_vector_t a4;
       al2.allocate_l2(0x1000, 0x1000, &allocated4, &a4);
-      ASSERT_TRUE(a4.size() == 0);
+      ASSERT_EQ(a4.size(), 0);
     }
   }
   {
@@ -514,22 +514,22 @@ TEST(TestAllocatorLevel01, test_l2_unaligned)
       uint64_t allocated4 = 0;
       interval_vector_t a4;
       al2.allocate_l2(_1m / 2, _1m / 2, &allocated4, &a4);
-      ASSERT_TRUE(a4.size() == 1);
-      ASSERT_TRUE(allocated4 == _1m / 2);
-      ASSERT_TRUE(a4[0].offset == i);
-      ASSERT_TRUE(a4[0].length == _1m / 2);
+      ASSERT_EQ(a4.size(), 1);
+      ASSERT_EQ(allocated4, _1m / 2);
+      ASSERT_EQ(a4[0].offset, i);
+      ASSERT_EQ(a4[0].length, _1m / 2);
       if (0 == (i % (1 * 1024 * _1m))) {
         std::cout << "allocU2 " << i / 1024 / 1024 << " mb of "
           << capacity / 1024 / 1024 << std::endl;
       }
     }
-    ASSERT_TRUE(0 == al2.debug_get_free());
+    ASSERT_EQ(0, al2.debug_get_free());
     {
       // no space to allocate
       uint64_t allocated4 = 0;
       interval_vector_t a4;
       al2.allocate_l2(0x1000, 0x1000, &allocated4, &a4);
-      ASSERT_TRUE(a4.size() == 0);
+      ASSERT_EQ(a4.size(), 0);
     }
   }
 
@@ -542,18 +542,18 @@ TEST(TestAllocatorLevel01, test_l2_unaligned)
       uint64_t allocated4 = 0;
       interval_vector_t a4;
       al2.allocate_l2(0x1000, 0x1000, &allocated4, &a4);
-      ASSERT_TRUE(a4.size() == 1);
-      ASSERT_TRUE(allocated4 == 0x1000);
-      ASSERT_TRUE(a4[0].offset == i);
-      ASSERT_TRUE(a4[0].length == 0x1000);
+      ASSERT_EQ(a4.size(), 1);
+      ASSERT_EQ(allocated4, 0x1000);
+      ASSERT_EQ(a4[0].offset, i);
+      ASSERT_EQ(a4[0].length, 0x1000);
     }
-    ASSERT_TRUE(0 == al2.debug_get_free());
+    ASSERT_EQ(0, al2.debug_get_free());
     {
       // no space to allocate
       uint64_t allocated4 = 0;
       interval_vector_t a4;
       al2.allocate_l2(0x1000, 0x1000, &allocated4, &a4);
-      ASSERT_TRUE(a4.size() == 0);
+      ASSERT_EQ(a4.size(), 0);
     }
   }
   {
@@ -565,18 +565,18 @@ TEST(TestAllocatorLevel01, test_l2_unaligned)
       uint64_t allocated4 = 0;
       interval_vector_t a4;
       al2.allocate_l2(0x1000, 0x1000, &allocated4, &a4);
-      ASSERT_TRUE(a4.size() == 1);
-      ASSERT_TRUE(allocated4 == 0x1000);
-      ASSERT_TRUE(a4[0].offset == i);
-      ASSERT_TRUE(a4[0].length == 0x1000);
+      ASSERT_EQ(a4.size(), 1);
+      ASSERT_EQ(allocated4, 0x1000);
+      ASSERT_EQ(a4[0].offset, i);
+      ASSERT_EQ(a4[0].length, 0x1000);
     }
-    ASSERT_TRUE(0 == al2.debug_get_free());
+    ASSERT_EQ(0, al2.debug_get_free());
     {
       // no space to allocate
       uint64_t allocated4 = 0;
       interval_vector_t a4;
       al2.allocate_l2(0x1000, 0x1000, &allocated4, &a4);
-      ASSERT_TRUE(a4.size() == 0);
+      ASSERT_EQ(a4.size(), 0);
     }
   }