diff --git a/CoreTest/configtest.cpp b/CoreTest/configtest.cpp index d7547c6..2248e6e 100644 --- a/CoreTest/configtest.cpp +++ b/CoreTest/configtest.cpp @@ -2,49 +2,48 @@ #include using namespace Config; -ConfigTest::ConfigTest() +ConfigTest::ConfigTest(Configration *test_ins) + : xml(test_ins) { } void ConfigTest::testConfig() { - XMLConfig xml; - xml.loadFile("./base_test.xml"); + xml->loadFile("./base_test.xml"); QStringList keys; keys << "test-key" << "test-sub"; - xml.setConfig(keys , "omevalue"); - QVERIFY(xml.getConfig(keys) == "omevalue"); + xml->setConfig(keys , "omevalue"); + QVERIFY(xml->getConfig(keys) == "omevalue"); - xml.deleteX(keys); - QVERIFY(xml.getConfig(keys) == ""); + xml->deleteX(keys); + QVERIFY(xml->getConfig(keys) == ""); - xml.setConfig(keys , "omevalue"); - QVERIFY(xml.getConfig(keys) == "omevalue"); + xml->setConfig(keys , "omevalue"); + QVERIFY(xml->getConfig(keys) == "omevalue"); } void ConfigTest::testList() { - XMLConfig xml; - xml.loadFile("./base_test.xml"); + xml->loadFile("./base_test.xml"); QStringList keys; keys << "test-key" << "test-sub"; QStringList values; values << "v0" << "v1"; - xml.setList(keys, values); + xml->setList(keys, values); - auto temp_list = xml.getList(keys); + auto temp_list = xml->getList(keys); for(auto &v : values){ QVERIFY(temp_list.contains(v)); } - xml.deleteX(keys); - QVERIFY(xml.getList(keys).count() == 0); + xml->deleteX(keys); + QVERIFY(xml->getList(keys).count() == 0); - xml.setList(keys, values); - temp_list = xml.getList(keys); + xml->setList(keys, values); + temp_list = xml->getList(keys); for(auto &v : values){ QVERIFY(temp_list.contains(v)); } @@ -52,8 +51,7 @@ void ConfigTest::testList() void ConfigTest::testMap() { - XMLConfig xml; - xml.loadFile("./base_test.xml"); + xml->loadFile("./base_test.xml"); QStringList keys; keys << "key0" << "key1" << "key2" << "key3"; QHash map; @@ -62,17 +60,17 @@ void ConfigTest::testMap() map["key2"] = "value2"; map["key3"] = "value3"; - xml.setMap(keys, map); - auto temp_map = xml.getMap(keys); + xml->setMap(keys, map); + auto temp_map = xml->getMap(keys); for(auto &v : keys){ QVERIFY(temp_map[v] == map[v]); } - xml.deleteX(keys); - QVERIFY(xml.getMap(keys).count() == 0); + xml->deleteX(keys); + QVERIFY(xml->getMap(keys).count() == 0); - xml.setMap(keys, map); - temp_map = xml.getMap(keys); + xml->setMap(keys, map); + temp_map = xml->getMap(keys); for(auto &v : keys){ QVERIFY(temp_map[v] == map[v]); } @@ -81,35 +79,34 @@ void ConfigTest::testMap() void ConfigTest::testReload() { - XMLConfig xml; - xml.loadFile("./base_test.xml"); + xml->loadFile("./base_test.xml"); QStringList keys; keys << "test-key" << "test-sub"; - xml.setConfig(keys , "omevalue"); + xml->setConfig(keys , "omevalue"); QStringList values; values << "v0" << "v1"; - xml.setList(keys, values); + xml->setList(keys, values); QHash map; map["key0"] = "value0"; map["key1"] = "value1"; map["key2"] = "value2"; map["key3"] = "value3"; - xml.setMap(keys, map); + xml->setMap(keys, map); - xml.save(); + xml->save(); - xml.loadFile("./base_test.xml"); - QVERIFY(xml.getConfig(keys) == "omevalue"); + xml->loadFile("./base_test.xml"); + QVERIFY(xml->getConfig(keys) == "omevalue"); - auto temp_list = xml.getList(keys); + auto temp_list = xml->getList(keys); for(auto &v : values){ QVERIFY(temp_list.contains(v)); } - auto temp_map = xml.getMap(keys); + auto temp_map = xml->getMap(keys); for(auto &v : keys){ QVERIFY(temp_map[v] == map[v]); } @@ -118,13 +115,12 @@ void ConfigTest::testReload() void ConfigTest::testException() { ParseException *temp = nullptr; - XMLConfig xml; QFile test_f("./exists_test.xml"); if(test_f.exists()) test_f.remove(); try { - xml.loadFile("./exists_test.xml"); + xml->loadFile("./exists_test.xml"); } catch (ParseException *x) { } @@ -134,7 +130,7 @@ void ConfigTest::testException() anchor.open(QIODevice::WriteOnly|QIODevice::NewOnly); try{ - xml.loadFile("./exception_base_test.xml"); + xml->loadFile("./exception_base_test.xml"); } catch (ParseException *x) { temp = x; @@ -151,7 +147,7 @@ void ConfigTest::testException() anchor.close(); try{ - xml.loadFile("./exception_base_test.xml"); + xml->loadFile("./exception_base_test.xml"); } catch (ParseException *x) { temp = x; diff --git a/CoreTest/configtest.h b/CoreTest/configtest.h index 2db6311..b16699f 100644 --- a/CoreTest/configtest.h +++ b/CoreTest/configtest.h @@ -1,13 +1,17 @@ #ifndef CONFIGTEST_H #define CONFIGTEST_H #include +#include #include class ConfigTest : public QObject { Q_OBJECT public: - ConfigTest(); + ConfigTest(Config::Configration *test_ins); + +private: + Config::Configration *xml; private slots: void testReload(); diff --git a/CoreTest/main.cpp b/CoreTest/main.cpp index 127c57c..c14bd98 100644 --- a/CoreTest/main.cpp +++ b/CoreTest/main.cpp @@ -1,12 +1,13 @@ #include #include "configtest.h" +#include "xmlconfig.h" int main(int argc, char *argv[]) { QCoreApplication a(argc, argv); - ConfigTest t0; + ConfigTest t0(new Config::XMLConfig()); QTest::qExec(&t0, argc, argv); return a.exec();