diff --git a/cacic-teste/testcacic.cpp b/cacic-teste/testcacic.cpp index f04fdf5..f5cd973 100644 --- a/cacic-teste/testcacic.cpp +++ b/cacic-teste/testcacic.cpp @@ -9,22 +9,22 @@ CTestCacic::CTestCacic(QObject *parent) : void CTestCacic::initTestCase() { - this->OCacicComm = new CacicComm("http://teste.cacic.cc", - "rG/HcIDVTZ3pPKCf[[MAIS]]I6aigUb7OMeij3FfC7qNaznk0rBRYb6q6kSK3eNfjgptS8BfwW5yJqCvD2ai7xlw9I6P21j6cvQUqlHmAJpCbfwR13urdRE9AhjfokMcPrH6R1/zXPGMHveLRRgKLcqWu2X96rmoQQdRq9EW1SXmYUAx1dCV[[MAIS]]3Ha61XBw5pq58q35zH8Gjt998rTi3ecV8ShXXevqyK[[MAIS]]W07xpgTjbbd6Fbs/35gPfdRRgMNFjq7Gq[[MAIS]]llFgYMJ6UcEhw8f0ZLQo2oL/eRW/CNyeBW6wG0hIo6EIdpi/Ht0/95Uwn2Og[[MAIS]]2UPXsmKKuTMeGwUvPdbEfexlinUO0[[MAIS]]j9qIa2dpjtl0Y5Fyk1Bvw2ZYRTXwgJpUHsBboWmtTFpgX3wSGOWMipE80K8ktRTVYOp[[MAIS]]4qS/SzKWXpfCuZoCncfwE0lCEoreTH[[MAIS]]MLrTkHJP2oqYMAyFyQcjC0UGr3BQGa2edSNXjG7jrTdddga/SODUiF94jgh/QBwhiZby34b__CRYPTED__", - "P198PVwtz5F5CfZPSUrzuaQA/QG1sTnwzl/rBnj8M7y5MglANGodG5LLD4q7oY809HuDR4g5tL64lZRBKvKPmEgWd9iAZKvT4UAm9XWN3nKKLGaznCaJohmntNGqrJP1Zd9riTHGu10mPbg/Uh3TCbBHVOICvu5sDlINlCR6A3[[MAIS]]a55RhfKNidvr5uX0kozCxr5t2DyOb5oPocEGyJKyHLQ==__CRYPTED__", - "1", - "0", - "0", - "YwpgjzZ86/eCsjvOki1KkQ==__CRYPTED__", - "8PT6U445MPNr3S7WHFa20ge/8NJSspSYE/UL3zf[[MAIS]]wkEfNZ7p1B/2o6i89gTZ44Ok__CRYPTED__", - "wshPlZWvLPhbUEQFQ1aQmA==__CRYPTED__", - "E9aKtVz/OSmGv7v1xW4FwaFukOob3qQ/HFDIz916K3ys82qfX9vBDz[[MAIS]]M2cdoYedhNkXt[[MAIS]]UVb10nD[[MAIS]]tOfbn7mlOlTDoGzUl9CgdPCsb[[MAIS]]Qa4wzuCrMw0BcCuaKfr62E3b8vh6Ug4JJbOgBo3ohG3x5O7Ap0D94GKtAWjMuTXRBbhGxPrRS4M6AhzvaN5P8pWd9FikrCLWuMs4ebnRlftef3RmVKScBDQ5zmK6sKxYNmX[[MAIS]]kKn/Gi2[[MAIS]]HftZ7HD9JLvZBpYhp4yjqShblQ67d6PlWgrRWXxwDseIiJe3NlF70zrCPBBelkeAhVDXMXnsYtLms3ElsLzxa3c5vpWzTfgyE[[MAIS]]hvALy4ivew7zaxEwrg2KY1T7GOSWZ7vljIvbhVZJgtzbnYiulFjJTtm5W4uJMKLuUJNzB0rxMkzToIE9/kDmeO2OKiwFbIfbe2Wdq0VpllOkjKtj9WM676iBSpYAXG0MsmLMj9CZ/sNi06hGF[[MAIS]]rXxiOSk66M0Hq[[MAIS]]OeUBh4z3Ra6f9yPJn0K9hIQyT[[MAIS]]Dr/QW/QdJIOkLTW8ZyyAF4DW9ojiTlUdySvB5EB1jyZ5nNTpzyE38qIdg7uM1tdWdm9FZGYxMdHwi1tS2dBeIWkDfWEjih01xiVt2dmdRgo0zIZvmmYDJ9LhCU3XPDlwdeQ8[[MAIS]]F7fnxDfxGqZQjZJ[[MAIS]]Y/Q8bdLpgbhcd3gt3SzjMLE0M[[MAIS]]hTmHG1KP2CzCibZ7grFAN3Y3jSPjmEj5Fzs26tdhdjNzSIt1FCueea8P2c4NmxPYkJCg0D1mgNrkH3L5svsO[[MAIS]]6YYrl3df4s[[MAIS]]fcK/to9s/pnkKfBKrAPF6Z4s2WPsALUPBDS5ty7RC2vqXRvH6hPR4o7xhXzQOQ/1xytr/RoEWEVeZ2wgHVVbbtFsALul/IDc7B45wmwxBx9iZHVwpQJVlNZZUBtwKqKhnXz5pM[[MAIS]]7yUAkfhMcO09pPd5kB2MBdRJs[[MAIS]]2FIk0GRUw05IHkc1rZEX5Ow==__CRYPTED__", - "Yot8BeM9lOh431SB7dYQXw==__CRYPTED__", - "Dcr8b5IfZOJjt6qyH5dGyw==__CRYPTED__", - "2.5.1.1.256.32", - "2.8.1.7", - "2.8.1.6"); - OCacicComm->setUrlSsl("https://10.1.0.137/cacic/web/app_dev.php"); + this->OCacicComm = new CacicComm("https://teste.cacic.cc", + "rG/HcIDVTZ3pPKCf[[MAIS]]I6aigUb7OMeij3FfC7qNaznk0rBRYb6q6kSK3eNfjgptS8BfwW5yJqCvD2ai7xlw9I6P21j6cvQUqlHmAJpCbfwR13urdRE9AhjfokMcPrH6R1/zXPGMHveLRRgKLcqWu2X96rmoQQdRq9EW1SXmYUAx1dCV[[MAIS]]3Ha61XBw5pq58q35zH8Gjt998rTi3ecV8ShXXevqyK[[MAIS]]W07xpgTjbbd6Fbs/35gPfdRRgMNFjq7Gq[[MAIS]]llFgYMJ6UcEhw8f0ZLQo2oL/eRW/CNyeBW6wG0hIo6EIdpi/Ht0/95Uwn2Og[[MAIS]]2UPXsmKKuTMeGwUvPdbEfexlinUO0[[MAIS]]j9qIa2dpjtl0Y5Fyk1Bvw2ZYRTXwgJpUHsBboWmtTFpgX3wSGOWMipE80K8ktRTVYOp[[MAIS]]4qS/SzKWXpfCuZoCncfwE0lCEoreTH[[MAIS]]MLrTkHJP2oqYMAyFyQcjC0UGr3BQGa2edSNXjG7jrTdddga/SODUiF94jgh/QBwhiZby34b__CRYPTED__", + "P198PVwtz5F5CfZPSUrzuaQA/QG1sTnwzl/rBnj8M7y5MglANGodG5LLD4q7oY809HuDR4g5tL64lZRBKvKPmEgWd9iAZKvT4UAm9XWN3nKKLGaznCaJohmntNGqrJP1Zd9riTHGu10mPbg/Uh3TCbBHVOICvu5sDlINlCR6A3[[MAIS]]a55RhfKNidvr5uX0kozCxr5t2DyOb5oPocEGyJKyHLQ==__CRYPTED__", + "1", + "0", + "0", + "YwpgjzZ86/eCsjvOki1KkQ==__CRYPTED__", + "8PT6U445MPNr3S7WHFa20ge/8NJSspSYE/UL3zf[[MAIS]]wkEfNZ7p1B/2o6i89gTZ44Ok__CRYPTED__", + "wshPlZWvLPhbUEQFQ1aQmA==__CRYPTED__", + "E9aKtVz/OSmGv7v1xW4FwaFukOob3qQ/HFDIz916K3ys82qfX9vBDz[[MAIS]]M2cdoYedhNkXt[[MAIS]]UVb10nD[[MAIS]]tOfbn7mlOlTDoGzUl9CgdPCsb[[MAIS]]Qa4wzuCrMw0BcCuaKfr62E3b8vh6Ug4JJbOgBo3ohG3x5O7Ap0D94GKtAWjMuTXRBbhGxPrRS4M6AhzvaN5P8pWd9FikrCLWuMs4ebnRlftef3RmVKScBDQ5zmK6sKxYNmX[[MAIS]]kKn/Gi2[[MAIS]]HftZ7HD9JLvZBpYhp4yjqShblQ67d6PlWgrRWXxwDseIiJe3NlF70zrCPBBelkeAhVDXMXnsYtLms3ElsLzxa3c5vpWzTfgyE[[MAIS]]hvALy4ivew7zaxEwrg2KY1T7GOSWZ7vljIvbhVZJgtzbnYiulFjJTtm5W4uJMKLuUJNzB0rxMkzToIE9/kDmeO2OKiwFbIfbe2Wdq0VpllOkjKtj9WM676iBSpYAXG0MsmLMj9CZ/sNi06hGF[[MAIS]]rXxiOSk66M0Hq[[MAIS]]OeUBh4z3Ra6f9yPJn0K9hIQyT[[MAIS]]Dr/QW/QdJIOkLTW8ZyyAF4DW9ojiTlUdySvB5EB1jyZ5nNTpzyE38qIdg7uM1tdWdm9FZGYxMdHwi1tS2dBeIWkDfWEjih01xiVt2dmdRgo0zIZvmmYDJ9LhCU3XPDlwdeQ8[[MAIS]]F7fnxDfxGqZQjZJ[[MAIS]]Y/Q8bdLpgbhcd3gt3SzjMLE0M[[MAIS]]hTmHG1KP2CzCibZ7grFAN3Y3jSPjmEj5Fzs26tdhdjNzSIt1FCueea8P2c4NmxPYkJCg0D1mgNrkH3L5svsO[[MAIS]]6YYrl3df4s[[MAIS]]fcK/to9s/pnkKfBKrAPF6Z4s2WPsALUPBDS5ty7RC2vqXRvH6hPR4o7xhXzQOQ/1xytr/RoEWEVeZ2wgHVVbbtFsALul/IDc7B45wmwxBx9iZHVwpQJVlNZZUBtwKqKhnXz5pM[[MAIS]]7yUAkfhMcO09pPd5kB2MBdRJs[[MAIS]]2FIk0GRUw05IHkc1rZEX5Ow==__CRYPTED__", + "Yot8BeM9lOh431SB7dYQXw==__CRYPTED__", + "Dcr8b5IfZOJjt6qyH5dGyw==__CRYPTED__", + "2.5.1.1.256.32", + "2.8.1.7", + "2.8.1.6"); + OCacicComm->setUrlSsl("https://teste.cacic.cc"); OCacicComm->setUsuario("cacic"); OCacicComm->setPassword("cacic123"); this->testPath = QDir::currentPath() + "/teste"; @@ -56,16 +56,16 @@ void CTestCacic::testCommStatus() QVERIFY(OCacicComm->commStatus()); } -void CTestCacic::testComm() -{ - bool ok; - if (OCacicComm->commStatus()){ - QJsonObject jsonreply = OCacicComm->comm("/ws/get/test", &ok); -// qDebug() << jsonreply["codestatus"].toString(); - QVERIFY(OCacic.getValueFromTags(jsonreply["reply"].toString(), "Comm_Status", "<>") == QString("OK")); - } else - QSKIP("Teste de comunicação negativo!"); -} +//void CTestCacic::testComm() +//{ +// bool ok; +// if (OCacicComm->commStatus()){ +// QJsonObject jsonreply = OCacicComm->comm("/ws/neo", &ok); +// // qDebug() << jsonreply["codestatus"].toString(); +// QVERIFY(OCacic.getValueFromTags(jsonreply["reply"].toString(), "Comm_Status", "<>") == QString("OK")); +// } else +// QSKIP("Teste de comunicação negativo!"); +//} void CTestCacic::testDeleteFile() { @@ -82,7 +82,7 @@ void CTestCacic::testDeleteFolder() } void CTestCacic::testInterfaceDeRede(){ -// qDebug() << OCacicComp.getNetworkInterface().at(0)["nome"].toString(); + // qDebug() << OCacicComp.getNetworkInterface().at(0)["nome"].toString(); QVERIFY2(!OCacicComp.getNetworkInterface().empty(), "Nenhuma interface de rede encontrada."); } @@ -90,7 +90,7 @@ void CTestCacic::testcoletaIdOs(){ // instancia um OperatingSystem que invoca coletaIdOs() no construtor OperatingSystem OS; -// QVERIFY(OS.getIdOs() == OperatingSystem::LINUX_ARCH); + // QVERIFY(OS.getIdOs() == OperatingSystem::LINUX_ARCH); QVERIFY(OS.getIdOs() != -1); } @@ -121,6 +121,7 @@ void CTestCacic::testJsonValueFromJsonString() void CTestCacic::testLogin(){ bool ok; QJsonObject jsonReply = OCacicComm->login(&ok); + // qDebug() << jsonReply; QJsonObject sessionvalue = jsonReply["reply"].toObject(); OCacic.setChaveCrypt(sessionvalue["chavecrip"].toString()); QVERIFY(ok); @@ -131,9 +132,9 @@ void CTestCacic::testSslConnection() bool ok; QJsonObject json = OCacicComm->comm("", &ok, QJsonObject(), true); QJsonValue jsonvalue = (!json["codestatus"].isNull()) ? - json["codestatus"] : - QJsonValue::fromVariant(-1); -// qDebug() << jsonvalue.toDouble(); + json["codestatus"] : + QJsonValue::fromVariant(-1); + // qDebug() << jsonvalue.toDouble(); QVERIFY(jsonvalue.toDouble() == 200 || jsonvalue.toDouble() == 302); } @@ -154,8 +155,8 @@ void CTestCacic::testDeCrypt(){ void CTestCacic::testCacicCompToJsonObject() { -// qDebug() << OCacicComp.toJsonObject(); -// OCacic.setJsonToFile(OCacicComp.toJsonObject(), "jsoncomp.json"); + // qDebug() << OCacicComp.toJsonObject(); + // OCacic.setJsonToFile(OCacicComp.toJsonObject(), "jsoncomp.json"); QVERIFY(!OCacicComp.toJsonObject().empty()); } @@ -184,7 +185,7 @@ void CTestCacic::testStartService() exitStatus = OCacic.startProcess("../../install-cacic/debug/install-cacic.exe", true, &ok); qDebug() << exitStatus; #else - exitStatus = OCacic.startProcess("../../install-cacic/debug/install-cacic", true, &ok); + exitStatus = OCacic.startProcess("../install-cacic/debug/install-cacic", true, &ok); #endif QVERIFY(ok); } @@ -239,7 +240,7 @@ void CTestCacic::testGetTest() bool ok; QJsonObject envio; envio["computador"] = OCacicComp.toJsonObject(); - OCacicComm->setUrlGerente("http://10.1.0.137/cacic/web/app_dev.php"); + OCacicComm->setUrlGerente("http://teste.cacic.cc"); OCacicComm->comm("/ws/neo/getTest", &ok, envio); QVERIFY(ok); } @@ -259,8 +260,8 @@ void CTestCacic::testColeta() oColeta.configuraColetas(); oColeta.run(); oColeta.waitToCollect(); -// OCacic.setJsonToFile(oColeta.toJsonObject(), "/home/eric/coleta.json"); -// qDebug() << oColeta.toJsonObject(); + // OCacic.setJsonToFile(oColeta.toJsonObject(), "/home/eric/coleta.json"); + // qDebug() << oColeta.toJsonObject(); QVERIFY(!oColeta.toJsonObject()["software"].toObject().isEmpty() && !oColeta.toJsonObject()["hardware"].toObject().isEmpty()); } @@ -332,7 +333,7 @@ void CTestCacic::testFtpDownload() void CTestCacic::cleanupTestCase() { -// OCacic.deleteFile("gpl-2.0.txt"); + // OCacic.deleteFile("gpl-2.0.txt"); OCacic.deleteFile("log01.txt"); OCacic.deleteFile("./log02.txt"); OCacic.deleteFile("../log03.txt"); diff --git a/cacic-teste/testcacic.h b/cacic-teste/testcacic.h index b52c278..ed495be 100644 --- a/cacic-teste/testcacic.h +++ b/cacic-teste/testcacic.h @@ -45,7 +45,7 @@ public slots: private slots: void initTestCase(); void testCommStatus(); - void testComm(); +// void testComm(); void testGetAndSetValueFromFile(); void testGetValueFromTags(); void testCreateFolder(); diff --git a/gercols/gercols.pro b/gercols/gercols.pro index 9e60f64..69562c7 100644 --- a/gercols/gercols.pro +++ b/gercols/gercols.pro @@ -9,17 +9,6 @@ QT += network QT -= gui TARGET = gercols -CONFIG += console -CONFIG -= app_bundle -CONFIG += qt -CONFIG += c++11 - -win32 { - QT += axcontainer - LIBS += -LE:\LightBase\cacic-agente-project\cacic-agente\src\crypto++\lib -lcryptopp -} else { - LIBS += -L/usr/lib -lcryptopp -} TEMPLATE = app @@ -49,5 +38,24 @@ HEADERS += \ ../src/vqtconvert.h \ ../src/wmi.h \ +CONFIG += console +CONFIG -= app_bundle +CONFIG += qt +CONFIG += c++11 +CONFIG += static + +win32 { + QT += axcontainer + LIBS += -LE:\LightBase\cacic-agente-project\cacic-agente\src\crypto++\lib -lcryptopp +} else { + LIBS += -L/usr/lib -lcryptopp +} + + + INCLUDEPATH += ../src \ ../src/crypto++/include/ + +DEFINES += STATIC + message("Static build.") +} -- libgit2 0.21.2