diff --git a/cacic-teste/cacic-teste.pro b/cacic-teste/cacic-teste.pro index 91c45ee..aff897c 100644 --- a/cacic-teste/cacic-teste.pro +++ b/cacic-teste/cacic-teste.pro @@ -21,7 +21,8 @@ SOURCES += \ testcacic.cpp \ ../src/ccacic.cpp \ ../src/cacic_computer.cpp \ - ../src/operatingsystem.cpp + ../src/operatingsystem.cpp \ + ../gercols/gercols.cpp HEADERS += \ @@ -30,7 +31,8 @@ HEADERS += \ ../src/cacic_computer.h \ ../src/cacic_comm.h \ ../src/console.h \ - ../src/operatingsystem.h + ../src/operatingsystem.h \ + ../gercols/gercols.cpp INCLUDEPATH += ../src \ ../src/crypto++/include/ diff --git a/cacic-teste/testcacic.cpp b/cacic-teste/testcacic.cpp index 0bb9ecd..a97413a 100644 --- a/cacic-teste/testcacic.cpp +++ b/cacic-teste/testcacic.cpp @@ -191,7 +191,31 @@ void CTestCacic::testJsonFromFile() QVERIFY(OCacic.getJsonFromFile("teste.json")["teste"].toString() == "teste"); } +void CTestCacic::testReadConfig() +{ + + // Inicializa um arquivo de configuração stub + // que seria parecido com o recebido do Gerente + QJsonObject configJson; + QJsonObject configHardware; + QJsonObject configSoftware; + + configHardware["network_interface"] = QJsonValue::fromVariant(QString("")); + configSoftware["operating_system"] = QJsonValue::fromVariant(QString("")); + + configJson["hardware"] = configHardware; + configJson["software"] = configSoftware; + + OCacic.setJsonToFile(configJson,"configRequest.json"); + + // Leitura do arquivo de configuração + OGercols.readConfig(); + + QVERIFY(OGercols.getConfigJson() == configJson); +} + void CTestCacic::cleanupTestCase() { + OCacic.deleteFile("configRequest.json"); OCacic.deleteFile("teste.json"); } diff --git a/cacic-teste/testcacic.h b/cacic-teste/testcacic.h index 6597125..cc36a70 100644 --- a/cacic-teste/testcacic.h +++ b/cacic-teste/testcacic.h @@ -15,6 +15,7 @@ #include #include #include "../install-cacic/installcacic.h" +#include "../gercols/gercols.h" class CTestCacic : public QObject { @@ -26,6 +27,7 @@ private: CacicComm OCacicComm; CCacic OCacic; CACIC_Computer OCacicComp; + Gercols OGercols; QString testPath; QString testIniPath; QJsonObject session; @@ -59,6 +61,7 @@ private slots: void testOperatingSystemToJsonObject(); void testJsonToFile(); void testJsonFromFile(); + void testReadConfig(); void cleanupTestCase(); }; diff --git a/gercols/gercols.cpp b/gercols/gercols.cpp new file mode 100644 index 0000000..b586369 --- /dev/null +++ b/gercols/gercols.cpp @@ -0,0 +1,15 @@ +#include "gercols.h" + +Gercols::Gercols() +{ +} + +void Gercols::readConfig() +{ + +} + +QJsonObject Gercols::getConfigJson() +{ + return QJsonObject(); +} diff --git a/gercols/gercols.h b/gercols/gercols.h new file mode 100644 index 0000000..0b2ad1c --- /dev/null +++ b/gercols/gercols.h @@ -0,0 +1,15 @@ +#ifndef GERCOLS_H +#define GERCOLS_H + +#include + +class Gercols +{ +public: + Gercols(); + + void readConfig(); + QJsonObject getConfigJson(); +}; + +#endif // GERCOLS_H diff --git a/gercols/gercols.pro b/gercols/gercols.pro index 1a9347a..bea60bb 100644 --- a/gercols/gercols.pro +++ b/gercols/gercols.pro @@ -23,13 +23,17 @@ TEMPLATE = app SOURCES += \ main.cpp \ ../src/ccacic.cpp \ - ../src/cacic_computer.cpp + ../src/cacic_computer.cpp \ + ../src/operatingsystem.cpp \ + ./gercols.cpp HEADERS += \ ../src/ccacic.h \ ../src/cacic_computer.h \ - ../src/cacic_comm.h + ../src/operatingsystem.h \ + ../src/console.h \ + ./gercols.h INCLUDEPATH += ../src \ ../src/crypto++/include/ -- libgit2 0.21.2