From 54c4c8a3c957f3ab3a486328aac50acc442168af Mon Sep 17 00:00:00 2001 From: Giacomo Travaglini Date: Thu, 22 Nov 2018 15:09:04 +0000 Subject: tests: Convert IniFile unit test to a GTest Change-Id: I47d6c9cbae21877420a15ffcf8489e3c26959139 Signed-off-by: Giacomo Travaglini Reviewed-on: https://gem5-review.googlesource.com/c/14615 Reviewed-by: Gabe Black Maintainer: Gabe Black --- src/base/SConscript | 1 + src/base/inifiletest.cc | 110 ++++++++++++++++++++++++++++++++++++++++++++++++ src/unittest/SConscript | 1 - src/unittest/initest.cc | 92 ---------------------------------------- 4 files changed, 111 insertions(+), 93 deletions(-) create mode 100644 src/base/inifiletest.cc delete mode 100644 src/unittest/initest.cc diff --git a/src/base/SConscript b/src/base/SConscript index d84eba14c..b0893a145 100644 --- a/src/base/SConscript +++ b/src/base/SConscript @@ -53,6 +53,7 @@ Source('framebuffer.cc') Source('hostinfo.cc') Source('inet.cc') Source('inifile.cc') +GTest('inifiletest', 'inifiletest.cc', 'inifile.cc', 'str.cc') Source('intmath.cc') Source('logging.cc') Source('match.cc') diff --git a/src/base/inifiletest.cc b/src/base/inifiletest.cc new file mode 100644 index 000000000..d33190580 --- /dev/null +++ b/src/base/inifiletest.cc @@ -0,0 +1,110 @@ +/* + * Copyright (c) 2018 ARM Limited + * All rights reserved + * + * Copyright (c) 2002-2005 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: Nathan Binkert + * Steve Reinhardt + */ + +#include +#include +#include +#include + +#include + +#include "base/inifile.hh" + +using namespace std; + +namespace { + +std::istringstream iniFile(R"ini_file( +[General] + Test1=BARasdf + Test2=bar + +[Junk] +Test3=yo +Test4=mama + +[Foo] +Foo1=89 +Foo2=384 + +[General] +Test3=89 + +[Junk] +Test4+=mia +)ini_file"); + +}; + +TEST(Initest, MatchFound) +{ + IniFile simConfigDB; + simConfigDB.load(iniFile); + + std::string value; + + auto ret = simConfigDB.find("General", "Test2", value); + ASSERT_TRUE(ret); + ASSERT_STREQ(value.c_str(), "bar"); + + ret = simConfigDB.find("Junk", "Test3", value); + ASSERT_TRUE(ret); + ASSERT_STREQ(value.c_str(), "yo"); + + ret = simConfigDB.find("Junk", "Test4", value); + ASSERT_TRUE(ret); + ASSERT_STREQ(value.c_str(), "mama mia"); + + ret = simConfigDB.find("General", "Test1", value); + ASSERT_TRUE(ret); + ASSERT_STREQ(value.c_str(), "BARasdf"); + + ret = simConfigDB.find("General", "Test3", value); + ASSERT_TRUE(ret); + ASSERT_STREQ(value.c_str(), "89"); +} + +TEST(Initest, MatchNotFound) +{ + IniFile simConfigDB; + simConfigDB.load(iniFile); + + std::string value; + + auto ret = simConfigDB.find("Junk2", "test3", value); + ASSERT_FALSE(ret); + + ret = simConfigDB.find("Junk", "test4", value); + ASSERT_FALSE(ret); +} diff --git a/src/unittest/SConscript b/src/unittest/SConscript index 3f657345f..f437a1dda 100644 --- a/src/unittest/SConscript +++ b/src/unittest/SConscript @@ -33,7 +33,6 @@ Import('*') Source('unittest.cc') UnitTest('cprintftime', 'cprintftime.cc') -UnitTest('initest', 'initest.cc') UnitTest('nmtest', 'nmtest.cc') UnitTest('refcnttest', 'refcnttest.cc') UnitTest('strnumtest', 'strnumtest.cc') diff --git a/src/unittest/initest.cc b/src/unittest/initest.cc deleted file mode 100644 index 222fcabae..000000000 --- a/src/unittest/initest.cc +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright (c) 2002-2005 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: Nathan Binkert - * Steve Reinhardt - */ - -#include -#include -#include -#include - -#include "base/cprintf.hh" -#include "base/inifile.hh" - -using namespace std; - -namespace { - -std::istringstream iniFile(R"ini_file( -[General] - Test1=BARasdf - Test2=bar - -[Junk] -Test3=yo -Test4=mama - -[Foo] -Foo1=89 -Foo2=384 - -[General] -Test3=89 - -[Junk] -Test4+=mia -)ini_file"); - -}; - -int -main(int argc, char *argv[]) -{ - IniFile simConfigDB; - simConfigDB.load(iniFile); - - string value; - -#define FIND(C, E) \ - if (simConfigDB.find(C, E, value)) \ - cout << ">" << value << "<\n"; \ - else \ - cout << "Not Found!\n" - - FIND("General", "Test2"); - FIND("Junk", "Test3"); - FIND("Junk", "Test4"); - FIND("General", "Test1"); - FIND("Junk2", "test3"); - FIND("General", "Test3"); - - cout << "\n"; - - simConfigDB.dump(); - - return 0; -} -- cgit v1.2.3