From d05e6aae7096341569eee1e835614b33a3016bd7 Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Wed, 24 Oct 2018 12:08:09 +0100 Subject: tests: Convert AddrRangeMap unit test to a GTest Change-Id: Ifeb0b57c0cda77706691286f78325e50edb31c0d Signed-off-by: Andreas Sandberg Reviewed-on: https://gem5-review.googlesource.com/c/13736 Reviewed-by: Jason Lowe-Power Reviewed-by: Giacomo Travaglini --- src/base/SConscript | 1 + src/base/addr_range_map_test.cc | 70 ++++++++++++++++++++++++++++++++++ src/unittest/SConscript | 1 - src/unittest/rangemaptest.cc | 83 ----------------------------------------- 4 files changed, 71 insertions(+), 84 deletions(-) create mode 100644 src/base/addr_range_map_test.cc delete mode 100644 src/unittest/rangemaptest.cc diff --git a/src/base/SConscript b/src/base/SConscript index 3570d1574..d84eba14c 100644 --- a/src/base/SConscript +++ b/src/base/SConscript @@ -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') diff --git a/src/base/addr_range_map_test.cc b/src/base/addr_range_map_test.cc new file mode 100644 index 000000000..397372c06 --- /dev/null +++ b/src/base/addr_range_map_test.cc @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2012, 2018 ARM Limited + * All rights reserved + * + * The license below extends only to copyright in the software and shall + * not be construed as granting a license to any other intellectual + * property including but not limited to intellectual property relating + * to a hardware implementation of the functionality of the software + * licensed hereunder. You may use the software subject to the license + * terms below provided that you ensure that this notice is replicated + * unmodified and in its entirety in all distributions of the software, + * modified or unmodified, in source code or in binary form. + * + * Copyright (c) 2006 The Regents of The University of Michigan + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer; + * redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution; + * neither the name of the copyright holders nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Authors: Ali Saidi + */ + +#include + +#include "base/addr_range_map.hh" + +// Converted from legacy unit test framework +TEST(AddrRangeMapTest, LegacyTests) +{ + AddrRangeMap r; + AddrRangeMap::const_iterator i; + + i = r.insert(RangeIn(10, 40), 5); + ASSERT_NE(i, r.end()); + + i = r.insert(RangeIn(60, 90), 3); + ASSERT_NE(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); + EXPECT_EQ(i, r.end()); + + i = r.insert(RangeIn(0, 9), 1); + ASSERT_NE(i, r.end()); + + EXPECT_NE(r.contains(RangeIn(20, 30)), r.end()); +} diff --git a/src/unittest/SConscript b/src/unittest/SConscript index b104932ba..3f657345f 100644 --- a/src/unittest/SConscript +++ b/src/unittest/SConscript @@ -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') diff --git a/src/unittest/rangemaptest.cc b/src/unittest/rangemaptest.cc deleted file mode 100644 index 88e1c4d66..000000000 --- a/src/unittest/rangemaptest.cc +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (c) 2012, 2018 ARM Limited - * All rights reserved - * - * The license below extends only to copyright in the software and shall - * not be construed as granting a license to any other intellectual - * property including but not limited to intellectual property relating - * to a hardware implementation of the functionality of the software - * licensed hereunder. You may use the software subject to the license - * terms below provided that you ensure that this notice is replicated - * unmodified and in its entirety in all distributions of the software, - * modified or unmodified, in source code or in binary form. - * - * Copyright (c) 2006 The Regents of The University of Michigan - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer; - * redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution; - * neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * Authors: Ali Saidi - */ - -#include -#include - -#include "base/addr_range_map.hh" - -using namespace std; - -int -main() -{ - AddrRangeMap r; - - AddrRangeMap::const_iterator i; - - i = r.insert(RangeIn(10, 40), 5); - assert(i != r.end()); - i = r.insert(RangeIn(60, 90), 3); - assert(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()); - - i = r.insert(RangeIn(0, 12), 1); - assert(i == r.end()); - - i = r.insert(RangeIn(0, 9), 1); - assert(i != r.end()); - - i = r.contains(RangeIn(20, 30)); - assert(i != r.end()); - cout << i->first.to_string() << " " << i->second << endl; - - return 0; -} -- cgit v1.2.3