Download as
Browse Code »

Commit 5be74952752b801831c313916453fbeaba535143

Authored by LightBase Consultoria em Software Publico
1 parent d569f3d0
Exists in master

Modificaçoes nos tests

Showing 3 changed files with 59 additions and 50 deletions   Show diff stats
cacic-teste/testcacic.cpp
  Diff comments   View file @5be7495
... ... @@ -9,22 +9,22 @@ CTestCacic::CTestCacic(QObject *parent) :
9 9  
10 10 void CTestCacic::initTestCase()
11 11 {
12   - this->OCacicComm = new CacicComm("http://teste.cacic.cc",
13   - "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__",
14   - "P198PVwtz5F5CfZPSUrzuaQA/QG1sTnwzl/rBnj8M7y5MglANGodG5LLD4q7oY809HuDR4g5tL64lZRBKvKPmEgWd9iAZKvT4UAm9XWN3nKKLGaznCaJohmntNGqrJP1Zd9riTHGu10mPbg/Uh3TCbBHVOICvu5sDlINlCR6A3[[MAIS]]a55RhfKNidvr5uX0kozCxr5t2DyOb5oPocEGyJKyHLQ==__CRYPTED__",
15   - "1",
16   - "0",
17   - "0",
18   - "YwpgjzZ86/eCsjvOki1KkQ==__CRYPTED__",
19   - "8PT6U445MPNr3S7WHFa20ge/8NJSspSYE/UL3zf[[MAIS]]wkEfNZ7p1B/2o6i89gTZ44Ok__CRYPTED__",
20   - "wshPlZWvLPhbUEQFQ1aQmA==__CRYPTED__",
21   - "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__",
22   - "Yot8BeM9lOh431SB7dYQXw==__CRYPTED__",
23   - "Dcr8b5IfZOJjt6qyH5dGyw==__CRYPTED__",
24   - "2.5.1.1.256.32",
25   - "2.8.1.7",
26   - "2.8.1.6");
27   - OCacicComm->setUrlSsl("https://10.1.0.137/cacic/web/app_dev.php");
  12 + this->OCacicComm = new CacicComm("https://teste.cacic.cc",
  13 + "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__",
  14 + "P198PVwtz5F5CfZPSUrzuaQA/QG1sTnwzl/rBnj8M7y5MglANGodG5LLD4q7oY809HuDR4g5tL64lZRBKvKPmEgWd9iAZKvT4UAm9XWN3nKKLGaznCaJohmntNGqrJP1Zd9riTHGu10mPbg/Uh3TCbBHVOICvu5sDlINlCR6A3[[MAIS]]a55RhfKNidvr5uX0kozCxr5t2DyOb5oPocEGyJKyHLQ==__CRYPTED__",
  15 + "1",
  16 + "0",
  17 + "0",
  18 + "YwpgjzZ86/eCsjvOki1KkQ==__CRYPTED__",
  19 + "8PT6U445MPNr3S7WHFa20ge/8NJSspSYE/UL3zf[[MAIS]]wkEfNZ7p1B/2o6i89gTZ44Ok__CRYPTED__",
  20 + "wshPlZWvLPhbUEQFQ1aQmA==__CRYPTED__",
  21 + "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__",
  22 + "Yot8BeM9lOh431SB7dYQXw==__CRYPTED__",
  23 + "Dcr8b5IfZOJjt6qyH5dGyw==__CRYPTED__",
  24 + "2.5.1.1.256.32",
  25 + "2.8.1.7",
  26 + "2.8.1.6");
  27 + OCacicComm->setUrlSsl("https://teste.cacic.cc");
28 28 OCacicComm->setUsuario("cacic");
29 29 OCacicComm->setPassword("cacic123");
30 30 this->testPath = QDir::currentPath() + "/teste";
... ... @@ -56,16 +56,16 @@ void CTestCacic::testCommStatus()
56 56 QVERIFY(OCacicComm->commStatus());
57 57 }
58 58  
59   -void CTestCacic::testComm()
60   -{
61   - bool ok;
62   - if (OCacicComm->commStatus()){
63   - QJsonObject jsonreply = OCacicComm->comm("/ws/get/test", &ok);
64   -// qDebug() << jsonreply["codestatus"].toString();
65   - QVERIFY(OCacic.getValueFromTags(jsonreply["reply"].toString(), "Comm_Status", "<>") == QString("OK"));
66   - } else
67   - QSKIP("Teste de comunicação negativo!");
68   -}
  59 +//void CTestCacic::testComm()
  60 +//{
  61 +// bool ok;
  62 +// if (OCacicComm->commStatus()){
  63 +// QJsonObject jsonreply = OCacicComm->comm("/ws/neo", &ok);
  64 +// // qDebug() << jsonreply["codestatus"].toString();
  65 +// QVERIFY(OCacic.getValueFromTags(jsonreply["reply"].toString(), "Comm_Status", "<>") == QString("OK"));
  66 +// } else
  67 +// QSKIP("Teste de comunicação negativo!");
  68 +//}
69 69  
70 70 void CTestCacic::testDeleteFile()
71 71 {
... ... @@ -82,7 +82,7 @@ void CTestCacic::testDeleteFolder()
82 82 }
83 83  
84 84 void CTestCacic::testInterfaceDeRede(){
85   -// qDebug() << OCacicComp.getNetworkInterface().at(0)["nome"].toString();
  85 + // qDebug() << OCacicComp.getNetworkInterface().at(0)["nome"].toString();
86 86 QVERIFY2(!OCacicComp.getNetworkInterface().empty(), "Nenhuma interface de rede encontrada.");
87 87 }
88 88  
... ... @@ -90,7 +90,7 @@ void CTestCacic::testcoletaIdOs(){
90 90 // instancia um OperatingSystem que invoca coletaIdOs() no construtor
91 91 OperatingSystem OS;
92 92  
93   -// QVERIFY(OS.getIdOs() == OperatingSystem::LINUX_ARCH);
  93 + // QVERIFY(OS.getIdOs() == OperatingSystem::LINUX_ARCH);
94 94 QVERIFY(OS.getIdOs() != -1);
95 95 }
96 96  
... ... @@ -121,6 +121,7 @@ void CTestCacic::testJsonValueFromJsonString()
121 121 void CTestCacic::testLogin(){
122 122 bool ok;
123 123 QJsonObject jsonReply = OCacicComm->login(&ok);
  124 + // qDebug() << jsonReply;
124 125 QJsonObject sessionvalue = jsonReply["reply"].toObject();
125 126 OCacic.setChaveCrypt(sessionvalue["chavecrip"].toString());
126 127 QVERIFY(ok);
... ... @@ -131,9 +132,9 @@ void CTestCacic::testSslConnection()
131 132 bool ok;
132 133 QJsonObject json = OCacicComm->comm("", &ok, QJsonObject(), true);
133 134 QJsonValue jsonvalue = (!json["codestatus"].isNull()) ?
134   - json["codestatus"] :
135   - QJsonValue::fromVariant(-1);
136   -// qDebug() << jsonvalue.toDouble();
  135 + json["codestatus"] :
  136 + QJsonValue::fromVariant(-1);
  137 + // qDebug() << jsonvalue.toDouble();
137 138 QVERIFY(jsonvalue.toDouble() == 200 || jsonvalue.toDouble() == 302);
138 139 }
139 140  
... ... @@ -154,8 +155,8 @@ void CTestCacic::testDeCrypt(){
154 155  
155 156 void CTestCacic::testCacicCompToJsonObject()
156 157 {
157   -// qDebug() << OCacicComp.toJsonObject();
158   -// OCacic.setJsonToFile(OCacicComp.toJsonObject(), "jsoncomp.json");
  158 + // qDebug() << OCacicComp.toJsonObject();
  159 + // OCacic.setJsonToFile(OCacicComp.toJsonObject(), "jsoncomp.json");
159 160 QVERIFY(!OCacicComp.toJsonObject().empty());
160 161 }
161 162  
... ... @@ -184,7 +185,7 @@ void CTestCacic::testStartService()
184 185 exitStatus = OCacic.startProcess("../../install-cacic/debug/install-cacic.exe", true, &ok);
185 186 qDebug() << exitStatus;
186 187 #else
187   - exitStatus = OCacic.startProcess("../../install-cacic/debug/install-cacic", true, &ok);
  188 + exitStatus = OCacic.startProcess("../install-cacic/debug/install-cacic", true, &ok);
188 189 #endif
189 190 QVERIFY(ok);
190 191 }
... ... @@ -239,7 +240,7 @@ void CTestCacic::testGetTest()
239 240 bool ok;
240 241 QJsonObject envio;
241 242 envio["computador"] = OCacicComp.toJsonObject();
242   - OCacicComm->setUrlGerente("http://10.1.0.137/cacic/web/app_dev.php");
  243 + OCacicComm->setUrlGerente("http://teste.cacic.cc");
243 244 OCacicComm->comm("/ws/neo/getTest", &ok, envio);
244 245 QVERIFY(ok);
245 246 }
... ... @@ -259,8 +260,8 @@ void CTestCacic::testColeta()
259 260 oColeta.configuraColetas();
260 261 oColeta.run();
261 262 oColeta.waitToCollect();
262   -// OCacic.setJsonToFile(oColeta.toJsonObject(), "/home/eric/coleta.json");
263   -// qDebug() << oColeta.toJsonObject();
  263 + // OCacic.setJsonToFile(oColeta.toJsonObject(), "/home/eric/coleta.json");
  264 + // qDebug() << oColeta.toJsonObject();
264 265 QVERIFY(!oColeta.toJsonObject()["software"].toObject().isEmpty() &&
265 266 !oColeta.toJsonObject()["hardware"].toObject().isEmpty());
266 267 }
... ... @@ -332,7 +333,7 @@ void CTestCacic::testFtpDownload()
332 333  
333 334 void CTestCacic::cleanupTestCase()
334 335 {
335   -// OCacic.deleteFile("gpl-2.0.txt");
  336 + // OCacic.deleteFile("gpl-2.0.txt");
336 337 OCacic.deleteFile("log01.txt");
337 338 OCacic.deleteFile("./log02.txt");
338 339 OCacic.deleteFile("../log03.txt");
... ...
cacic-teste/testcacic.h
  Diff comments   View file @5be7495
... ... @@ -45,7 +45,7 @@ public slots:
45 45 private slots:
46 46 void initTestCase();
47 47 void testCommStatus();
48   - void testComm();
  48 +// void testComm();
49 49 void testGetAndSetValueFromFile();
50 50 void testGetValueFromTags();
51 51 void testCreateFolder();
... ...
gercols/gercols.pro
  Diff comments   View file @5be7495
... ... @@ -9,17 +9,6 @@ QT += network
9 9 QT -= gui
10 10  
11 11 TARGET = gercols
12   -CONFIG += console
13   -CONFIG -= app_bundle
14   -CONFIG += qt
15   -CONFIG += c++11
16   -
17   -win32 {
18   - QT += axcontainer
19   - LIBS += -LE:\LightBase\cacic-agente-project\cacic-agente\src\crypto++\lib -lcryptopp
20   -} else {
21   - LIBS += -L/usr/lib -lcryptopp
22   -}
23 12  
24 13 TEMPLATE = app
25 14  
... ... @@ -49,5 +38,24 @@ HEADERS += \
49 38 ../src/vqtconvert.h \
50 39 ../src/wmi.h \
51 40  
  41 +CONFIG += console
  42 +CONFIG -= app_bundle
  43 +CONFIG += qt
  44 +CONFIG += c++11
  45 +CONFIG += static
  46 +
  47 +win32 {
  48 + QT += axcontainer
  49 + LIBS += -LE:\LightBase\cacic-agente-project\cacic-agente\src\crypto++\lib -lcryptopp
  50 +} else {
  51 + LIBS += -L/usr/lib -lcryptopp
  52 +}
  53 +
  54 +
  55 +
52 56 INCLUDEPATH += ../src \
53 57 ../src/crypto++/include/
  58 +
  59 +DEFINES += STATIC
  60 + message("Static build.")
  61 +}
... ...