derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: Convert AddrRangeMap unit test to a GTest

Browse Source 
Change-Id: Ifeb0b57c0cda77706691286f78325e50edb31c0d
Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/13736
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
This commit is contained in:
Andreas Sandberg
2018-10-24 12:08:09 +01:00
parent 78addea341
commit d05e6aae70
3 changed files with 13 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/base/SConscript
View File

@@ -83,6 +83,7 @@ Source('loader/symtab.cc')
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')

37
src/unittest/rangemaptest.cc → src/base/addr_range_map_test.cc
View File

@@ -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());
}

1
src/unittest/SConscript
View File

@@ -35,7 +35,6 @@ Source('unittest.cc')
UnitTest('cprintftime', 'cprintftime.cc')
UnitTest('initest', 'initest.cc')
UnitTest('nmtest', 'nmtest.cc')
UnitTest('rangemaptest', 'rangemaptest.cc')
UnitTest('refcnttest', 'refcnttest.cc')
UnitTest('strnumtest', 'strnumtest.cc')