Andreas Sandberg has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/13736 )
Change subject: tests: Convert AddrRangeMap unit test to a GTest
......................................................................
tests: Convert AddrRangeMap unit test to a GTest
Change-Id: Ifeb0b57c0cda77706691286f78325e50edb31c0d
Signed-off-by: Andreas Sandberg <andreas.sandb...@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/13736
Reviewed-by: Jason Lowe-Power <ja...@lowepower.com>
Reviewed-by: Giacomo Travaglini <giacomo.travagl...@arm.com>
---
M src/base/SConscript
R src/base/addr_range_map_test.cc
M src/unittest/SConscript
3 files changed, 13 insertions(+), 26 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved
Giacomo Travaglini: Looks good to me, approved
Andreas Sandberg: Looks good to me, approved
diff --git a/src/base/SConscript b/src/base/SConscript
index 3570d15..d84eba1 100644
--- a/src/base/SConscript
+++ b/src/base/SConscript
@@ -83,6 +83,7 @@
Source('stats/text.cc')
GTest('addr_range_test', 'addr_range_test.cc')
+GTest('AddrRangeMapTest', 'addr_range_map_test.cc')
GTest('bituniontest', 'bituniontest.cc')
GTest('CircleBufTest', 'circlebuftest.cc')
diff --git a/src/unittest/rangemaptest.cc b/src/base/addr_range_map_test.cc
similarity index 80%
rename from src/unittest/rangemaptest.cc
rename to src/base/addr_range_map_test.cc
index 88e1c4d..397372c 100644
--- a/src/unittest/rangemaptest.cc
+++ b/src/base/addr_range_map_test.cc
@@ -40,44 +40,31 @@
* Authors: Ali Saidi
*/
-#include <cassert>
-#include <iostream>
+#include <gtest/gtest.h>
#include "base/addr_range_map.hh"
-using namespace std;
-
-int
-main()
+// Converted from legacy unit test framework
+TEST(AddrRangeMapTest, LegacyTests)
{
AddrRangeMap<int> r;
-
AddrRangeMap<int>::const_iterator i;
i = r.insert(RangeIn(10, 40), 5);
- assert(i != r.end());
+ ASSERT_NE(i, r.end());
+
i = r.insert(RangeIn(60, 90), 3);
- assert(i != r.end());
+ ASSERT_NE(i, r.end());
- i = r.intersects(RangeIn(20, 30));
- assert(i != r.end());
- cout << i->first.to_string() << " " << i->second << endl;
-
- i = r.contains(RangeIn(55, 55));
- assert(i == r.end());
-
- i = r.intersects(RangeIn(55, 55));
- assert(i == r.end());
+ EXPECT_NE(r.intersects(RangeIn(20, 30)), r.end());
+ EXPECT_EQ(r.contains(RangeIn(55, 55)), r.end());
+ EXPECT_EQ(r.intersects(RangeIn(55, 55)), r.end());
i = r.insert(RangeIn(0, 12), 1);
- assert(i == r.end());
+ EXPECT_EQ(i, r.end());
i = r.insert(RangeIn(0, 9), 1);
- assert(i != r.end());
+ ASSERT_NE(i, r.end());
- i = r.contains(RangeIn(20, 30));
- assert(i != r.end());
- cout << i->first.to_string() << " " << i->second << endl;
-
- return 0;
+ EXPECT_NE(r.contains(RangeIn(20, 30)), r.end());
}
diff --git a/src/unittest/SConscript b/src/unittest/SConscript
index b104932..3f65734 100644
--- a/src/unittest/SConscript
+++ b/src/unittest/SConscript
@@ -35,7 +35,6 @@
UnitTest('cprintftime', 'cprintftime.cc')
UnitTest('initest', 'initest.cc')
UnitTest('nmtest', 'nmtest.cc')
-UnitTest('rangemaptest', 'rangemaptest.cc')
UnitTest('refcnttest', 'refcnttest.cc')
UnitTest('strnumtest', 'strnumtest.cc')
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/13736
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: Ifeb0b57c0cda77706691286f78325e50edb31c0d
Gerrit-Change-Number: 13736
Gerrit-PatchSet: 2
Gerrit-Owner: Andreas Sandberg <andreas.sandb...@arm.com>
Gerrit-Reviewer: Andreas Sandberg <andreas.sandb...@arm.com>
Gerrit-Reviewer: Gabe Black <gabebl...@google.com>
Gerrit-Reviewer: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-Reviewer: Jason Lowe-Power <ja...@lowepower.com>
Gerrit-CC: Abhishek Singh <abs...@lehigh.edu>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev
